diff --git a/build.gradle b/build.gradle
index f21eb83d8fb..567982ebb7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -138,7 +138,9 @@ dependencies {
     compile 'org.jsoup:jsoup:1.11.2'
     compile 'com.mashape.unirest:unirest-java:1.4.9'
 
-    compile 'commons-logging:commons-logging:1.2'
+	// >1.8.0-beta is required for java 9 compatibility
+    compile 'org.slf4j:slf4j-api:1.8.0-beta0'
+    compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0'
     compile 'org.apache.logging.log4j:log4j-jcl:2.10.0'
     compile 'org.apache.logging.log4j:log4j-api:2.10.0'
     compile 'org.apache.logging.log4j:log4j-core:2.10.0'
@@ -167,7 +169,6 @@ dependencies {
     testCompile 'org.xmlunit:xmlunit-core:2.5.1'
     testCompile 'org.xmlunit:xmlunit-matchers:2.5.1'
     testCompile 'com.tngtech.archunit:archunit-junit:0.5.0'
-    testCompile 'org.slf4j:slf4j-jcl:1.7.25' // required by ArchUnit to enable logging over jcl
     testCompile "org.testfx:testfx-core:4.0.+"
     testCompile "org.testfx:testfx-junit:4.0.+"
 
diff --git a/docs/adr/0002-use-slf4j-for-logging.md b/docs/adr/0002-use-slf4j-for-logging.md
new file mode 100644
index 00000000000..b9aabc823d0
--- /dev/null
+++ b/docs/adr/0002-use-slf4j-for-logging.md
@@ -0,0 +1,43 @@
+# Use slf4j together with log4j2 for logging
+
+* Up to version 4.1 JabRef uses apache-ommons-logging 1.2 for logging errors and messages. However, this is not compatible with java 9 and is superseded by log4j.
+* SLF4J provides a facade for several logging frameworks, including log4j and supports already java 9
+* Log4j is already defined as dependency and slf4j has already been required by a third party dependency
+
+## Considered Alternatives
+
+* [Log4j2](https://logging.apache.org/log4j/2.x/)
+* [SLF4J with Log4j2 binding](https://logging.apache.org/log4j/2.x/maven-artifacts.html)
+* [SLF4J with Logback binding](https://logback.qos.ch/)
+
+## Decision Outcome
+* We chose slf4j with log4j2 binding, because it only requires minimal changes to our logging infrastructure and it is claimed that  
+> Apache Log4j 2 is an upgrade to Log4j that provides significant improvements over its predecessor, Log4j 1.x, and      provides many of the improvements available in Logback while fixing some inherent problems in Logback’s architecture.
+* Furthermore, as slf4j is a facade for several loggers, the underlying implementation can easily be changed in the future
+
+
+## Pros and Cons of the Alternatives 
+
+### Log4j2
+
+* `+` Dependency already exists
+* `+` Java 9 support since version 2.10
+* `-` Direct dependency
+
+### SLF4J with log4j2 binding
+
+* `+` Supports other loggers as well
+* `+` Java 9 support
+* `+` Already defined
+* `+` Migration tool available
+* `-` Logger statements require a slight different syntax
+
+### SLF4J with Logback binding
+
+* `+` Migration tool available
+* `+` Native implementation of slf4j
+* `-` Java 9 support only available in alpha
+* `-` Different syntax than log4j/commons logging
+
+
+
diff --git a/src/main/java/org/jabref/FallbackExceptionHandler.java b/src/main/java/org/jabref/FallbackExceptionHandler.java
index 1521b67cf60..ef65037ee54 100644
--- a/src/main/java/org/jabref/FallbackExceptionHandler.java
+++ b/src/main/java/org/jabref/FallbackExceptionHandler.java
@@ -1,14 +1,14 @@
 package org.jabref;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Catch and log any unhandled exceptions.
  */
 public class FallbackExceptionHandler implements Thread.UncaughtExceptionHandler {
 
-    private static final Log LOGGER = LogFactory.getLog(FallbackExceptionHandler.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FallbackExceptionHandler.class);
 
     public static void installExceptionHandler() {
         Thread.setDefaultUncaughtExceptionHandler(new FallbackExceptionHandler());
diff --git a/src/main/java/org/jabref/JabRefException.java b/src/main/java/org/jabref/JabRefException.java
index 42eacc77c72..0c312fc10df 100644
--- a/src/main/java/org/jabref/JabRefException.java
+++ b/src/main/java/org/jabref/JabRefException.java
@@ -1,11 +1,11 @@
 package org.jabref;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JabRefException extends Exception {
 
-    private static final Log LOGGER = LogFactory.getLog(JabRefException.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefException.class);
     private String localizedMessage;
 
     public JabRefException(String message) {
diff --git a/src/main/java/org/jabref/JabRefExecutorService.java b/src/main/java/org/jabref/JabRefExecutorService.java
index 3c587eaebe5..c3f3d9854e8 100644
--- a/src/main/java/org/jabref/JabRefExecutorService.java
+++ b/src/main/java/org/jabref/JabRefExecutorService.java
@@ -9,8 +9,8 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -19,7 +19,7 @@
 public class JabRefExecutorService implements Executor {
 
     public static final JabRefExecutorService INSTANCE = new JabRefExecutorService();
-    private static final Log LOGGER = LogFactory.getLog(JabRefExecutorService.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefExecutorService.class);
     private final ExecutorService executorService = Executors.newCachedThreadPool(r -> {
         Thread thread = new Thread(r);
         thread.setName("JabRef CachedThreadPool");
diff --git a/src/main/java/org/jabref/JabRefGUI.java b/src/main/java/org/jabref/JabRefGUI.java
index 31e74f2941b..aa15ffdb0d6 100644
--- a/src/main/java/org/jabref/JabRefGUI.java
+++ b/src/main/java/org/jabref/JabRefGUI.java
@@ -34,12 +34,12 @@
 import org.jabref.model.database.shared.DatabaseNotSupportedException;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JabRefGUI {
-    private static final Log LOGGER = LogFactory.getLog(JabRefGUI.class);
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefGUI.class);
     private static JabRefFrame mainFrame;
 
     private final List<ParserResult> bibDatabases;
@@ -47,7 +47,7 @@ public class JabRefGUI {
     private final List<ParserResult> failed = new ArrayList<>();
     private final List<ParserResult> toOpenTab = new ArrayList<>();
 
-    private String focusedFile;
+    private final String focusedFile;
 
     public JabRefGUI(List<ParserResult> argsDatabases, boolean isBlank) {
         this.bibDatabases = argsDatabases;
diff --git a/src/main/java/org/jabref/JabRefMain.java b/src/main/java/org/jabref/JabRefMain.java
index c260f719128..d5fc08c4500 100644
--- a/src/main/java/org/jabref/JabRefMain.java
+++ b/src/main/java/org/jabref/JabRefMain.java
@@ -31,15 +31,15 @@
 import org.jabref.model.entry.InternalBibtexFields;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * JabRef MainClass
  */
 public class JabRefMain extends Application {
 
-    private static final Log LOGGER = LogFactory.getLog(JabRefMain.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefMain.class);
     private static String[] arguments;
 
     public static void main(String[] args) {
diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index 2764dd1930f..eace9a6132c 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -51,12 +51,12 @@
 import org.jabref.preferences.SearchPreferences;
 
 import com.google.common.base.Throwables;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ArgumentProcessor {
 
-    private static final Log LOGGER = LogFactory.getLog(ArgumentProcessor.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ArgumentProcessor.class);
     private final JabRefCLI cli;
     private final List<ParserResult> parserResults;
     private final Mode startupMode;
diff --git a/src/main/java/org/jabref/cli/JabRefCLI.java b/src/main/java/org/jabref/cli/JabRefCLI.java
index 0333de6901a..f427c8e0dbb 100644
--- a/src/main/java/org/jabref/cli/JabRefCLI.java
+++ b/src/main/java/org/jabref/cli/JabRefCLI.java
@@ -12,12 +12,12 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JabRefCLI {
 
-    private static final Log LOGGER = LogFactory.getLog(JabRefCLI.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefCLI.class);
     private final CommandLine cl;
     private List<String> leftOver;
 
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index b18d28b1834..4fbd1b47e94 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -146,12 +146,12 @@
 import com.google.common.eventbus.Subscribe;
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BasePanel extends JPanel implements ClipboardOwner {
 
-    private static final Log LOGGER = LogFactory.getLog(BasePanel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BasePanel.class);
 
     // Divider size for BaseFrame split pane. 0 means non-resizable.
     private static final int SPLIT_PANE_DIVIDER_SIZE = 4;
diff --git a/src/main/java/org/jabref/gui/ClipBoardManager.java b/src/main/java/org/jabref/gui/ClipBoardManager.java
index 12818869df6..a79eb860213 100644
--- a/src/main/java/org/jabref/gui/ClipBoardManager.java
+++ b/src/main/java/org/jabref/gui/ClipBoardManager.java
@@ -21,12 +21,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ClipBoardManager implements ClipboardOwner {
 
-    private static final Log LOGGER = LogFactory.getLog(ClipBoardManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ClipBoardManager.class);
 
     private final Clipboard clipboard;
 
diff --git a/src/main/java/org/jabref/gui/DefaultInjector.java b/src/main/java/org/jabref/gui/DefaultInjector.java
index 7e430afd0d2..2ee788a9c02 100644
--- a/src/main/java/org/jabref/gui/DefaultInjector.java
+++ b/src/main/java/org/jabref/gui/DefaultInjector.java
@@ -11,12 +11,12 @@
 
 import com.airhacks.afterburner.injection.Injector;
 import com.airhacks.afterburner.injection.PresenterFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DefaultInjector implements PresenterFactory {
 
-    private static final Log LOGGER = LogFactory.getLog(DefaultInjector.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultInjector.class);
 
     /**
      * This method takes care of creating dependencies.
diff --git a/src/main/java/org/jabref/gui/EntryTypeDialog.java b/src/main/java/org/jabref/gui/EntryTypeDialog.java
index 83d655539f9..4a8961c937d 100644
--- a/src/main/java/org/jabref/gui/EntryTypeDialog.java
+++ b/src/main/java/org/jabref/gui/EntryTypeDialog.java
@@ -45,8 +45,8 @@
 import org.jabref.model.entry.IEEETranEntryTypes;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Dialog that prompts the user to choose a type for an entry.
@@ -54,7 +54,7 @@
  */
 public class EntryTypeDialog extends JabRefDialog implements ActionListener {
 
-    private static final Log LOGGER = LogFactory.getLog(EntryTypeDialog.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(EntryTypeDialog.class);
     private static final int COLUMN = 3;
     private final JabRefFrame frame;
     private final CancelAction cancelAction = new CancelAction();
diff --git a/src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java b/src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java
index fbf049a942d..0d4b38b0971 100644
--- a/src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java
+++ b/src/main/java/org/jabref/gui/FindUnlinkedFilesDialog.java
@@ -82,8 +82,8 @@
 import org.jabref.preferences.JabRefPreferences;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * GUI Dialog for the feature "Find unlinked files".
@@ -99,7 +99,7 @@ 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 Logger LOGGER = LoggerFactory.getLogger(FindUnlinkedFilesDialog.class);
     private static final String GLOBAL_PREFS_WORKING_DIRECTORY_KEY = "findUnlinkedFilesWD";
 
     private static final String GLOBAL_PREFS_DIALOG_SIZE_KEY = "findUnlinkedFilesDialogSize";
diff --git a/src/main/java/org/jabref/gui/GUIGlobals.java b/src/main/java/org/jabref/gui/GUIGlobals.java
index 61e3d4364ec..2b3ba25b364 100644
--- a/src/main/java/org/jabref/gui/GUIGlobals.java
+++ b/src/main/java/org/jabref/gui/GUIGlobals.java
@@ -19,8 +19,8 @@
 import org.jabref.model.entry.specialfields.SpecialField;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Static variables for graphics files and keyboard shortcuts.
@@ -45,7 +45,7 @@ public class GUIGlobals {
     public static final Color ENTRY_EDITOR_LABEL_COLOR = new Color(100, 100, 150); // Empty field, blue.
 
     static final Color INACTIVE_TABBED_COLOR = Color.black; // inactive Database
-    private static final Log LOGGER = LogFactory.getLog(GUIGlobals.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(GUIGlobals.class);
     private static final Map<String, JLabel> TABLE_ICONS = new HashMap<>(); // Contains table icon mappings. Set up
     static final Color ACTIVE_TABBED_COLOR = ENTRY_EDITOR_LABEL_COLOR.darker(); // active Database (JTabbedPane)
 
diff --git a/src/main/java/org/jabref/gui/IconTheme.java b/src/main/java/org/jabref/gui/IconTheme.java
index 0f87021fe75..0b78c7cd09e 100644
--- a/src/main/java/org/jabref/gui/IconTheme.java
+++ b/src/main/java/org/jabref/gui/IconTheme.java
@@ -33,8 +33,8 @@
 
 import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
 import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class IconTheme {
 
@@ -45,7 +45,7 @@ public class IconTheme {
     public static final Color DEFAULT_DISABLED_COLOR = JabRefPreferences.getInstance().getColor(JabRefPreferences.ICON_DISABLED_COLOR);
     public static Font FONT;
     private static final String DEFAULT_ICON_PATH = "/images/external/red.png";
-    private static final Log LOGGER = LogFactory.getLog(IconTheme.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(IconTheme.class);
     private static final Map<String, String> KEY_TO_ICON = readIconThemeFile(
             IconTheme.class.getResource("/images/Icons.properties"), "/images/external/");
 
diff --git a/src/main/java/org/jabref/gui/JEditorPaneWithHighlighting.java b/src/main/java/org/jabref/gui/JEditorPaneWithHighlighting.java
index 147df8f34f0..71235c5d08e 100644
--- a/src/main/java/org/jabref/gui/JEditorPaneWithHighlighting.java
+++ b/src/main/java/org/jabref/gui/JEditorPaneWithHighlighting.java
@@ -14,12 +14,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JEditorPaneWithHighlighting extends JEditorPane implements SearchQueryHighlightListener {
 
-    private static final Log LOGGER = LogFactory.getLog(JTextAreaWithHighlighting.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JTextAreaWithHighlighting.class);
 
     public void highlightPattern(Optional<Pattern> highlightPattern) {
         Highlighter highlighter = getHighlighter();
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 35a57419c90..47db19b25e3 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -143,15 +143,15 @@
 import org.jabref.preferences.SearchPreferences;
 
 import com.google.common.eventbus.Subscribe;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefFrame.class);
 
     // Frame titles.
     private static final String FRAME_TITLE = "JabRef";
@@ -653,7 +653,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("Could not interface with Mac OS X methods.", e);
             }
         }
 
diff --git a/src/main/java/org/jabref/gui/PreviewPanel.java b/src/main/java/org/jabref/gui/PreviewPanel.java
index fe0b096ba32..33f73d3e58d 100644
--- a/src/main/java/org/jabref/gui/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/PreviewPanel.java
@@ -34,15 +34,15 @@
 import org.jabref.preferences.PreviewPreferences;
 
 import com.google.common.eventbus.Subscribe;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Displays an BibEntry using the given layout format.
  */
 public class PreviewPanel extends ScrollPane implements SearchQueryHighlightListener, EntryContainer {
 
-    private static final Log LOGGER = LogFactory.getLog(PreviewPanel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PreviewPanel.class);
 
     private final ClipBoardManager clipBoardManager;
     private final DialogService dialogService;
diff --git a/src/main/java/org/jabref/gui/SidePaneManager.java b/src/main/java/org/jabref/gui/SidePaneManager.java
index 500c78af892..d9af9434c18 100644
--- a/src/main/java/org/jabref/gui/SidePaneManager.java
+++ b/src/main/java/org/jabref/gui/SidePaneManager.java
@@ -15,15 +15,15 @@
 import org.jabref.gui.maintable.MainTable;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Manages visibility of SideShowComponents in a given newly constructed
  * sidePane.
  */
 public class SidePaneManager {
-    private static final Log LOGGER = LogFactory.getLog(SidePaneManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SidePaneManager.class);
 
     private final JabRefFrame frame;
 
diff --git a/src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java
index 590c2795028..25a186f33e7 100644
--- a/src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java
+++ b/src/main/java/org/jabref/gui/actions/IntegrityCheckAction.java
@@ -33,12 +33,12 @@
 
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class IntegrityCheckAction extends MnemonicAwareAction {
 
-    private static final Log LOGGER = LogFactory.getLog(IntegrityCheckAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(IntegrityCheckAction.class);
     private static final String ELLIPSES = "...";
 
     private final JabRefFrame frame;
diff --git a/src/main/java/org/jabref/gui/actions/LookupIdentifierAction.java b/src/main/java/org/jabref/gui/actions/LookupIdentifierAction.java
index 9e1fb4f1126..2f488fdb45b 100644
--- a/src/main/java/org/jabref/gui/actions/LookupIdentifierAction.java
+++ b/src/main/java/org/jabref/gui/actions/LookupIdentifierAction.java
@@ -9,12 +9,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LookupIdentifierAction extends MnemonicAwareAction {
 
-    private static final Log LOGGER = LogFactory.getLog(LookupIdentifierAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LookupIdentifierAction.class);
 
     private final JabRefFrame frame;
     private final IdFetcher fetcher;
@@ -32,7 +32,7 @@ public void actionPerformed(ActionEvent actionEvent) {
         try {
             BasePanel.runWorker(new LookupIdentifiersWorker(frame, fetcher));
         } catch (Exception e) {
-            LOGGER.error(e);
+            LOGGER.error("Problem running ID Worker", e);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/actions/NewEntryAction.java b/src/main/java/org/jabref/gui/actions/NewEntryAction.java
index b404dfea3af..c8f4a198591 100644
--- a/src/main/java/org/jabref/gui/actions/NewEntryAction.java
+++ b/src/main/java/org/jabref/gui/actions/NewEntryAction.java
@@ -16,11 +16,11 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class NewEntryAction extends MnemonicAwareAction {
-    private static final Log LOGGER = LogFactory.getLog(NewEntryAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(NewEntryAction.class);
 
     private final JabRefFrame jabRefFrame;
     private String type; // The type of item to create.
diff --git a/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveUIManager.java b/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveUIManager.java
index 52efccbb5f0..99b97cf6f9d 100644
--- a/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveUIManager.java
+++ b/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveUIManager.java
@@ -5,8 +5,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class has an abstract UI role as it listens for an {@link AutosaveEvent}
@@ -14,7 +14,7 @@
  */
 public class AutosaveUIManager {
 
-    private static final Log LOGGER = LogFactory.getLog(AutosaveUIManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AutosaveUIManager.class);
     private final BasePanel panel;
 
 
diff --git a/src/main/java/org/jabref/gui/collab/ChangeScanner.java b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
index a35ca71bad0..f8356608d34 100644
--- a/src/main/java/org/jabref/gui/collab/ChangeScanner.java
+++ b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
@@ -34,11 +34,11 @@
 import org.jabref.model.entry.BibtexString;
 import org.jabref.model.metadata.MetaData;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ChangeScanner implements Runnable {
-    private static final Log LOGGER = LogFactory.getLog(ChangeScanner.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ChangeScanner.class);
 
     private final File file;
     private final Path tempFile;
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
index 926bc13fce5..7d73267a9df 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
@@ -16,11 +16,11 @@
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DatabaseChangeMonitor implements FileUpdateListener {
-    private static final Log LOGGER = LogFactory.getLog(DatabaseChangeMonitor.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseChangeMonitor.class);
 
     private final BibDatabaseContext database;
     private final FileUpdateMonitor fileMonitor;
diff --git a/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java b/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java
index fa11e45d318..7a63b4aed8f 100644
--- a/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java
+++ b/src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java
@@ -18,12 +18,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class EntryChangeViewModel extends ChangeViewModel {
 
-    private static final Log LOGGER = LogFactory.getLog(EntryChangeViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(EntryChangeViewModel.class);
 
     public EntryChangeViewModel(BibEntry memEntry, BibEntry tmpEntry, BibEntry diskEntry) {
         super();
diff --git a/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java b/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java
index 425f0bae798..0f7d0a11779 100644
--- a/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java
+++ b/src/main/java/org/jabref/gui/collab/EntryDeleteChangeViewModel.java
@@ -15,12 +15,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class EntryDeleteChangeViewModel extends ChangeViewModel {
 
-    private static final Log LOGGER = LogFactory.getLog(EntryDeleteChangeViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(EntryDeleteChangeViewModel.class);
     private final BibEntry memEntry;
     private final BibEntry tmpEntry;
 
diff --git a/src/main/java/org/jabref/gui/collab/StringAddChangeViewModel.java b/src/main/java/org/jabref/gui/collab/StringAddChangeViewModel.java
index ba7ff79648a..20bf1099ef6 100644
--- a/src/main/java/org/jabref/gui/collab/StringAddChangeViewModel.java
+++ b/src/main/java/org/jabref/gui/collab/StringAddChangeViewModel.java
@@ -11,12 +11,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class StringAddChangeViewModel extends ChangeViewModel {
 
-    private static final Log LOGGER = LogFactory.getLog(StringAddChangeViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StringAddChangeViewModel.class);
 
     private final BibtexString string;
     private final InfoPane tp = new InfoPane();
diff --git a/src/main/java/org/jabref/gui/collab/StringChangeViewModel.java b/src/main/java/org/jabref/gui/collab/StringChangeViewModel.java
index 003dd5fde5c..19e68f3a0b9 100644
--- a/src/main/java/org/jabref/gui/collab/StringChangeViewModel.java
+++ b/src/main/java/org/jabref/gui/collab/StringChangeViewModel.java
@@ -12,12 +12,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class StringChangeViewModel extends ChangeViewModel {
 
-    private static final Log LOGGER = LogFactory.getLog(StringChangeViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StringChangeViewModel.class);
     private final BibtexString string;
     private final String disk;
 
diff --git a/src/main/java/org/jabref/gui/collab/StringNameChangeViewModel.java b/src/main/java/org/jabref/gui/collab/StringNameChangeViewModel.java
index 98170b28fed..e9bda7c9f40 100644
--- a/src/main/java/org/jabref/gui/collab/StringNameChangeViewModel.java
+++ b/src/main/java/org/jabref/gui/collab/StringNameChangeViewModel.java
@@ -12,12 +12,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class StringNameChangeViewModel extends ChangeViewModel {
 
-    private static final Log LOGGER = LogFactory.getLog(StringNameChangeViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StringNameChangeViewModel.class);
     private final BibtexString string;
     private final String mem;
     private final String disk;
diff --git a/src/main/java/org/jabref/gui/collab/StringRemoveChangeViewModel.java b/src/main/java/org/jabref/gui/collab/StringRemoveChangeViewModel.java
index c47f6134594..4501888a240 100644
--- a/src/main/java/org/jabref/gui/collab/StringRemoveChangeViewModel.java
+++ b/src/main/java/org/jabref/gui/collab/StringRemoveChangeViewModel.java
@@ -10,11 +10,11 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class StringRemoveChangeViewModel extends ChangeViewModel {
-    private static final Log LOGGER = LogFactory.getLog(StringRemoveChangeViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StringRemoveChangeViewModel.class);
     private final BibtexString string;
 
     private final BibtexString inMem;
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java
index 2fb061ee6e9..8801779f71e 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialog.java
@@ -41,14 +41,14 @@
 import org.jabref.model.metadata.MetaData;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 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 static final Logger LOGGER = LoggerFactory.getLogger(ContentSelectorDialog.class);
     private final GridBagLayout gbl = new GridBagLayout();
     private final GridBagConstraints con = new GridBagConstraints();
     private final JPanel fieldPan = new JPanel();
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
index c4b35502400..1fc7d650a54 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
@@ -23,12 +23,12 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.OptionalUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CopyFilesTask extends Task<List<CopyFilesResultItemViewModel>> {
 
-    private static final Log LOGGER = LogFactory.getLog(CopyFilesAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CopyFilesAction.class);
     private static final String LOGFILE_PREFIX = "copyFileslog_";
     private static final String LOGFILE_EXT = ".log";
     private final BibDatabaseContext databaseContext;
diff --git a/src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java b/src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java
index d1459537890..5b45bab8828 100644
--- a/src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java
+++ b/src/main/java/org/jabref/gui/customjfx/CustomJFXPanel.java
@@ -11,8 +11,8 @@
 import org.jabref.logic.util.OS;
 
 import com.sun.javafx.embed.EmbeddedSceneInterface;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /***
  * WARNING: THIS IS A CUSTOM HACK TO PREVENT A BUG WITH ACCENTED CHARACTERS PRODUCING AN NPE IN LINUX </br>
@@ -21,7 +21,7 @@
  */
 public class CustomJFXPanel extends JFXPanel {
 
-    private static final Log LOGGER = LogFactory.getLog(CustomJFXPanel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CustomJFXPanel.class);
     private Field scenePeerField = null;
 
     private CustomJFXPanel() {
diff --git a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
index c5ab1b21184..c5e1fcf78a2 100644
--- a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
@@ -42,8 +42,8 @@
 import org.jabref.model.util.FileHelper;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * TODO: Replace by http://docs.oracle.com/javase/7/docs/api/java/awt/Desktop.html
@@ -51,7 +51,7 @@
  */
 public class JabRefDesktop {
 
-    private static final Log LOGGER = LogFactory.getLog(JabRefDesktop.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefDesktop.class);
 
     private static final NativeDesktop NATIVE_DESKTOP = getNativeDesktop();
     private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
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 b4b99326251..4b7d1f66fda 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,11 @@
 import java.nio.file.Path;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DefaultDesktop implements NativeDesktop {
-    private static final Log LOGGER = LogFactory.getLog(NativeDesktop.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(NativeDesktop.class);
 
     @Override
     public void openFile(String filePath, String fileType) throws IOException {
diff --git a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
index 305cae598a5..54c5147dd43 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
@@ -36,15 +36,15 @@
 
 import de.saxsys.mvvmfx.utils.validation.ObservableRuleBasedValidator;
 import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.controlsfx.control.NotificationPane;
 import org.fxmisc.flowless.VirtualizedScrollPane;
 import org.fxmisc.richtext.CodeArea;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SourceTab extends EntryEditorTab {
 
-    private static final Log LOGGER = LogFactory.getLog(SourceTab.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SourceTab.class);
     private final LatexFieldFormatterPreferences fieldFormatterPreferences;
     private final BibDatabaseMode mode;
     private final JabRefPreferences preferences;
diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java
index 5e7f412fa08..be8c280b458 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java
@@ -26,11 +26,11 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.pdf.FileAnnotation;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FileAnnotationTabViewModel extends AbstractViewModel {
-    private static final Log LOGGER = LogFactory.getLog(FileAnnotationTabViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileAnnotationTabViewModel.class);
 
     private final ListProperty<FileAnnotationViewModel> annotations = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final ListProperty<Path> files = new SimpleListProperty<>(FXCollections.observableArrayList());
diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
index 2cc348f9e76..da09f42e5f0 100644
--- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
+++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
@@ -22,14 +22,14 @@
 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 org.apache.http.client.utils.URIBuilder;
 import org.apache.logging.log4j.core.LogEvent;
 import org.fxmisc.easybind.EasyBind;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ErrorConsoleViewModel extends AbstractViewModel {
-    private static final Log LOGGER = LogFactory.getLog(ErrorConsoleViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ErrorConsoleViewModel.class);
 
     private final DateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
     private final Date date = new Date();
@@ -118,7 +118,7 @@ public void reportIssue() {
                     .setParameter("body", issueBody);
             JabRefDesktop.openBrowser(uriBuilder.build().toString());
         } catch (IOException | URISyntaxException e) {
-            LOGGER.error(e);
+            LOGGER.error("Problem opening url", e);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java b/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java
index 6c42a783a0c..f55aafad2fa 100644
--- a/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java
+++ b/src/main/java/org/jabref/gui/exporter/CustomExportDialog.java
@@ -32,15 +32,15 @@
 import org.jabref.preferences.JabRefPreferences;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Dialog for creating or modifying custom exports.
  */
 class CustomExportDialog extends JabRefDialog {
 
-    private static final Log LOGGER = LogFactory.getLog(CustomExportDialog.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CustomExportDialog.class);
 
     private final JTextField name = new JTextField(60);
     private final JTextField layoutFile = new JTextField(60);
diff --git a/src/main/java/org/jabref/gui/exporter/ExportAction.java b/src/main/java/org/jabref/gui/exporter/ExportAction.java
index b69bec7d191..3856520a45a 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportAction.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportAction.java
@@ -29,12 +29,12 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ExportAction {
 
-    private static final Log LOGGER = LogFactory.getLog(ExportAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExportAction.class);
 
     private ExportAction() {
     }
diff --git a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
index 05cc5a433e2..aef5a2a827e 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
@@ -24,12 +24,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ExportToClipboardAction extends AbstractWorker {
 
-    private static final Log LOGGER = LogFactory.getLog(ExportToClipboardAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExportToClipboardAction.class);
 
     private final JabRefFrame frame;
 
diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index 25bbbc2961d..720422289f4 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -42,8 +42,8 @@
 
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Action for the "Save" and "Save as" operations called from BasePanel. This class is also used for
@@ -54,7 +54,7 @@
  */
 public class SaveDatabaseAction extends AbstractWorker {
 
-    private static final Log LOGGER = LogFactory.getLog(SaveDatabaseAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SaveDatabaseAction.class);
 
     private final BasePanel panel;
     private final JabRefFrame frame;
diff --git a/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java b/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
index a92ad459c69..1ad53ec5559 100644
--- a/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
+++ b/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
@@ -21,12 +21,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AutoSetFileLinksUtil {
 
-    private static final Log LOGGER = LogFactory.getLog(AutoSetLinks.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AutoSetLinks.class);
     private List<Path> directories;
     private AutoLinkPreferences autoLinkPreferences;
     private ExternalFileTypes externalFileTypes;
diff --git a/src/main/java/org/jabref/gui/externalfiles/AutoSetLinks.java b/src/main/java/org/jabref/gui/externalfiles/AutoSetLinks.java
index 963cf3494cd..1e9d9813dee 100644
--- a/src/main/java/org/jabref/gui/externalfiles/AutoSetLinks.java
+++ b/src/main/java/org/jabref/gui/externalfiles/AutoSetLinks.java
@@ -30,12 +30,12 @@
 import org.jabref.model.entry.FileFieldWriter;
 import org.jabref.model.entry.LinkedFile;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AutoSetLinks {
 
-    private static final Log LOGGER = LogFactory.getLog(AutoSetLinks.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AutoSetLinks.class);
 
     private AutoSetLinks() {
     }
@@ -97,7 +97,7 @@ public static Runnable autoSetLinks(final List<BibEntry> entries, final NamedCom
                 try {
                     linkedFiles = util.findAssociatedNotLinkedFiles(entry);
                 } catch (IOException e) {
-                    LOGGER.error(e);
+                    LOGGER.error("Problem finding files", e);
                 }
 
                 if (ce != null) {
diff --git a/src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java b/src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java
index 1fddc5f5820..f36899d726a 100644
--- a/src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java
+++ b/src/main/java/org/jabref/gui/externalfiles/DownloadExternalFile.java
@@ -26,8 +26,8 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class handles the download of an external file. Typically called when the user clicks
@@ -43,7 +43,7 @@
  */
 public class DownloadExternalFile {
 
-    private static final Log LOGGER = LogFactory.getLog(DownloadExternalFile.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DownloadExternalFile.class);
 
     private final JabRefFrame frame;
     private final BibDatabaseContext databaseContext;
diff --git a/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java b/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java
index c5425d28d99..239c23dc36d 100644
--- a/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/DroppedFileHandler.java
@@ -45,8 +45,8 @@
 
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class holds the functionality of autolinking to a file that's dropped
@@ -62,7 +62,7 @@
  */
 public class DroppedFileHandler {
 
-    private static final Log LOGGER = LogFactory.getLog(DroppedFileHandler.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DroppedFileHandler.class);
 
     private final JabRefFrame frame;
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java b/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java
index aaf44053987..d35334c5ed0 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FindFullTextAction.java
@@ -23,15 +23,15 @@
 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 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 Logger LOGGER = LoggerFactory.getLogger(FindFullTextAction.class);
 
     private static final int WARNING_LIMIT = 5; // The minimum number of selected entries to ask the user for confirmation
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java b/src/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java
index 89a32975070..ceba51e71c5 100644
--- a/src/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java
+++ b/src/main/java/org/jabref/gui/externalfiles/TransferableFileLinkSelection.java
@@ -13,15 +13,15 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
  */
 public class TransferableFileLinkSelection implements Transferable {
 
-    private static final Log LOGGER = LogFactory.getLog(TransferableFileLinkSelection.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TransferableFileLinkSelection.class);
 
     private final List<Path> fileList = new ArrayList<>();
 
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
index 0d5338391a6..d6fedc14eb5 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileMenuItem.java
@@ -16,8 +16,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The menu item used in the popup menu for opening external resources associated
@@ -25,7 +25,7 @@
  * 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 static final Logger LOGGER = LoggerFactory.getLogger(ExternalFileMenuItem.class);
 
     private final BibEntry entry;
     private final String link;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
index 3c1f608338a..d65544ae392 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
@@ -22,12 +22,12 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FieldEditors {
 
-    private static final Log LOGGER = LogFactory.getLog(FieldEditors.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FieldEditors.class);
 
     public static FieldEditorFX getForField(String fieldName, TaskExecutor taskExecutor, DialogService dialogService, JournalAbbreviationLoader journalAbbreviationLoader, JournalAbbreviationPreferences journalAbbreviationPreferences, JabRefPreferences preferences, BibDatabaseContext databaseContext, String entryType, SuggestionProviders suggestionProviders, UndoManager undoManager) {
         final Set<FieldProperty> fieldExtras = InternalBibtexFields.getFieldProperties(fieldName);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java b/src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java
index e5eb638b69b..eb798b16f71 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FileListEditorTransferHandler.java
@@ -25,12 +25,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class FileListEditorTransferHandler extends TransferHandler {
 
-    private static final Log LOGGER = LogFactory.getLog(FileListEditorTransferHandler.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileListEditorTransferHandler.class);
 
     private final DataFlavor URL_FLAVOR;
     private final JabRefFrame frame;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JTextAreaWithHighlighting.java b/src/main/java/org/jabref/gui/fieldeditors/JTextAreaWithHighlighting.java
index f633b142e4b..b498cd25ff7 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JTextAreaWithHighlighting.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JTextAreaWithHighlighting.java
@@ -22,12 +22,12 @@
 import org.jabref.logic.search.SearchQueryHighlightListener;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JTextAreaWithHighlighting extends JTextAreaWithPlaceholder implements SearchQueryHighlightListener {
 
-    private static final Log LOGGER = LogFactory.getLog(JTextAreaWithHighlighting.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JTextAreaWithHighlighting.class);
 
     private Optional<Pattern> highlightPattern = Optional.empty();
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index 6612a752c20..0f2a30b0025 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -41,12 +41,12 @@
 
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LinkedFileViewModel extends AbstractViewModel {
 
-    private static final Log LOGGER = LogFactory.getLog(LinkedFileViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LinkedFileViewModel.class);
 
     private final LinkedFile linkedFile;
     private final BibDatabaseContext databaseContext;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
index edbe0c7734a..9891e71e399 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
@@ -44,12 +44,12 @@
 import org.jabref.model.util.FileHelper;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LinkedFilesEditorViewModel extends AbstractEditorViewModel {
 
-    private static final Log LOGGER = LogFactory.getLog(LinkedFilesEditorViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LinkedFilesEditorViewModel.class);
 
     private final ListProperty<LinkedFileViewModel> files = new SimpleListProperty<>(FXCollections.observableArrayList(LinkedFileViewModel::getObservables));
     private final BooleanProperty fulltextLookupInProgress = new SimpleBooleanProperty(false);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java
index c3921e5b392..5b1683e8256 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java
@@ -9,15 +9,15 @@
 import org.jabref.logic.integrity.FieldCheckers;
 
 import com.google.common.collect.BiMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * View model for a field editor that shows various options backed by a map.
  */
 public abstract class MapBasedEditorViewModel<T> extends OptionEditorViewModel<T> {
 
-    private static final Log LOGGER = LogFactory.getLog(MapBasedEditorViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(MapBasedEditorViewModel.class);
 
     public MapBasedEditorViewModel(String fieldName, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
         super(fieldName, suggestionProvider, fieldCheckers);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/TextArea.java b/src/main/java/org/jabref/gui/fieldeditors/TextArea.java
index 8623d79a2bf..3b9c42436ad 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/TextArea.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/TextArea.java
@@ -12,8 +12,8 @@
 import org.jabref.gui.GUIGlobals;
 import org.jabref.gui.customjfx.CustomJFXPanel;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An implementation of the FieldEditor backed by a {@link EditorTextArea}.
@@ -21,7 +21,7 @@
  */
 public class TextArea implements FieldEditor {
 
-    private static final Log LOGGER = LogFactory.getLog(TextArea.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TextArea.class);
 
     private final JFXPanel swingPanel;
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/TextField.java b/src/main/java/org/jabref/gui/fieldeditors/TextField.java
index 6a240db224d..4b5af373817 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/TextField.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/TextField.java
@@ -17,8 +17,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An implementation of the FieldEditor backed by a JTextField. Used for single-line input, only BibTex key at the
@@ -26,7 +26,7 @@
  */
 public class TextField extends JTextFieldWithPlaceholder implements FieldEditor {
 
-    private static final Log LOGGER = LogFactory.getLog(TextField.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TextField.class);
 
     private final String fieldName;
     private UndoManager undo;
diff --git a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
index 4d438dc2f23..5d149513c93 100644
--- a/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
+++ b/src/main/java/org/jabref/gui/filelist/FileListEntryEditor.java
@@ -52,8 +52,8 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class produces a dialog box for editing a single file link from a Bibtex entry.
@@ -68,7 +68,7 @@ public class FileListEntryEditor {
 
     private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
 
-    private static final Log LOGGER = LogFactory.getLog(FileListEntryEditor.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileListEntryEditor.class);
     private final JTextField link = new JTextField();
     private final JTextField description = new JTextField();
     private final JButton ok = new JButton(Localization.lang("OK"));
diff --git a/src/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java b/src/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java
index 7b669fb0e90..7c27df9df51 100644
--- a/src/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java
+++ b/src/main/java/org/jabref/gui/groups/EntryTableTransferHandler.java
@@ -39,13 +39,13 @@
 import org.jabref.pdfimport.PdfImporter;
 import org.jabref.pdfimport.PdfImporter.ImportPdfFilesResult;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class EntryTableTransferHandler extends TransferHandler {
 
     private static final boolean DROP_ALLOWED = true;
-    private static final Log LOGGER = LogFactory.getLog(EntryTableTransferHandler.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(EntryTableTransferHandler.class);
     private final MainTable entryTable;
     private final JabRefFrame frame;
     private final BasePanel panel;
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeController.java b/src/main/java/org/jabref/gui/groups/GroupTreeController.java
index 983bdb4c7ea..2948006d868 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeController.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeController.java
@@ -44,17 +44,17 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.groups.AllEntriesGroup;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.controlsfx.control.textfield.CustomTextField;
 import org.controlsfx.control.textfield.TextFields;
 import org.fxmisc.easybind.EasyBind;
 import org.reactfx.util.FxTimer;
 import org.reactfx.util.Timer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class GroupTreeController extends AbstractController<GroupTreeViewModel> {
 
-    private static final Log LOGGER = LogFactory.getLog(GroupTreeController.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(GroupTreeController.class);
 
     @FXML private TreeTableView<GroupNodeViewModel> groupTree;
     @FXML private TreeTableColumn<GroupNodeViewModel, GroupNodeViewModel> mainColumn;
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
index 9ba40973a42..9293bd63d52 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
@@ -28,13 +28,13 @@
 import org.jabref.model.groups.KeywordGroup;
 import org.jabref.model.groups.SearchGroup;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class GroupTreeNodeViewModel implements Transferable, TreeNode {
 
     public static final DataFlavor FLAVOR;
-    private static final Log LOGGER = LogFactory.getLog(GroupTreeNodeViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(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;
diff --git a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java b/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
index 6b75e866982..5ebc5a0f5d0 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
@@ -17,8 +17,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AboutDialogViewModel extends AbstractViewModel {
 
@@ -30,7 +30,7 @@ public class AboutDialogViewModel extends AbstractViewModel {
     private final String changelogUrl;
     private final String versionInfo;
     private final ReadOnlyStringWrapper environmentInfo = new ReadOnlyStringWrapper();
-    private final Log logger = LogFactory.getLog(AboutDialogViewModel.class);
+    private final Logger logger = LoggerFactory.getLogger(AboutDialogViewModel.class);
     private final ReadOnlyStringWrapper heading = new ReadOnlyStringWrapper();
     private final ReadOnlyStringWrapper authors = new ReadOnlyStringWrapper();
     private final ReadOnlyStringWrapper developers = new ReadOnlyStringWrapper();
diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java b/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java
index b279e42b803..acf8528597c 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java
@@ -42,15 +42,15 @@
 import org.jabref.preferences.JabRefPreferences;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Dialog to manage custom importers.
  */
 public class ImportCustomizationDialog extends JabRefDialog {
 
-    private static final Log LOGGER = LogFactory.getLog(ImportCustomizationDialog.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ImportCustomizationDialog.class);
 
     // Column widths for import customization dialog table:
     private static final int COL_0_WIDTH = 200;
diff --git a/src/main/java/org/jabref/gui/importer/ImportFormats.java b/src/main/java/org/jabref/gui/importer/ImportFormats.java
index e006e6f8ffc..52cb07fea3f 100644
--- a/src/main/java/org/jabref/gui/importer/ImportFormats.java
+++ b/src/main/java/org/jabref/gui/importer/ImportFormats.java
@@ -29,12 +29,8 @@
 import org.jabref.logic.util.FileType;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 public class ImportFormats {
 
-    private static final Log LOGGER = LogFactory.getLog(ImportFormats.class);
 
     private ImportFormats() {
     }
diff --git a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
index bfc0bcf5a50..882067c44c8 100644
--- a/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportInspectionDialog.java
@@ -118,8 +118,8 @@
 import ca.odell.glazedlists.swing.TableComparatorChooser;
 import com.jgoodies.forms.builder.ButtonBarBuilder;
 import com.jgoodies.forms.builder.ButtonStackBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Dialog to allow the selection of entries as part of an Import.
@@ -145,7 +145,7 @@
 
 public class ImportInspectionDialog extends JabRefDialog implements ImportInspector, OutputPrinter {
 
-    private static final Log LOGGER = LogFactory.getLog(ImportInspectionDialog.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(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;
diff --git a/src/main/java/org/jabref/gui/importer/ZipFileChooser.java b/src/main/java/org/jabref/gui/importer/ZipFileChooser.java
index e4290ae8784..f4a1f78f5dd 100644
--- a/src/main/java/org/jabref/gui/importer/ZipFileChooser.java
+++ b/src/main/java/org/jabref/gui/importer/ZipFileChooser.java
@@ -30,15 +30,15 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ZipFileChooser.class);
 
 
     /**
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 fa6e790dfbf..ab30e632acf 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,12 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AppendDatabaseAction implements BaseAction {
 
-    private static final Log LOGGER = LogFactory.getLog(AppendDatabaseAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AppendDatabaseAction.class);
 
     private final JabRefFrame frame;
     private final BasePanel panel;
@@ -102,7 +102,7 @@ private static void mergeFromBibtex(BasePanel panel, ParserResult parserResult,
                         newGroups.setGroup(group);
                         group.add(appendedEntries);
                     } catch (IllegalArgumentException e) {
-                        LOGGER.error(e);
+                        LOGGER.error("Problem appending entries to group", e);
                     }
                 }
 
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 3be44105d36..050edf84d4b 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,14 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // The action concerned with opening an existing database.
 
 public class OpenDatabaseAction extends MnemonicAwareAction {
 
-    public static final Log LOGGER = LogFactory.getLog(OpenDatabaseAction.class);
+    public static final Logger LOGGER = LoggerFactory.getLogger(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<>();
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 41f5481bcf6..51088137aef 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,12 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ACMPortalFetcher implements PreviewEntryFetcher {
 
-    private static final Log LOGGER = LogFactory.getLog(ACMPortalFetcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ACMPortalFetcher.class);
 
     private static final String START_URL = "https://portal.acm.org/";
     private static final String SEARCH_URL_PART = "results.cfm?query=";
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 ffe11017c57..78ca7062d55 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,8 @@
 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CiteSeerXFetcher implements EntryFetcher {
 
@@ -42,7 +42,7 @@ 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 static final Logger LOGGER = LoggerFactory.getLogger(CiteSeerXFetcher.class);
 
     private boolean stopFetching;
 
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 326b32373ac..d3d2a7ab19e 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/DOAJFetcher.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/DOAJFetcher.java
@@ -16,15 +16,15 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 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 Logger LOGGER = LoggerFactory.getLogger(DOAJFetcher.class);
     private static final int MAX_PER_PAGE = 100;
     private boolean shouldContinue;
 
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 86b27730762..2a099e77e3d 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,15 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class IEEEXploreFetcher implements EntryFetcher {
 
-    private static final Log LOGGER = LogFactory.getLog(IEEEXploreFetcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(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";
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 4a9c41951ad..4126aa1e1dd 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,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -41,7 +41,7 @@ public class INSPIREFetcher implements EntryFetcher {
 
     private static final String INSPIRE_HOST = "inspirehep.net";
 
-    private static final Log LOGGER = LogFactory.getLog(INSPIREFetcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(INSPIREFetcher.class);
     /**
      * Construct the query URL
      *
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 fc3244521b0..4f9d592cfc9 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,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
@@ -44,7 +44,7 @@
  */
 public class OAI2Fetcher implements EntryFetcher {
 
-    private static final Log LOGGER = LogFactory.getLog(OAI2Fetcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(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";
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 459bad48a68..9e18987796c 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,15 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 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 static final Logger LOGGER = LoggerFactory.getLogger(SearchBasedEntryFetcher.class);
     private final SearchBasedFetcher fetcher;
 
     public SearchBasedEntryFetcher(SearchBasedFetcher fetcher) {
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 c1181ae00e3..f0dfedb5d97 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/SpringerFetcher.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/SpringerFetcher.java
@@ -18,16 +18,16 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 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 Logger LOGGER = LoggerFactory.getLogger(SpringerFetcher.class);
     private static final int MAX_PER_PAGE = 100;
     private boolean shouldContinue;
 
diff --git a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java
index 62ae065b835..78c347ceb6a 100644
--- a/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java
+++ b/src/main/java/org/jabref/gui/journals/ManageJournalAbbreviationsViewModel.java
@@ -27,8 +27,8 @@
 import org.jabref.logic.util.FileType;
 import org.jabref.preferences.PreferencesService;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class provides a model for managing journal abbreviation lists.
@@ -38,7 +38,7 @@
  */
 public class ManageJournalAbbreviationsViewModel extends AbstractViewModel {
 
-    private final Log logger = LogFactory.getLog(ManageJournalAbbreviationsViewModel.class);
+    private final Logger logger = LoggerFactory.getLogger(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();
diff --git a/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java b/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java
index b8444e27ca8..20ee319c711 100644
--- a/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java
+++ b/src/main/java/org/jabref/gui/keyboard/EmacsKeyBindings.java
@@ -25,8 +25,8 @@
 
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Generic class which activates Emacs keybindings for java input {@link
@@ -35,7 +35,7 @@
  * The inner class actions can also be used independently.
  */
 public class EmacsKeyBindings {
-    private static final Log LOGGER = LogFactory.getLog(EmacsKeyBindings.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(EmacsKeyBindings.class);
 
     private static final String KILL_LINE_ACTION = "emacs-kill-line";
 
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java b/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
index 3be5be54a89..0e8100e834e 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
@@ -22,12 +22,12 @@
 
 import org.jabref.logic.util.OS;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class KeyBindingRepository {
 
-    private static final Log LOGGER = LogFactory.getLog(KeyBindingRepository.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(KeyBindingRepository.class);
     /**
      * sorted by localization
      */
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 9edd6805dba..90ecee29543 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -59,8 +59,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MainTable extends JTable {
     private static GeneralRenderer defRenderer;
@@ -79,7 +79,7 @@ public class MainTable extends JTable {
 
     private static List<CompleteRenderer> markedNumberRenderers;
 
-    private static final Log LOGGER = LogFactory.getLog(MainTable.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(MainTable.class);
     private final MainTableFormat tableFormat;
 
     private final BasePanel panel;
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableSelectionListener.java b/src/main/java/org/jabref/gui/maintable/MainTableSelectionListener.java
index 8977efcf50a..d5a1168aa54 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableSelectionListener.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableSelectionListener.java
@@ -46,15 +46,15 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 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 static final Logger LOGGER = LoggerFactory.getLogger(MainTableSelectionListener.class);
 
     private final MainTable table;
     private final BasePanel panel;
diff --git a/src/main/java/org/jabref/gui/menus/RightClickMenu.java b/src/main/java/org/jabref/gui/menus/RightClickMenu.java
index 9de2ba35609..b6c0b3c9d98 100644
--- a/src/main/java/org/jabref/gui/menus/RightClickMenu.java
+++ b/src/main/java/org/jabref/gui/menus/RightClickMenu.java
@@ -39,11 +39,11 @@
 import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.PreviewPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RightClickMenu extends JPopupMenu implements PopupMenuListener {
-    private static final Log LOGGER = LogFactory.getLog(RightClickMenu.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RightClickMenu.class);
 
     private final BasePanel panel;
     private final JMenuItem groupAdd;
diff --git a/src/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java b/src/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java
index a27e51a0892..1a5b7f93eba 100644
--- a/src/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java
+++ b/src/main/java/org/jabref/gui/mergeentries/EntryFetchAndMergeWorker.java
@@ -13,12 +13,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class EntryFetchAndMergeWorker extends SwingWorker<Optional<BibEntry>, Void> {
 
-    private static final Log LOGGER = LogFactory.getLog(EntryFetchAndMergeWorker.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(EntryFetchAndMergeWorker.class);
 
     private final BasePanel panel;
     private final BibEntry entry;
diff --git a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java
index 4ab8b3daac4..97059269167 100644
--- a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java
+++ b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeWorker.java
@@ -15,12 +15,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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FetchAndMergeWorker extends SwingWorker<Optional<BibEntry>, Void> {
 
-    private static final Log LOGGER = LogFactory.getLog(FetchAndMergeWorker.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FetchAndMergeWorker.class);
 
     private final BasePanel panel;
     private final BibEntry entry;
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
index 82bca6c916e..3dfe69a6a20 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntries.java
@@ -48,8 +48,8 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Oscar Gustafsson
@@ -59,7 +59,7 @@
 
 public class MergeEntries {
 
-    private static final Log LOGGER = LogFactory.getLog(MergeEntries.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(MergeEntries.class);
 
 
     private static final String MARGIN = "10px";
diff --git a/src/main/java/org/jabref/gui/openoffice/CitationManager.java b/src/main/java/org/jabref/gui/openoffice/CitationManager.java
index 47a90885688..26511ce0802 100644
--- a/src/main/java/org/jabref/gui/openoffice/CitationManager.java
+++ b/src/main/java/org/jabref/gui/openoffice/CitationManager.java
@@ -40,15 +40,15 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Dialog for modifying existing citations.
  */
 class CitationManager {
 
-    private static final Log LOGGER = LogFactory.getLog(CitationManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CitationManager.class);
     private final OOBibBase ooBase;
     private final JDialog diag;
     private final EventList<CitationEntry> list;
diff --git a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
index cefd592556d..b9b9ff4f704 100644
--- a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
+++ b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
@@ -89,8 +89,8 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class for manipulating the Bibliography of the currently start document in OpenOffice.
@@ -110,7 +110,7 @@ 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 static final Logger LOGGER = LoggerFactory.getLogger(OOBibBase.class);
     private XMultiServiceFactory mxDocFactory;
     private XTextDocument mxDoc;
     private XText text;
diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
index 649c3716ed6..cb148c7df4d 100644
--- a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
+++ b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
@@ -76,8 +76,8 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This test panel can be opened by reflection from JabRef, passing the JabRefFrame as an
@@ -85,7 +85,7 @@
  * between JabRef and OpenOffice.
  */
 public class OpenOfficePanel extends AbstractWorker {
-    private static final Log LOGGER = LogFactory.getLog(OpenOfficePanel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenOfficePanel.class);
 
     private OpenOfficeSidePanel sidePane;
     private JDialog diag;
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
index 157fe63d5d9..e578d5a21d7 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialog.java
@@ -72,15 +72,15 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class produces a dialog box for choosing a style file.
  */
 class StyleSelectDialog {
 
-    private static final Log LOGGER = LogFactory.getLog(StyleSelectDialog.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StyleSelectDialog.class);
 
     private final JabRefFrame frame;
     private EventList<OOBibStyle> styles;
diff --git a/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java b/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java
index 56d6aa492e8..fc2cb0ca140 100644
--- a/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java
+++ b/src/main/java/org/jabref/gui/plaintextimport/TextInputDialog.java
@@ -89,8 +89,8 @@
 import org.jabref.preferences.JabRefPreferences;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * import from plain text => simple mark/copy/paste into bibtex entry
@@ -104,7 +104,7 @@
  */
 public class TextInputDialog extends JabRefDialog {
 
-    private static final Log LOGGER = LogFactory.getLog(TextInputDialog.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TextInputDialog.class);
 
     private final JButton okButton = new JButton(Localization.lang("Accept"));
     private final JButton cancelButton = new JButton(Localization.lang("Cancel"));
diff --git a/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java b/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java
index 7991e5aef33..0972a46ab15 100644
--- a/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/AppearancePrefsTab.java
@@ -26,12 +26,12 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class AppearancePrefsTab extends JPanel implements PrefsTab {
 
-    private static final Log LOGGER = LogFactory.getLog(AppearancePrefsTab.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AppearancePrefsTab.class);
 
     private final JabRefPreferences prefs;
 
diff --git a/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java b/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
index c1cf0abb5d8..4c882105e00 100644
--- a/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
+++ b/src/main/java/org/jabref/gui/preftabs/PreferencesDialog.java
@@ -39,8 +39,8 @@
 import org.jabref.preferences.JabRefPreferencesFilter;
 
 import com.jgoodies.forms.builder.ButtonBarBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Preferences dialog. Contains a TabbedPane, and tabs will be defined in
@@ -53,7 +53,7 @@
  */
 public class PreferencesDialog extends JabRefDialog {
 
-    private static final Log LOGGER = LogFactory.getLog(PreferencesDialog.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PreferencesDialog.class);
 
     private final JPanel main;
 
diff --git a/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java b/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
index f1f36925e83..c28816d9279 100644
--- a/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
@@ -35,12 +35,12 @@
 import com.google.common.primitives.Ints;
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.factories.Paddings;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PreviewPrefsTab extends JPanel implements PrefsTab {
 
-    private static final Log LOGGER = LogFactory.getLog(PreviewPrefsTab.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PreviewPrefsTab.class);
 
     private SwingWorker<List<CitationStyle>, Void> discoverCitationStyleWorker;
 
diff --git a/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java b/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java
index 5176a32b1a3..8ef286a05d0 100644
--- a/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java
+++ b/src/main/java/org/jabref/gui/preftabs/TableColumnsTab.java
@@ -47,12 +47,12 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class TableColumnsTab extends JPanel implements PrefsTab {
 
-    private static final Log LOGGER = LogFactory.getLog(TableColumnsTab.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TableColumnsTab.class);
 
     private final JabRefPreferences prefs;
     private boolean tableChanged;
diff --git a/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java b/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
index dcfd92836c5..4556e8ec448 100644
--- a/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
+++ b/src/main/java/org/jabref/gui/protectedterms/ProtectedTermsDialog.java
@@ -59,15 +59,15 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class produces a dialog box for managing term list files.
  */
 public class ProtectedTermsDialog {
 
-    private static final Log LOGGER = LogFactory.getLog(ProtectedTermsDialog.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProtectedTermsDialog.class);
 
     private final JabRefFrame frame;
     private JDialog diag;
diff --git a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
index a7d872427d0..5942a95959b 100644
--- a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
+++ b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
@@ -22,15 +22,15 @@
 
 import com.jgoodies.forms.builder.FormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Abstract class for pushing entries into different editors.
  */
 public abstract class AbstractPushToApplication implements PushToApplication {
 
-    private static final Log LOGGER = LogFactory.getLog(AbstractPushToApplication.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(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
diff --git a/src/main/java/org/jabref/gui/push/PushToEmacs.java b/src/main/java/org/jabref/gui/push/PushToEmacs.java
index 7dacedf2a97..84a04d12e39 100644
--- a/src/main/java/org/jabref/gui/push/PushToEmacs.java
+++ b/src/main/java/org/jabref/gui/push/PushToEmacs.java
@@ -20,12 +20,12 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PushToEmacs extends AbstractPushToApplication implements PushToApplication {
 
-    private static final Log LOGGER = LogFactory.getLog(PushToEmacs.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PushToEmacs.class);
 
     private final JTextField additionalParams = new JTextField(30);
 
diff --git a/src/main/java/org/jabref/gui/push/PushToLyx.java b/src/main/java/org/jabref/gui/push/PushToLyx.java
index f766c3573f6..fc3ebbe2fe0 100644
--- a/src/main/java/org/jabref/gui/push/PushToLyx.java
+++ b/src/main/java/org/jabref/gui/push/PushToLyx.java
@@ -20,12 +20,12 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PushToLyx extends AbstractPushToApplication implements PushToApplication {
 
-    private static final Log LOGGER = LogFactory.getLog(PushToLyx.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PushToLyx.class);
 
     @Override
     public String getApplicationName() {
diff --git a/src/main/java/org/jabref/gui/push/PushToVim.java b/src/main/java/org/jabref/gui/push/PushToVim.java
index 1077ec6dfa7..b9fa72dedd7 100644
--- a/src/main/java/org/jabref/gui/push/PushToVim.java
+++ b/src/main/java/org/jabref/gui/push/PushToVim.java
@@ -19,12 +19,12 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PushToVim extends AbstractPushToApplication implements PushToApplication {
 
-    private static final Log LOGGER = LogFactory.getLog(PushToVim.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PushToVim.class);
 
     private final JTextField vimServer = new JTextField(30);
 
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchWorker.java b/src/main/java/org/jabref/gui/search/GlobalSearchWorker.java
index 40ba9aee8bb..bdbd6fe4bba 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchWorker.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchWorker.java
@@ -15,12 +15,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class GlobalSearchWorker extends SwingWorker<Map<BasePanel, List<BibEntry>>, Void> {
 
-    private static final Log LOGGER = LogFactory.getLog(GlobalSearchWorker.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(GlobalSearchWorker.class);
 
     private final JabRefFrame frame;
     private final SearchQuery searchQuery;
diff --git a/src/main/java/org/jabref/gui/search/SearchResultFrame.java b/src/main/java/org/jabref/gui/search/SearchResultFrame.java
index 0a57087f8c0..322fc2a4d10 100644
--- a/src/main/java/org/jabref/gui/search/SearchResultFrame.java
+++ b/src/main/java/org/jabref/gui/search/SearchResultFrame.java
@@ -75,8 +75,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Dialog to display search results, potentially from more than one BasePanel, with
@@ -92,7 +92,7 @@ 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 static final Logger LOGGER = LoggerFactory.getLogger(SearchResultFrame.class);
 
     private final JabRefFrame frame;
     private JFrame searchResultFrame;
diff --git a/src/main/java/org/jabref/gui/search/SearchWorker.java b/src/main/java/org/jabref/gui/search/SearchWorker.java
index db3c4495cfc..ca76832a007 100644
--- a/src/main/java/org/jabref/gui/search/SearchWorker.java
+++ b/src/main/java/org/jabref/gui/search/SearchWorker.java
@@ -16,8 +16,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -25,7 +25,7 @@
  */
 class SearchWorker extends SwingWorker<List<BibEntry>, Void> {
 
-    private static final Log LOGGER = LogFactory.getLog(SearchWorker.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SearchWorker.class);
 
     private final BasePanel basePanel;
     private final BibDatabase database;
diff --git a/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java b/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java
index 9c52fe0f02a..4d6c3563120 100644
--- a/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java
+++ b/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseDialog.java
@@ -50,18 +50,19 @@
 import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
 import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
 import org.jabref.logic.shared.security.Password;
-import org.jabref.logic.util.FileType;import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.logic.util.FileType;
+import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.shared.DBMSType;
 import org.jabref.model.database.shared.DatabaseLocation;
 import org.jabref.model.database.shared.DatabaseNotSupportedException;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ConnectToSharedDatabaseDialog extends JabRefDialog {
 
-    private static final Log LOGGER = LogFactory.getLog(ConnectToSharedDatabaseDialog.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConnectToSharedDatabaseDialog.class);
 
     private final JabRefFrame frame;
 
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
index 0e8e1b54b21..0e67e5534fa 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
@@ -12,6 +12,7 @@
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.entryeditor.EntryEditor;
+import org.jabref.gui.exporter.SaveDatabaseAction;
 import org.jabref.gui.undo.UndoableRemoveEntry;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
index bed9b589bc7..d9865b3efd6 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
@@ -14,12 +14,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SpecialFieldAction implements BaseAction {
 
-    private static final Log LOGGER = LogFactory.getLog(SpecialFieldAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SpecialFieldAction.class);
     private final JabRefFrame frame;
     private final SpecialField specialField;
     private final String value;
diff --git a/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java b/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java
index d288e81b9d5..48e0398d865 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java
@@ -5,8 +5,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class represents a change in any field value. The relevant
@@ -14,7 +14,7 @@
  * new value. Old/new values can be null.
  */
 public class UndoableFieldChange extends AbstractUndoableJabRefEdit {
-    private static final Log LOGGER = LogFactory.getLog(UndoableFieldChange.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableFieldChange.class);
 
     private final BibEntry entry;
     private final String field;
diff --git a/src/main/java/org/jabref/gui/undo/UndoableInsertEntry.java b/src/main/java/org/jabref/gui/undo/UndoableInsertEntry.java
index b400199ae99..e016caf3850 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableInsertEntry.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableInsertEntry.java
@@ -6,8 +6,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class represents the removal of an entry. The constructor needs
@@ -17,7 +17,7 @@
  */
 public class UndoableInsertEntry extends AbstractUndoableJabRefEdit {
 
-    private static final Log LOGGER = LogFactory.getLog(UndoableInsertEntry.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableInsertEntry.class);
     private final BibDatabase base;
     private final BibEntry entry;
 
diff --git a/src/main/java/org/jabref/gui/undo/UndoableInsertString.java b/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
index 59364a8fb40..afaece225d8 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
@@ -7,12 +7,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class UndoableInsertString extends AbstractUndoableJabRefEdit {
 
-    private static final Log LOGGER = LogFactory.getLog(UndoableInsertString.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableInsertString.class);
 
     private final BibDatabase base;
     private final BasePanel panel;
diff --git a/src/main/java/org/jabref/gui/undo/UndoableRemoveEntry.java b/src/main/java/org/jabref/gui/undo/UndoableRemoveEntry.java
index 805dfc317f3..3190356a34d 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableRemoveEntry.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableRemoveEntry.java
@@ -7,8 +7,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class represents the removal of an entry. The constructor needs
@@ -18,7 +18,7 @@
  */
 public class UndoableRemoveEntry extends AbstractUndoableJabRefEdit {
 
-    private static final Log LOGGER = LogFactory.getLog(UndoableRemoveEntry.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableRemoveEntry.class);
     private final BibDatabase base;
     private final BibEntry entry;
 
diff --git a/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java b/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
index 57e0bc5ddf4..0f82649f521 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
@@ -7,12 +7,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class UndoableRemoveString extends AbstractUndoableJabRefEdit {
 
-    private static final Log LOGGER = LogFactory.getLog(UndoableRemoveString.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableRemoveString.class);
     private final BibDatabase base;
     private final BibtexString string;
 
diff --git a/src/main/java/org/jabref/gui/util/ControlHelper.java b/src/main/java/org/jabref/gui/util/ControlHelper.java
index 61516ef4455..04c1d8f05fd 100644
--- a/src/main/java/org/jabref/gui/util/ControlHelper.java
+++ b/src/main/java/org/jabref/gui/util/ControlHelper.java
@@ -8,11 +8,11 @@
 import org.jabref.gui.AbstractView;
 import org.jabref.logic.l10n.Localization;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ControlHelper {
-    private static final Log LOGGER = LogFactory.getLog(ControlHelper.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ControlHelper.class);
 
     /**
      * Loads the FXML file associated to the passed control.
@@ -34,7 +34,7 @@ public static void loadFXMLForControl(Parent control) {
             // Add language resource
 
         } catch (IOException exception) {
-            LOGGER.error(exception);
+            LOGGER.error("Problem loading fxml for control", exception);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java b/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java
index 9a8dd5cb59e..31da770b4e6 100644
--- a/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java
+++ b/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java
@@ -6,8 +6,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of {@link TaskExecutor} that runs every task on the current thread, i.e. in a sequential order. This
@@ -16,7 +16,7 @@
  */
 public class CurrentThreadTaskExecutor implements TaskExecutor {
 
-    private static final Log LOGGER = LogFactory.getLog(CurrentThreadTaskExecutor.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CurrentThreadTaskExecutor.class);
 
     /**
      * Executes the task on the current thread. The code is essentially taken from {@link
diff --git a/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java b/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
index ab394512fa7..7697e7e34bf 100644
--- a/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
+++ b/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
@@ -11,9 +11,9 @@
 import javafx.application.Platform;
 import javafx.concurrent.Task;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.fxmisc.easybind.EasyBind;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A very simple implementation of the {@link TaskExecutor} interface.
@@ -21,7 +21,7 @@
  */
 public class DefaultTaskExecutor implements TaskExecutor {
 
-    private static final Log LOGGER = LogFactory.getLog(DefaultTaskExecutor.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultTaskExecutor.class);
 
     private static final ExecutorService EXECUTOR = Executors.newFixedThreadPool(5);
 
@@ -33,7 +33,7 @@ public static <V> V runInJavaFXThread(Callable<V> callable) {
         try {
             return task.get();
         } catch (InterruptedException | ExecutionException e) {
-            LOGGER.error(e);
+            LOGGER.error("Problem running in fx thread", e);
             return null;
         }
     }
diff --git a/src/main/java/org/jabref/gui/util/FileUpdateMonitor.java b/src/main/java/org/jabref/gui/util/FileUpdateMonitor.java
index 5b4e7658a14..83c7147b85f 100644
--- a/src/main/java/org/jabref/gui/util/FileUpdateMonitor.java
+++ b/src/main/java/org/jabref/gui/util/FileUpdateMonitor.java
@@ -10,8 +10,8 @@
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class monitors a set of files for changes. Upon detecting a change it notifies the registered {@link
@@ -20,7 +20,7 @@
  * Implementation based on https://stackoverflow.com/questions/16251273/can-i-watch-for-single-file-change-with-watchservice-not-the-whole-directory
  */
 public class FileUpdateMonitor implements Runnable {
-    private static final Log LOGGER = LogFactory.getLog(FileUpdateMonitor.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileUpdateMonitor.class);
 
     private final Multimap<Path, FileUpdateListener> listeners = ArrayListMultimap.create(20, 4);
     private WatchService watcher;
diff --git a/src/main/java/org/jabref/gui/util/OpenHyperlinksInExternalBrowser.java b/src/main/java/org/jabref/gui/util/OpenHyperlinksInExternalBrowser.java
index ee90e87f4f5..ad354467895 100644
--- a/src/main/java/org/jabref/gui/util/OpenHyperlinksInExternalBrowser.java
+++ b/src/main/java/org/jabref/gui/util/OpenHyperlinksInExternalBrowser.java
@@ -10,8 +10,8 @@
 
 import org.jabref.gui.desktop.JabRefDesktop;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -26,7 +26,7 @@
  */
 public class OpenHyperlinksInExternalBrowser implements ChangeListener<Worker.State>, EventListener {
 
-    private static final Log LOGGER = LogFactory.getLog(OpenHyperlinksInExternalBrowser.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenHyperlinksInExternalBrowser.class);
     private static final String CLICK_EVENT = "click";
     private static final String ANCHOR_TAG = "a";
 
@@ -57,7 +57,7 @@ public void handleEvent(Event event) {
         try {
             JabRefDesktop.openBrowser(href);
         } catch (IOException e) {
-            LOGGER.error(e);
+            LOGGER.error("Problem opening 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 29ff7feea89..b685a1cf081 100644
--- a/src/main/java/org/jabref/gui/worker/CitationStyleToClipboardWorker.java
+++ b/src/main/java/org/jabref/gui/worker/CitationStyleToClipboardWorker.java
@@ -26,8 +26,8 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreviewPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Copies the selected entries and formats them with the selected citation style (or preview), then it is copied to the clipboard.
@@ -35,7 +35,7 @@
  */
 public class CitationStyleToClipboardWorker extends SwingWorker<List<String>, Void> {
 
-    private static final Log LOGGER = LogFactory.getLog(CitationStyleToClipboardWorker.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CitationStyleToClipboardWorker.class);
 
     private final BasePanel basePanel;
     private final List<BibEntry> selectedEntries;
diff --git a/src/main/java/org/jabref/gui/worker/LookupIdentifiersWorker.java b/src/main/java/org/jabref/gui/worker/LookupIdentifiersWorker.java
index a859b3d6099..9cb9be0a4f6 100644
--- a/src/main/java/org/jabref/gui/worker/LookupIdentifiersWorker.java
+++ b/src/main/java/org/jabref/gui/worker/LookupIdentifiersWorker.java
@@ -15,12 +15,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LookupIdentifiersWorker<T extends Identifier> extends AbstractWorker {
 
-    private static final Log LOGGER = LogFactory.getLog(LookupIdentifiersWorker.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LookupIdentifiersWorker.class);
     private final JabRefFrame frame;
     private final IdFetcher<T> fetcher;
 
diff --git a/src/main/java/org/jabref/gui/worker/MarkEntriesAction.java b/src/main/java/org/jabref/gui/worker/MarkEntriesAction.java
index ed2ed9f93da..1fe16aace01 100644
--- a/src/main/java/org/jabref/gui/worker/MarkEntriesAction.java
+++ b/src/main/java/org/jabref/gui/worker/MarkEntriesAction.java
@@ -15,12 +15,12 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MarkEntriesAction extends AbstractWorker implements ActionListener {
 
-    private static final Log LOGGER = LogFactory.getLog(MarkEntriesAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(MarkEntriesAction.class);
     private final JabRefFrame frame;
     private final int level;
     private final JMenuItem menuItem;
diff --git a/src/main/java/org/jabref/gui/worker/SendAsEMailAction.java b/src/main/java/org/jabref/gui/worker/SendAsEMailAction.java
index bf939ae2cc2..1083411e1f9 100644
--- a/src/main/java/org/jabref/gui/worker/SendAsEMailAction.java
+++ b/src/main/java/org/jabref/gui/worker/SendAsEMailAction.java
@@ -20,8 +20,8 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Sends the selected entry as email - by Oliver Kopp
@@ -35,7 +35,7 @@
  */
 public class SendAsEMailAction extends AbstractWorker {
 
-    private static final Log LOGGER = LogFactory.getLog(SendAsEMailAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SendAsEMailAction.class);
     private final JabRefFrame frame;
     private String message;
 
diff --git a/src/main/java/org/jabref/gui/worker/VersionWorker.java b/src/main/java/org/jabref/gui/worker/VersionWorker.java
index c6b853215ff..5c4409c34d7 100644
--- a/src/main/java/org/jabref/gui/worker/VersionWorker.java
+++ b/src/main/java/org/jabref/gui/worker/VersionWorker.java
@@ -15,8 +15,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -28,7 +28,7 @@
  */
 public class VersionWorker extends SwingWorker<List<Version>, Void> {
 
-    private static final Log LOGGER = LogFactory.getLog(VersionWorker.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(VersionWorker.class);
 
     private final JabRefFrame mainFrame;
 
diff --git a/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java b/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java
index c689cc59761..95a651c7aa6 100644
--- a/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java
+++ b/src/main/java/org/jabref/logic/autosaveandbackup/AutosaveManager.java
@@ -16,8 +16,8 @@
 
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Saves the given {@link BibDatabaseContext} on every {@link BibDatabaseContextChangedEvent} by posting a new {@link AutosaveEvent}.
@@ -25,7 +25,7 @@
  */
 public class AutosaveManager {
 
-    private static final Log LOGGER = LogFactory.getLog(AutosaveManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AutosaveManager.class);
 
     private static Set<AutosaveManager> runningInstances = new HashSet<>();
 
@@ -94,7 +94,7 @@ public void unregisterListener(Object listener) {
             eventBus.unregister(listener);
         } catch (IllegalArgumentException e) {
             // occurs if the event source has not been registered, should not prevent shutdown
-            LOGGER.debug(e);
+            LOGGER.debug("Proble, unregistering", e);
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java b/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
index 44d7abb66d6..f3e7e813352 100644
--- a/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
+++ b/src/main/java/org/jabref/logic/autosaveandbackup/BackupManager.java
@@ -26,8 +26,8 @@
 import org.jabref.preferences.JabRefPreferences;
 
 import com.google.common.eventbus.Subscribe;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Backups the given bib database file from {@link BibDatabaseContext} on every {@link BibDatabaseContextChangedEvent}.
@@ -37,7 +37,7 @@
  */
 public class BackupManager {
 
-    private static final Log LOGGER = LogFactory.getLog(BackupManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BackupManager.class);
 
     private static final String BACKUP_EXTENSION = ".sav";
 
diff --git a/src/main/java/org/jabref/logic/auxparser/AuxParser.java b/src/main/java/org/jabref/logic/auxparser/AuxParser.java
index 33c331559bf..d3022072170 100644
--- a/src/main/java/org/jabref/logic/auxparser/AuxParser.java
+++ b/src/main/java/org/jabref/logic/auxparser/AuxParser.java
@@ -16,8 +16,8 @@
 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * LaTeX Aux to BibTeX Parser
@@ -34,7 +34,7 @@
  * Nested AUX files: \@input{x}
  */
 public class AuxParser {
-    private static final Log LOGGER = LogFactory.getLog(AuxParser.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AuxParser.class);
 
     private static final Pattern CITE_PATTERN = Pattern.compile("\\\\(citation|abx@aux@cite)\\{(.+)\\}");
     private static final Pattern INPUT_PATTERN = Pattern.compile("\\\\@input\\{(.+)\\}");
diff --git a/src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java b/src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java
index af576b95832..617ab01cf2e 100644
--- a/src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java
+++ b/src/main/java/org/jabref/logic/bibtex/DuplicateCheck.java
@@ -19,8 +19,8 @@
 import org.jabref.model.entry.FieldProperty;
 import org.jabref.model.entry.InternalBibtexFields;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class contains utility method for duplicate checking of entries.
@@ -28,7 +28,7 @@
 public class DuplicateCheck {
     private static final double DUPLICATE_THRESHOLD = 0.75; // The overall threshold to signal a duplicate pair
 
-    private static final Log LOGGER = LogFactory.getLog(DuplicateCheck.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DuplicateCheck.class);
     /*
      * Integer values for indicating result of duplicate check (for entries):
      */
diff --git a/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java b/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java
index c541b285330..bf3bad6ad75 100644
--- a/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java
+++ b/src/main/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGenerator.java
@@ -15,8 +15,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -27,7 +27,7 @@ public class BibtexKeyGenerator extends BracketedPattern {
      * All single characters that we can use for extending a key to make it unique.
      */
     public static final String APPENDIX_CHARACTERS = "abcdefghijklmnopqrstuvwxyz";
-    private static final Log LOGGER = LogFactory.getLog(BibtexKeyGenerator.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibtexKeyGenerator.class);
     private static final String KEY_ILLEGAL_CHARACTERS = "{}(),\\\"#~^':`";
     private static final String KEY_UNWANTED_CHARACTERS = "{}(),\\\"";
     private final AbstractBibtexKeyPattern citeKeyPattern;
diff --git a/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java b/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java
index f929c1ffdb0..a19b7de62e7 100644
--- a/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java
+++ b/src/main/java/org/jabref/logic/bst/BibtexCaseChanger.java
@@ -3,12 +3,12 @@
 import java.util.Locale;
 import java.util.Optional;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class BibtexCaseChanger {
 
-    private static final Log LOGGER = LogFactory.getLog(BibtexCaseChanger.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibtexCaseChanger.class);
 
     // stores whether the char before the current char was a colon
     private boolean prevColon = true;
diff --git a/src/main/java/org/jabref/logic/bst/BibtexWidth.java b/src/main/java/org/jabref/logic/bst/BibtexWidth.java
index d7538eafb26..6bd3d2f90e4 100644
--- a/src/main/java/org/jabref/logic/bst/BibtexWidth.java
+++ b/src/main/java/org/jabref/logic/bst/BibtexWidth.java
@@ -1,7 +1,7 @@
 package org.jabref.logic.bst;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -15,7 +15,7 @@
  */
 public class BibtexWidth {
 
-    private static final Log LOGGER = LogFactory.getLog(BibtexWidth.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibtexWidth.class);
 
     /*
      * Quoted from Bibtex:
diff --git a/src/main/java/org/jabref/logic/bst/VM.java b/src/main/java/org/jabref/logic/bst/VM.java
index 6c8d9cce1f8..5326e856338 100644
--- a/src/main/java/org/jabref/logic/bst/VM.java
+++ b/src/main/java/org/jabref/logic/bst/VM.java
@@ -25,8 +25,8 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -46,7 +46,7 @@ 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 static final Logger LOGGER = LoggerFactory.getLogger(VM.class);
 
     private List<BstEntry> entries;
 
@@ -500,7 +500,7 @@ private VM(CommonTree tree) {
          */
         buildInFunctions.put("stack$", context -> {
             while (!stack.empty()) {
-                LOGGER.debug(stack.pop());
+                LOGGER.debug("Stack entry", stack.pop());
             }
         });
 
@@ -564,7 +564,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("Stack entry", stack.pop()));
 
         /**
          * Pushes the current entry's type (book, article, etc.), but pushes
diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java b/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
index 6a721cb4fb6..da63d3b525f 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
@@ -29,8 +29,8 @@
 import org.jabref.logic.util.FileType;
 
 import de.undercouch.citeproc.helper.CSLUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.CharacterData;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -45,7 +45,7 @@
 public class CitationStyle {
 
     public static final String DEFAULT = "/ieee.csl";
-    private static final Log LOGGER = LogFactory.getLog(CitationStyle.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CitationStyle.class);
 
     private static final Pattern SNAPSHOT_NAME = Pattern.compile(".*styles-1\\.0\\.1-SNAPSHOT\\.jar");
 
diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java b/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java
index 9154420d742..5e39b25e621 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java
@@ -7,9 +7,9 @@
 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 org.jbibtex.TokenMgrException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -18,7 +18,7 @@
  */
 public class CitationStyleGenerator {
 
-    private static final Log LOGGER = LogFactory.getLog(CitationStyleGenerator.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CitationStyleGenerator.class);
     private static final CSLAdapter CSL_ADAPTER = new CSLAdapter();
 
     private CitationStyleGenerator() {
diff --git a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
index f2e94f90703..6ef4a5d46e9 100644
--- a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
@@ -22,12 +22,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MoveFilesCleanup implements CleanupJob {
 
-    private static final Log LOGGER = LogFactory.getLog(MoveFilesCleanup.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(MoveFilesCleanup.class);
     private final BibDatabaseContext databaseContext;
     private final FileDirectoryPreferences fileDirectoryPreferences;
 
diff --git a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
index f5566c6d271..3c69a6800f8 100644
--- a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
@@ -23,12 +23,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RenamePdfCleanup implements CleanupJob {
 
-    private static final Log LOGGER = LogFactory.getLog(RenamePdfCleanup.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RenamePdfCleanup.class);
 
     private final BibDatabaseContext databaseContext;
     private final boolean onlyRelativePaths;
diff --git a/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java b/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java
index 956dd35d59b..eccd9a739f9 100644
--- a/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java
@@ -41,8 +41,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Export format for the BibTeXML format.
@@ -51,7 +51,7 @@ public class BibTeXMLExporter extends Exporter {
 
     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(BibTeXMLExporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibTeXMLExporter.class);
     private JAXBContext context;
 
     public BibTeXMLExporter() {
diff --git a/src/main/java/org/jabref/logic/exporter/FileSaveSession.java b/src/main/java/org/jabref/logic/exporter/FileSaveSession.java
index e1b403da460..fa92e96c3ea 100644
--- a/src/main/java/org/jabref/logic/exporter/FileSaveSession.java
+++ b/src/main/java/org/jabref/logic/exporter/FileSaveSession.java
@@ -11,8 +11,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class used to handle safe storage to disk.
@@ -30,7 +30,7 @@
  */
 public class FileSaveSession extends SaveSession {
 
-    private static final Log LOGGER = LogFactory.getLog(FileSaveSession.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileSaveSession.class);
 
     // Filenames.
     private static final String BACKUP_EXTENSION = ".bak";
diff --git a/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java b/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java
index 0a13ea58f2c..ec2191e9f97 100644
--- a/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java
+++ b/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java
@@ -16,8 +16,8 @@
 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
@@ -29,7 +29,7 @@
  */
 class OOCalcDatabase {
 
-    private static final Log LOGGER = LogFactory.getLog(OOCalcDatabase.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OOCalcDatabase.class);
 
     private final List<BibEntry> entries;
 
diff --git a/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java b/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java
index 44b202a17ee..e546c119aad 100644
--- a/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java
+++ b/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java
@@ -16,8 +16,8 @@
 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
@@ -29,7 +29,7 @@
  */
 class OpenDocumentRepresentation {
 
-    private static final Log LOGGER = LogFactory.getLog(OpenDocumentRepresentation.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenDocumentRepresentation.class);
     private final List<BibEntry> entries;
 
     private final BibDatabase database;
diff --git a/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java b/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java
index 3bbfea3cdef..e29939061b6 100644
--- a/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java
+++ b/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java
@@ -32,15 +32,15 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author alver
  */
 public class OpenDocumentSpreadsheetCreator extends Exporter {
 
-    private static final Log LOGGER = LogFactory.getLog(OpenDocumentSpreadsheetCreator.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenDocumentSpreadsheetCreator.class);
 
 
     /**
diff --git a/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java b/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java
index c445e26dadb..ad46523fcbf 100644
--- a/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java
+++ b/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java
@@ -31,15 +31,15 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author alver
  */
 public class OpenOfficeDocumentCreator extends Exporter {
 
-    private static final Log LOGGER = LogFactory.getLog(OpenOfficeDocumentCreator.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenOfficeDocumentCreator.class);
 
 
     /**
diff --git a/src/main/java/org/jabref/logic/exporter/SaveSession.java b/src/main/java/org/jabref/logic/exporter/SaveSession.java
index 90b70ab68a9..225e2fab267 100644
--- a/src/main/java/org/jabref/logic/exporter/SaveSession.java
+++ b/src/main/java/org/jabref/logic/exporter/SaveSession.java
@@ -10,12 +10,12 @@
 
 import org.jabref.model.FieldChange;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class SaveSession {
 
-    private static final Log LOGGER = LogFactory.getLog(SaveSession.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SaveSession.class);
 
     protected boolean backup;
     protected final Charset encoding;
diff --git a/src/main/java/org/jabref/logic/exporter/StringSaveSession.java b/src/main/java/org/jabref/logic/exporter/StringSaveSession.java
index b1f522d6d88..7948e98f94f 100644
--- a/src/main/java/org/jabref/logic/exporter/StringSaveSession.java
+++ b/src/main/java/org/jabref/logic/exporter/StringSaveSession.java
@@ -7,12 +7,12 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class StringSaveSession extends SaveSession {
 
-    private static final Log LOGGER = LogFactory.getLog(StringSaveSession.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StringSaveSession.class);
 
     private final ByteArrayOutputStream outputStream;
 
@@ -29,7 +29,7 @@ public String getStringValue() {
         try {
             return outputStream.toString(encoding.name());
         } catch (UnsupportedEncodingException e) {
-            LOGGER.warn(e);
+            LOGGER.warn("Encoding problem", e);
             return "";
         }
     }
@@ -48,7 +48,7 @@ public void cancel() {
         try {
             outputStream.close();
         } catch (IOException e) {
-            LOGGER.warn(e);
+            LOGGER.warn("Error while cancel", e);
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
index b731c30ef62..06381b8be4e 100644
--- a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
@@ -23,8 +23,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Base class for export formats based on templates.
@@ -33,7 +33,7 @@ public class TemplateExporter extends Exporter {
 
     private static final String LAYOUT_PREFIX = "/resource/layout/";
 
-    private static final Log LOGGER = LogFactory.getLog(TemplateExporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TemplateExporter.class);
     private final String lfFileName;
     private final String directory;
     private final LayoutFormatterPreferences layoutPreferences;
@@ -224,7 +224,7 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
             if (defLayout != null) {
                 missingFormatters.addAll(defLayout.getMissingFormatters());
                 if (!missingFormatters.isEmpty()) {
-                    LOGGER.warn(missingFormatters);
+                    LOGGER.warn("Missing formatters found ", missingFormatters);
                 }
             }
             Map<String, Layout> layouts = new HashMap<>();
@@ -285,7 +285,7 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
             if (!missingFormatters.isEmpty()) {
                 StringBuilder sb = new StringBuilder("The following formatters could not be found: ");
                 sb.append(String.join(", ", missingFormatters));
-                LOGGER.warn(sb);
+                LOGGER.warn("Formatters not found", sb);
             }
             saveSession.finalize(file);
         }
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 e09f55f6a56..ba73bde75e3 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,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class HtmlToLatexFormatter implements LayoutFormatter, Formatter {
 
-    private static final Log LOGGER = LogFactory.getLog(HtmlToLatexFormatter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(HtmlToLatexFormatter.class);
 
     private static final int MAX_TAG_LENGTH = 100;
 
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 9feb6c4d83f..d6bb7aff5cd 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,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class UnicodeToLatexFormatter implements LayoutFormatter, Formatter {
 
-    private static final Log LOGGER = LogFactory.getLog(UnicodeToLatexFormatter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(UnicodeToLatexFormatter.class);
 
     @Override
     public String format(String text) {
diff --git a/src/main/java/org/jabref/logic/importer/FulltextFetchers.java b/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
index effcb72453d..0e8ccbcc1cd 100644
--- a/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
@@ -11,14 +11,14 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 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 static final Logger LOGGER = LoggerFactory.getLogger(FulltextFetchers.class);
 
     private final List<FulltextFetcher> finders = new ArrayList<>();
 
diff --git a/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
index e8c00dc4f5f..7bf609cd541 100644
--- a/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
@@ -13,9 +13,9 @@
 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 org.jsoup.helper.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Provides a convenient interface for ID-based fetcher, which follow the usual three-step procedure:
@@ -25,7 +25,7 @@
  */
 public interface IdBasedParserFetcher extends IdBasedFetcher {
 
-    Log LOGGER = LogFactory.getLog(IdBasedParserFetcher.class);
+    Logger LOGGER = LoggerFactory.getLogger(IdBasedParserFetcher.class);
 
     /**
      * Constructs a URL based on the query.
diff --git a/src/main/java/org/jabref/logic/importer/IdParserFetcher.java b/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
index f9608feac73..742f05f39a6 100644
--- a/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
@@ -15,8 +15,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Provides a convenient interface for {@link IdFetcher}, which follow the usual three-step procedure:
@@ -26,7 +26,7 @@
  */
 public interface IdParserFetcher<T extends Identifier> extends IdFetcher<T> {
 
-    Log LOGGER = LogFactory.getLog(IdParserFetcher.class);
+    Logger LOGGER = LoggerFactory.getLogger(IdParserFetcher.class);
 
     /**
      * Constructs a URL based on the {@link BibEntry}.
diff --git a/src/main/java/org/jabref/logic/importer/OpenDatabase.java b/src/main/java/org/jabref/logic/importer/OpenDatabase.java
index e5896632f7d..a9c59976717 100644
--- a/src/main/java/org/jabref/logic/importer/OpenDatabase.java
+++ b/src/main/java/org/jabref/logic/importer/OpenDatabase.java
@@ -13,12 +13,12 @@
 import org.jabref.logic.util.io.FileBasedLock;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class OpenDatabase {
 
-    public static final Log LOGGER = LogFactory.getLog(OpenDatabase.class);
+    public static final Logger LOGGER = LoggerFactory.getLogger(OpenDatabase.class);
 
     private OpenDatabase() {
     }
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 d485ce3bf17..b3af0802a5d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ACS.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ACS.java
@@ -10,17 +10,17 @@
 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 org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 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 Logger LOGGER = LoggerFactory.getLogger(ACS.class);
 
     private static final String SOURCE = "http://pubs.acs.org/doi/abs/%s";
 
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 aa60da7a625..666b773c2e3 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java
@@ -35,9 +35,9 @@
 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 org.apache.http.client.utils.URIBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
@@ -54,7 +54,7 @@
  * <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 Logger LOGGER = LoggerFactory.getLogger(ArXiv.class);
 
     private static final String API_URL = "http://export.arxiv.org/api/query";
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java b/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java
index 0c21b9c72b8..10801ea56de 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java
@@ -10,8 +10,8 @@
 import org.jabref.logic.net.URLDownload;
 import org.jabref.model.entry.BibEntry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Convenience class for getting BibTeX entries from the BibSonomy scraper,
@@ -22,7 +22,7 @@ public class BibsonomyScraper {
     private static final String BIBSONOMY_SCRAPER = "http://scraper.bibsonomy.org/service?url=";
     private static final String BIBSONOMY_SCRAPER_POST = "&format=bibtex";
 
-    private static final Log LOGGER = LogFactory.getLog(BibsonomyScraper.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibsonomyScraper.class);
 
     private BibsonomyScraper() {
     }
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 534045ce6b2..cf635ed7c6b 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
@@ -14,19 +14,19 @@
 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 org.jsoup.Connection;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DoiResolution.class);
 
     @Override
     public Optional<URL> findFullText(BibEntry entry) throws IOException {
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 1a1a47d2423..a2f13886704 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
@@ -25,18 +25,18 @@
 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;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.select.Elements;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 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 Logger LOGGER = LoggerFactory.getLogger(GoogleScholar.class);
 
     private static final Pattern LINK_TO_BIB_PATTERN = Pattern.compile("(https:\\/\\/scholar.googleusercontent.com\\/scholar.bib[^\"]*)");
 
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 d7b02b16bda..ea5e069e6bb 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,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class for finding PDF URLs for entries on IEEE
@@ -23,7 +23,7 @@
  */
 public class IEEE implements FulltextFetcher {
 
-    private static final Log LOGGER = LogFactory.getLog(IEEE.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(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[^\"]+)\"");
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java
index 8da8608dba1..e7217dadd65 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java
@@ -27,14 +27,14 @@
 import org.jabref.model.entry.FieldName;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class IacrEprintFetcher implements IdBasedFetcher {
 
     public static final String NAME = "IACR eprints";
 
-    private static final Log LOGGER = LogFactory.getLog(IacrEprintFetcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(IacrEprintFetcher.class);
     private static final Pattern DATE_FROM_WEBSITE_AFTER_2000_PATTERN = Pattern.compile("[a-z ]+(\\d{1,2} [A-Za-z][a-z]{2} \\d{4})");
     private static final DateTimeFormatter DATE_FORMAT_WEBSITE_AFTER_2000 = DateTimeFormatter.ofPattern("d MMM yyyy", Locale.US);
     private static final Pattern DATE_FROM_WEBSITE_BEFORE_2000_PATTERN = Pattern.compile("[A-Za-z ]+? ([A-Za-z][a-z]{2,10} \\d{1,2}(th|st|nd|rd)?, \\d{4})\\.?");
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 0ed8ad7acde..11e8420955c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
@@ -32,9 +32,9 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Fetch or search from PubMed <a href="http://www.ncbi.nlm.nih.gov/sites/entrez/">www.ncbi.nlm.nih.gov</a>
@@ -42,7 +42,7 @@
  * 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 Logger LOGGER = LoggerFactory.getLogger(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";
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 9acaba3ad5f..199d68dee32 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
@@ -20,15 +20,15 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 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 Logger LOGGER = LoggerFactory.getLogger(MrDLibFetcher.class);
 
     private static final String NAME = "MDL_FETCHER";
     private final String LANGUAGE;
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 8d9e8e049dd..f8d422d36e7 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java
@@ -15,14 +15,14 @@
 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;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * FulltextFetcher implementation that attempts to find a PDF URL at ScienceDirect.
@@ -30,7 +30,7 @@
  * @see http://dev.elsevier.com/
  */
 public class ScienceDirect implements FulltextFetcher {
-    private static final Log LOGGER = LogFactory.getLog(ScienceDirect.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ScienceDirect.class);
 
     private static final String API_URL = "http://api.elsevier.com/content/article/doi/";
     private static final String API_KEY = "fb82f2e692b3c72dafe5f4f1fa0ac00b";
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 1cebab8d3d8..94d99fe273d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java
@@ -14,9 +14,9 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * FulltextFetcher implementation that attempts to find a PDF URL at SpringerLink.
@@ -24,7 +24,7 @@
  * 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 Logger LOGGER = LoggerFactory.getLogger(SpringerLink.class);
 
     private static final String API_URL = "http://api.springer.com/meta/v1/json";
     private static final String API_KEY = "b0c7151179b3d9c1119cf325bca8460d";
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 f4aca185790..b8c2fbbda8a 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 1520638f9c8..a67fcaffd75 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,8 @@
 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Importer for the BibTeXML format.
@@ -40,7 +40,7 @@
  */
 public class BibTeXMLImporter extends Importer {
 
-    private static final Log LOGGER = LogFactory.getLog(BibTeXMLImporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibTeXMLImporter.class);
 
     private static final Pattern START_PATTERN = Pattern.compile("<(bibtex:)?file .*");
 
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 7c16ec6d697..bbf59d43c7e 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,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class for importing BibTeX-files.
@@ -58,7 +58,7 @@
  */
 public class BibtexParser implements Parser {
 
-    private static final Log LOGGER = LogFactory.getLog(BibtexParser.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibtexParser.class);
     private static final Integer LOOKAHEAD = 64;
     private final FieldContentParser fieldContentParser;
     private final Deque<Character> pureTextFromFile = new LinkedList<>();
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 c11301f2896..0beeb312251 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,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This importer parses text format citations using the online API of FreeCite -
@@ -41,7 +41,7 @@
  */
 public class FreeCiteImporter extends Importer {
 
-    private static final Log LOGGER = LogFactory.getLog(FreeCiteImporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FreeCiteImporter.class);
 
     private final ImportFormatPreferences importFormatPreferences;
 
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 6acc7bf883e..a13fed8d53d 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,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -24,7 +24,7 @@
 import org.xml.sax.SAXException;
 
 public class GvkParser implements Parser {
-    private static final Log LOGGER = LogFactory.getLog(GvkParser.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(GvkParser.class);
 
     @Override
     public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
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 7cf1ac272a7..c9044ba46ac 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,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Importer for the Medline/Pubmed format.
@@ -89,7 +89,7 @@
  */
 public class MedlineImporter extends Importer implements Parser {
 
-    private static final Log LOGGER = LogFactory.getLog(MedlineImporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(MedlineImporter.class);
     private static final String KEYWORD_SEPARATOR = "; ";
 
     private static final Locale ENGLISH = Locale.ENGLISH;
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 8136aa7a2b8..1a4c3b940c3 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,8 @@
 import org.jabref.preferences.JabRefPreferences;
 
 import com.google.common.base.Joiner;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Importer for the MODS format.<br>
@@ -69,7 +69,7 @@
  */
 public class ModsImporter extends Importer implements Parser {
 
-    private static final Log LOGGER = LogFactory.getLog(ModsImporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ModsImporter.class);
     private static final String KEYWORD_SEPARATOR = JabRefPreferences.getInstance().getImportFormatPreferences()
             .getKeywordSeparator() + " ";
 
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 5bef0e35e3e..78a5a6630ca 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
@@ -23,8 +23,8 @@
 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -35,7 +35,7 @@
  */
 public class MrDLibImporter extends Importer {
 
-    private static final Log LOGGER = LogFactory.getLog(MrDLibImporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(MrDLibImporter.class);
     public ParserResult parserResult;
 
     @Override
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 f4b0961c66b..7ff09ddccf9 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,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Imports a New Economics Papers-Message from the REPEC-NEP Service.
@@ -141,7 +141,7 @@
  */
 public class RepecNepImporter extends Importer {
 
-    private static final Log LOGGER = LogFactory.getLog(RepecNepImporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RepecNepImporter.class);
 
     private static final Collection<String> RECOGNIZED_FIELDS = Arrays.asList("Keywords", "JEL", "Date", "URL", "By");
     private final ImportFormatPreferences importFormatPreferences;
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 72d33e2c07c..17a23c3e44c 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,14 @@
 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 org.json.JSONArray;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JSONEntryParser {
 
-    private static final Log LOGGER = LogFactory.getLog(JSONEntryParser.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JSONEntryParser.class);
 
     /**
      * Convert a JSONObject containing a bibJSON entry to a BibEntry
diff --git a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
index b44a51c1a96..5bf1e941544 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -18,12 +18,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MetaDataParser {
 
-    private static final Log LOGGER = LogFactory.getLog(MetaDataParser.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(MetaDataParser.class);
 
     private MetaDataParser() {
     }
diff --git a/src/main/java/org/jabref/logic/journals/AbbreviationParser.java b/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
index 589081ab6e0..77d0483027f 100644
--- a/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
+++ b/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
@@ -17,15 +17,15 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 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 static final Logger LOGGER = LoggerFactory.getLogger(AbbreviationParser.class);
 
     private final Set<Abbreviation> abbreviations = new HashSet<>(5000);
 
diff --git a/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java b/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
index 21f4f59f5bf..f1cde1f65b2 100644
--- a/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
+++ b/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
@@ -7,12 +7,12 @@
 import java.util.List;
 import java.util.Objects;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JournalAbbreviationLoader {
 
-    private static final Log LOGGER = LogFactory.getLog(JournalAbbreviationLoader.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JournalAbbreviationLoader.class);
 
     // journal initialization
     private static final String JOURNALS_FILE_BUILTIN = "/journals/journalList.txt";
diff --git a/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java b/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
index 08743e3ffe2..a3692c9817d 100644
--- a/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
+++ b/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
@@ -7,15 +7,15 @@
 import java.util.Optional;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A repository for all journal abbreviations, including add and find methods.
  */
 public class JournalAbbreviationRepository {
 
-    private static final Log LOGGER = LogFactory.getLog(JournalAbbreviationRepository.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(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) {
diff --git a/src/main/java/org/jabref/logic/l10n/Localization.java b/src/main/java/org/jabref/logic/l10n/Localization.java
index e59ab8472f9..318193aefc4 100644
--- a/src/main/java/org/jabref/logic/l10n/Localization.java
+++ b/src/main/java/org/jabref/logic/l10n/Localization.java
@@ -13,8 +13,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Provides handling for messages and menu entries in the preferred language of the user.
@@ -37,7 +37,7 @@ public class Localization {
     static final String RESOURCE_PREFIX = "l10n/JabRef";
     static final String MENU_RESOURCE_PREFIX = "l10n/Menu";
 
-    private static final Log LOGGER = LogFactory.getLog(Localization.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Localization.class);
 
     private static Locale locale;
     private static LocalizationBundle localizedMessages;
diff --git a/src/main/java/org/jabref/logic/layout/Layout.java b/src/main/java/org/jabref/logic/layout/Layout.java
index 8b541cc36a3..60baa835a42 100644
--- a/src/main/java/org/jabref/logic/layout/Layout.java
+++ b/src/main/java/org/jabref/logic/layout/Layout.java
@@ -8,15 +8,15 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Main class for formatting DOCUMENT ME!
  */
 public class Layout {
 
-    private static final Log LOGGER = LogFactory.getLog(Layout.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Layout.class);
 
     private final List<LayoutEntry> layoutEntries;
 
diff --git a/src/main/java/org/jabref/logic/layout/LayoutEntry.java b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
index 90cb598f4ca..0c885721c11 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutEntry.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
@@ -81,11 +81,11 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class LayoutEntry {
-    private static final Log LOGGER = LogFactory.getLog(LayoutEntry.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LayoutEntry.class);
 
     private List<LayoutFormatter> option;
 
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 185a8ca5602..28aadfaea8b 100644
--- a/src/main/java/org/jabref/logic/layout/format/FileLink.java
+++ b/src/main/java/org/jabref/logic/layout/format/FileLink.java
@@ -8,20 +8,15 @@
 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;
 
-
     public FileLink(FileLinkPreferences fileLinkPreferences) {
         this.prefs = fileLinkPreferences;
     }
@@ -40,8 +35,7 @@ public String format(String field) {
             if (!(fileList.isEmpty())) {
                 link = fileList.get(0);
             }
-        }
-        else {
+        } else {
             // A file type is specified:
             for (LinkedFile flEntry : fileList) {
                 if (flEntry.getFileType().equalsIgnoreCase(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 325812058fd..61945a01d51 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,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Transform a LaTeX-String to RTF.
@@ -25,7 +25,7 @@
  */
 public class RTFChars implements LayoutFormatter {
 
-    private static final Log LOGGER = LogFactory.getLog(LayoutFormatter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LayoutFormatter.class);
 
     private static final RtfCharMap RTF_CHARS = new RtfCharMap();
 
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 7630f15ecb2..1c9cba82a1c 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;
@@ -104,7 +100,6 @@ public class WrapFileLinks extends AbstractParamLayoutFormatter {
     private String fileType;
     private List<FormatEntry> format;
 
-
     public WrapFileLinks(FileLinkPreferences fileLinkPreferences) {
         this.prefs = fileLinkPreferences;
     }
@@ -193,52 +188,52 @@ public String format(String field) {
 
                 for (FormatEntry entry : format) {
                     switch (entry.getType()) {
-                    case STRING:
-                        sb.append(entry.getString());
-                        break;
-                    case ITERATION_COUNT:
-                        sb.append(piv);
-                        break;
-                    case FILE_PATH:
-                        List<String> dirs;
-                        // We need to resolve the file directory from the database's metadata,
-                        // but that is not available from a formatter. Therefore, as an
-                        // ugly hack, the export routine has set a global variable before
-                        // starting the export, which contains the database's file directory:
-                        if ((prefs.getFileDirForDatabase() == null) || prefs.getFileDirForDatabase().isEmpty()) {
-                            dirs = prefs.getGeneratedDirForDatabase();
-                        } else {
-                            dirs = prefs.getFileDirForDatabase();
-                        }
-
-                        String pathString = flEntry.findIn(dirs.stream().map(Paths::get).collect(Collectors.toList()))
-                                .map(path -> path.toAbsolutePath().toString())
-                                .orElse(flEntry.getLink());
-
-                        sb.append(replaceStrings(pathString));
-                        break;
-                    case RELATIVE_FILE_PATH:
-
-                        /*
-                         * Stumbled over this while investigating
-                         *
-                         * https://sourceforge.net/tracker/index.php?func=detail&aid=1469903&group_id=92314&atid=600306
-                         */
-                        sb.append(replaceStrings(flEntry.getLink()));//f.toURI().toString();
-
-                        break;
-                    case FILE_EXTENSION:
-                        FileHelper.getFileExtension(flEntry.getLink())
-                                .ifPresent(extension -> sb.append(replaceStrings(extension)));
-                        break;
-                    case FILE_TYPE:
-                        sb.append(replaceStrings(flEntry.getFileType()));
-                        break;
-                    case FILE_DESCRIPTION:
-                        sb.append(replaceStrings(flEntry.getDescription()));
-                        break;
-                    default:
-                        break;
+                        case STRING:
+                            sb.append(entry.getString());
+                            break;
+                        case ITERATION_COUNT:
+                            sb.append(piv);
+                            break;
+                        case FILE_PATH:
+                            List<String> dirs;
+                            // We need to resolve the file directory from the database's metadata,
+                            // but that is not available from a formatter. Therefore, as an
+                            // ugly hack, the export routine has set a global variable before
+                            // starting the export, which contains the database's file directory:
+                            if ((prefs.getFileDirForDatabase() == null) || prefs.getFileDirForDatabase().isEmpty()) {
+                                dirs = prefs.getGeneratedDirForDatabase();
+                            } else {
+                                dirs = prefs.getFileDirForDatabase();
+                            }
+
+                            String pathString = flEntry.findIn(dirs.stream().map(Paths::get).collect(Collectors.toList()))
+                                    .map(path -> path.toAbsolutePath().toString())
+                                    .orElse(flEntry.getLink());
+
+                            sb.append(replaceStrings(pathString));
+                            break;
+                        case RELATIVE_FILE_PATH:
+
+                            /*
+                             * Stumbled over this while investigating
+                             *
+                             * https://sourceforge.net/tracker/index.php?func=detail&aid=1469903&group_id=92314&atid=600306
+                             */
+                            sb.append(replaceStrings(flEntry.getLink()));//f.toURI().toString();
+
+                            break;
+                        case FILE_EXTENSION:
+                            FileHelper.getFileExtension(flEntry.getLink())
+                                    .ifPresent(extension -> sb.append(replaceStrings(extension)));
+                            break;
+                        case FILE_TYPE:
+                            sb.append(replaceStrings(flEntry.getFileType()));
+                            break;
+                        case FILE_DESCRIPTION:
+                            sb.append(replaceStrings(flEntry.getDescription()));
+                            break;
+                        default:
+                            break;
                     }
                 }
 
@@ -272,7 +267,6 @@ static class FormatEntry {
         private final int type;
         private String string;
 
-
         public FormatEntry(int type) {
             this.type = type;
         }
diff --git a/src/main/java/org/jabref/logic/logging/JabRefLogger.java b/src/main/java/org/jabref/logic/logging/JabRefLogger.java
index ee47c817439..f5643147490 100644
--- a/src/main/java/org/jabref/logic/logging/JabRefLogger.java
+++ b/src/main/java/org/jabref/logic/logging/JabRefLogger.java
@@ -1,15 +1,15 @@
 package org.jabref.logic.logging;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JabRefLogger {
-    private static final Log LOGGER = LogFactory.getLog(JabRefLogger.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefLogger.class);
 
     private JabRefLogger() {
     }
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java b/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
index 56703304e3d..b62bd47c24f 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
@@ -15,8 +15,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -34,7 +34,7 @@ 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 static final Logger LOGGER = LoggerFactory.getLogger(MSBibDatabase.class);
 
     private Set<MSBibEntry> entries;
 
diff --git a/src/main/java/org/jabref/logic/net/URLDownload.java b/src/main/java/org/jabref/logic/net/URLDownload.java
index 0e023ffee53..3340c3d4443 100644
--- a/src/main/java/org/jabref/logic/net/URLDownload.java
+++ b/src/main/java/org/jabref/logic/net/URLDownload.java
@@ -40,8 +40,8 @@
 import org.jabref.model.util.FileHelper;
 
 import com.mashape.unirest.http.Unirest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * URL download to a string.
@@ -58,7 +58,7 @@ public class URLDownload {
 
     public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:56.0) Gecko/20100101 Firefox/56.0";
 
-    private static final Log LOGGER = LogFactory.getLog(URLDownload.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(URLDownload.class);
     private final URL source;
     private final Map<String, String> parameters = new HashMap<>();
     private String postData = "";
diff --git a/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java b/src/main/java/org/jabref/logic/openoffice/OOBibStyle.java
index acaa48c8a1a..b07f09c55a8 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class embodies a bibliography formatting for OpenOffice, which is composed
@@ -101,7 +101,7 @@ public class OOBibStyle implements Comparable<OOBibStyle> {
 
     private static final Pattern QUOTED = Pattern.compile("\".*\"");
 
-    private static final Log LOGGER = LogFactory.getLog(OOBibStyle.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(OOBibStyle.class);
 
     private String name = "";
 
diff --git a/src/main/java/org/jabref/logic/openoffice/StyleLoader.java b/src/main/java/org/jabref/logic/openoffice/StyleLoader.java
index 405478002c9..e58252c63ea 100644
--- a/src/main/java/org/jabref/logic/openoffice/StyleLoader.java
+++ b/src/main/java/org/jabref/logic/openoffice/StyleLoader.java
@@ -11,15 +11,15 @@
 
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StyleLoader.class);
 
     // All internal styles
     private final List<String> internalStyleFiles = Arrays.asList(DEFAULT_AUTHORYEAR_STYLE_PATH,
diff --git a/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java b/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
index e4b2796aa8a..46a3209eb01 100644
--- a/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
+++ b/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
@@ -11,12 +11,12 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FileAnnotationCache {
 
-    private static final Log LOGGER = LogFactory.getLog(FileAnnotation.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileAnnotation.class);
     //cache size in entries
     private final static int CACHE_SIZE = 10;
 
diff --git a/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java b/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
index e74351fab67..0f973f25afa 100644
--- a/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
+++ b/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
@@ -14,17 +14,17 @@
 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 org.apache.pdfbox.cos.COSArray;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PdfAnnotationImporter implements AnnotationImporter {
 
-    private static final Log LOGGER = LogFactory.getLog(PdfAnnotationImporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PdfAnnotationImporter.class);
 
     /**
      * Imports the comments from a pdf specified by its path
diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java
index 8517c453c50..dcec9014e5e 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java
@@ -12,12 +12,12 @@
 
 import org.jabref.logic.util.OS;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ProtectedTermsList implements Comparable<ProtectedTermsList> {
 
-    private static final Log LOGGER = LogFactory.getLog(ProtectedTermsList.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProtectedTermsList.class);
 
     private String description;
     private final List<String> termsList;
diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java
index d2c2d6e7d06..165489a2ef6 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java
@@ -15,14 +15,14 @@
 
 import org.jabref.logic.l10n.Localization;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ProtectedTermsLoader {
 
     private static final Map<String, Supplier<String>> INTERNAL_LISTS = new HashMap<>();
 
-    private static final Log LOGGER = LogFactory.getLog(ProtectedTermsLoader.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProtectedTermsLoader.class);
 
     private final List<ProtectedTermsList> mainList = new ArrayList<>();
 
diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
index aac990c5b9c..1f348d4fde9 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
@@ -17,15 +17,15 @@
 
 import org.jabref.logic.l10n.Localization;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 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 static final Logger LOGGER = LoggerFactory.getLogger(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");
diff --git a/src/main/java/org/jabref/logic/remote/client/RemoteListenerClient.java b/src/main/java/org/jabref/logic/remote/client/RemoteListenerClient.java
index dedf61bd817..ab319ffcaf0 100644
--- a/src/main/java/org/jabref/logic/remote/client/RemoteListenerClient.java
+++ b/src/main/java/org/jabref/logic/remote/client/RemoteListenerClient.java
@@ -6,12 +6,12 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.remote.shared.Protocol;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RemoteListenerClient {
 
-    private static final Log LOGGER = LogFactory.getLog(RemoteListenerClient.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoteListenerClient.class);
 
     private static final int TIMEOUT = 2000;
 
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 e07b89bbef3..76757d46e2a 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,11 @@
 
 import org.jabref.logic.remote.shared.Protocol;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class RemoteListenerServer implements Runnable {
-    private static final Log LOGGER = LogFactory.getLog(RemoteListenerServer.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoteListenerServer.class);
 
     private static final int BACKLOG = 1;
 
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 c043a186c26..7ccbfb0572b 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,8 @@
 
 import org.jabref.JabRefExecutorService;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Manages the RemoteListenerServerThread through typical life cycle methods.
@@ -18,7 +18,7 @@
  */
 public class RemoteListenerServerLifecycle implements AutoCloseable {
 
-    private static final Log LOGGER = LogFactory.getLog(RemoteListenerServerLifecycle.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoteListenerServerLifecycle.class);
 
     private RemoteListenerServerThread remoteListenerServerThread;
 
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 922d824377a..c4344897b8f 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,15 @@
 
 import java.io.IOException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 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 static final Logger LOGGER = LoggerFactory.getLogger(RemoteListenerServerThread.class);
 
     private final RemoteListenerServer server;
 
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 81440b1b0c9..25cfce268bf 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,8 @@
 import java.net.Socket;
 import java.net.SocketTimeoutException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Every message is terminated with '\0'.
@@ -16,7 +16,7 @@ public class Protocol {
 
     public static final String IDENTIFIER = "jabref";
 
-    private static final Log LOGGER = LogFactory.getLog(Protocol.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Protocol.class);
 
     private final Socket socket;
     private final OutputStream out;
diff --git a/src/main/java/org/jabref/logic/search/DatabaseSearcher.java b/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
index 425fee9c9b8..5e3cd1805a7 100644
--- a/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
+++ b/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
@@ -9,15 +9,15 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Silberer, Zirn
  */
 public class DatabaseSearcher {
 
-    private static final Log LOGGER = LogFactory.getLog(DatabaseSearcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseSearcher.class);
     private final SearchQuery query;
 
     private final BibDatabase database;
diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnection.java b/src/main/java/org/jabref/logic/shared/DBMSConnection.java
index 950811351cb..b0bf08a72bf 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSConnection.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSConnection.java
@@ -11,12 +11,12 @@
 import org.jabref.model.database.shared.DBMSType;
 import org.jabref.model.database.shared.DatabaseConnection;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DBMSConnection implements DatabaseConnection {
 
-    private static final Log LOGGER = LogFactory.getLog(DBMSConnection.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DBMSConnection.class);
 
     private final Connection connection;
     private final DBMSConnectionProperties properties;
diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java b/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
index b4cbf90cb6e..2c50fa82c25 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
@@ -10,15 +10,15 @@
 import org.jabref.model.database.shared.DBMSType;
 import org.jabref.model.database.shared.DatabaseConnectionProperties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Keeps all essential data for establishing a new connection to a DBMS using {@link DBMSConnection}.
  */
 public class DBMSConnectionProperties implements DatabaseConnectionProperties {
 
-    private static final Log LOGGER = LogFactory.getLog(DBMSConnectionProperties.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DBMSConnectionProperties.class);
 
     private DBMSType type;
     private String host;
diff --git a/src/main/java/org/jabref/logic/shared/DBMSProcessor.java b/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
index 5e5ac46aa49..9ebf92f0d33 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
@@ -22,8 +22,8 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.event.EntryEventSource;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Processes all incoming or outgoing bib data to external SQL Database and manages its structure.
@@ -33,7 +33,7 @@ public abstract class DBMSProcessor {
     public static final String PROCESSOR_ID = UUID.randomUUID().toString();
 
 
-    protected static final Log LOGGER = LogFactory.getLog(DBMSProcessor.class);
+    protected static final Logger LOGGER = LoggerFactory.getLogger(DBMSProcessor.class);
 
     protected final Connection connection;
 
diff --git a/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java b/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
index 965329b0e77..f3a38fed36a 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
@@ -34,8 +34,8 @@
 
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Synchronizes the shared or local databases with their opposite side.
@@ -43,7 +43,7 @@
  */
 public class DBMSSynchronizer implements DatabaseSynchronizer {
 
-    private static final Log LOGGER = LogFactory.getLog(DBMSSynchronizer.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DBMSSynchronizer.class);
 
     private DBMSProcessor dbmsProcessor;
     private String dbName;
diff --git a/src/main/java/org/jabref/logic/shared/exception/InvalidDBMSConnectionPropertiesException.java b/src/main/java/org/jabref/logic/shared/exception/InvalidDBMSConnectionPropertiesException.java
index 71102b2ecfa..c3cac825b9d 100644
--- a/src/main/java/org/jabref/logic/shared/exception/InvalidDBMSConnectionPropertiesException.java
+++ b/src/main/java/org/jabref/logic/shared/exception/InvalidDBMSConnectionPropertiesException.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.shared.exception;
 
+import org.jabref.logic.shared.DBMSConnectionProperties;
+
 /**
  * This exception is thrown in case that {@link DBMSConnectionProperties} does not provide all data needed for a connection.
  */
diff --git a/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java b/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
index 874c831aff8..6ae59105a7b 100644
--- a/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
+++ b/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
@@ -10,15 +10,15 @@
 import org.jabref.logic.shared.security.Password;
 import org.jabref.model.database.shared.DatabaseConnectionProperties;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Stores and reads persistent data for {@link org.jabref.gui.shared.ConnectToSharedDatabaseDialog}.
  */
 public class SharedDatabasePreferences {
 
-    private static final Log LOGGER = LogFactory.getLog(SharedDatabasePreferences.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SharedDatabasePreferences.class);
 
     private static final String DEFAULT_NODE = "default";
     private static final String PARENT_NODE = "jabref-shared";
diff --git a/src/main/java/org/jabref/logic/util/BracketedPattern.java b/src/main/java/org/jabref/logic/util/BracketedPattern.java
index 2371a9b9d5d..d4efe8a8085 100644
--- a/src/main/java/org/jabref/logic/util/BracketedPattern.java
+++ b/src/main/java/org/jabref/logic/util/BracketedPattern.java
@@ -25,8 +25,8 @@
 import org.jabref.model.entry.KeywordList;
 import org.jabref.model.strings.StringUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The BracketedExpressionExpander provides methods to expand bracketed expressions,
@@ -36,7 +36,7 @@
  */
 public class BracketedPattern {
 
-    private static final Log LOGGER = LogFactory.getLog(BracketedPattern.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BracketedPattern.class);
 
     private static final String STARTING_CAPITAL_PATTERN = "[^A-Z]";
     private static final int CHARS_OF_FIRST = 5;
diff --git a/src/main/java/org/jabref/logic/util/Version.java b/src/main/java/org/jabref/logic/util/Version.java
index 735c930cde6..52ed2b45795 100644
--- a/src/main/java/org/jabref/logic/util/Version.java
+++ b/src/main/java/org/jabref/logic/util/Version.java
@@ -12,10 +12,10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents the Application Version with the major and minor number, the full Version String and if it's a developer
@@ -24,7 +24,7 @@
 public class Version {
 
     public static final String JABREF_DOWNLOAD_URL = "https://downloads.jabref.org";
-    private static final Log LOGGER = LogFactory.getLog(Version.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Version.class);
 
     private static final Version UNKNOWN_VERSION = new Version();
 
diff --git a/src/main/java/org/jabref/logic/util/io/FileBasedLock.java b/src/main/java/org/jabref/logic/util/io/FileBasedLock.java
index 9b4be7453ca..5c1bf0a3a64 100644
--- a/src/main/java/org/jabref/logic/util/io/FileBasedLock.java
+++ b/src/main/java/org/jabref/logic/util/io/FileBasedLock.java
@@ -7,8 +7,8 @@
 import java.nio.file.attribute.FileTime;
 import java.util.Optional;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FileBasedLock {
     /**
@@ -16,7 +16,7 @@ public class FileBasedLock {
      */
     public static final long LOCKFILE_CRITICAL_AGE = 60000;
 
-    private static final Log LOGGER = LogFactory.getLog(FileBasedLock.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileBasedLock.class);
     private static final String LOCKFILE_SUFFIX = ".lock";
 
     // default retry count for aquiring file lock
diff --git a/src/main/java/org/jabref/logic/util/io/FileUtil.java b/src/main/java/org/jabref/logic/util/io/FileUtil.java
index 022311cd6db..d67feca6f6f 100644
--- a/src/main/java/org/jabref/logic/util/io/FileUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/FileUtil.java
@@ -30,14 +30,14 @@
 import org.jabref.model.util.OptionalUtil;
 
 import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FileUtil {
 
     public static final boolean IS_POSIX_COMPILANT = FileSystems.getDefault().supportedFileAttributeViews().contains("posix");
     public static final int MAXIMUM_FILE_NAME_LENGTH = 255;
-    private static final Log LOGGER = LogFactory.getLog(FileUtil.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileUtil.class);
 
     private FileUtil() {
     }
diff --git a/src/main/java/org/jabref/logic/util/io/XMLUtil.java b/src/main/java/org/jabref/logic/util/io/XMLUtil.java
index 215af84ede7..3bff65dbb34 100644
--- a/src/main/java/org/jabref/logic/util/io/XMLUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/XMLUtil.java
@@ -14,8 +14,8 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
@@ -26,7 +26,7 @@
  * Currently used for debugging only
  */
 public class XMLUtil {
-    private static final Log LOGGER = LogFactory.getLog(XMLUtil.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(XMLUtil.class);
 
     private XMLUtil() {
     }
diff --git a/src/main/java/org/jabref/logic/xmp/XMPUtil.java b/src/main/java/org/jabref/logic/xmp/XMPUtil.java
index d85b2750608..73d63a4b1b1 100644
--- a/src/main/java/org/jabref/logic/xmp/XMPUtil.java
+++ b/src/main/java/org/jabref/logic/xmp/XMPUtil.java
@@ -34,8 +34,6 @@
 import org.jabref.model.entry.Month;
 import org.jabref.model.strings.StringUtil;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.jempbox.impl.DateConverter;
 import org.apache.jempbox.impl.XMLUtil;
 import org.apache.jempbox.xmp.XMPMetadata;
@@ -52,6 +50,8 @@
 import org.apache.pdfbox.pdmodel.common.PDMetadata;
 import org.apache.pdfbox.pdmodel.encryption.BadSecurityHandlerException;
 import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 
 /**
@@ -60,7 +60,7 @@
  */
 public class XMPUtil {
 
-    private static final Log LOGGER = LogFactory.getLog(XMPUtil.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(XMPUtil.class);
 
     private XMPUtil() {
     }
diff --git a/src/main/java/org/jabref/migrations/PreferencesMigrations.java b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
index 5a32fe85f91..81c2ae2cda0 100644
--- a/src/main/java/org/jabref/migrations/PreferencesMigrations.java
+++ b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
@@ -17,12 +17,12 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PreferencesMigrations {
 
-    private static final Log LOGGER = LogFactory.getLog(PreferencesMigrations.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PreferencesMigrations.class);
 
     private PreferencesMigrations() {
     }
diff --git a/src/main/java/org/jabref/model/database/BibDatabase.java b/src/main/java/org/jabref/model/database/BibDatabase.java
index a5df29c3157..5003c78255c 100644
--- a/src/main/java/org/jabref/model/database/BibDatabase.java
+++ b/src/main/java/org/jabref/model/database/BibDatabase.java
@@ -35,14 +35,14 @@
 
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A bibliography database.
  */
 public class BibDatabase {
-    private static final Log LOGGER = LogFactory.getLog(BibDatabase.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibDatabase.class);
     private static final Pattern RESOLVE_CONTENT_PATTERN = Pattern.compile(".*#[^#]+#.*");
     /**
      * State attributes
@@ -573,7 +573,7 @@ public void unregisterListener(Object listener) {
             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("Problem unregistering", e);
         }
     }
 
diff --git a/src/main/java/org/jabref/model/database/event/BibDatabaseContextChangedEvent.java b/src/main/java/org/jabref/model/database/event/BibDatabaseContextChangedEvent.java
index 94621e55d07..5e67bea2bb0 100644
--- a/src/main/java/org/jabref/model/database/event/BibDatabaseContextChangedEvent.java
+++ b/src/main/java/org/jabref/model/database/event/BibDatabaseContextChangedEvent.java
@@ -1,5 +1,7 @@
 package org.jabref.model.database.event;
 
+import org.jabref.model.entry.event.EntryEvent;
+import org.jabref.model.groups.event.GroupUpdatedEvent;
 import org.jabref.model.metadata.event.MetaDataChangedEvent;
 
 /**
diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index 12e515b25e6..c87a73bdd3b 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -33,8 +33,8 @@
 
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class BibEntry implements Cloneable {
 
@@ -43,7 +43,7 @@ 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 Logger LOGGER = LoggerFactory.getLogger(BibEntry.class);
     private static final Pattern REMOVE_TRAILING_WHITESPACE = Pattern.compile("\\s+$");
     private final SharedBibEntryData sharedBibEntryData;
     /**
@@ -735,7 +735,7 @@ public void unregisterListener(Object object) {
             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("Problem unregistering", 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 ca20dfa09ab..754eaed239c 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,8 @@
 
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class for working with Digital object identifiers (DOIs)
@@ -18,7 +18,7 @@
  * @see https://en.wikipedia.org/wiki/Digital_object_identifier
  */
 public class DOI implements Identifier {
-    private static final Log LOGGER = LogFactory.getLog(DOI.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DOI.class);
 
     // DOI resolver
     private static final URI RESOLVER = URI.create("https://doi.org");
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 2189ef5782b..f87dc39e1ac 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,8 @@
 
 import org.jabref.model.entry.FieldName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Class for working with Eprint identifiers
@@ -20,7 +20,7 @@
  */
 public class Eprint implements Identifier {
     public static final URI RESOLVER = URI.create("http://arxiv.org");
-    private static final Log LOGGER = LogFactory.getLog(Eprint.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Eprint.class);
 
     // Regex
     // (see https://arxiv.org/help/arxiv_identifier)
diff --git a/src/main/java/org/jabref/model/groups/SearchGroup.java b/src/main/java/org/jabref/model/groups/SearchGroup.java
index e3f77004984..2346c23c10a 100644
--- a/src/main/java/org/jabref/model/groups/SearchGroup.java
+++ b/src/main/java/org/jabref/model/groups/SearchGroup.java
@@ -5,8 +5,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This group matches entries by a complex search pattern, which might include conditions about the values of
@@ -14,7 +14,7 @@
  */
 public class SearchGroup extends AbstractGroup {
 
-    private static final Log LOGGER = LogFactory.getLog(SearchGroup.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SearchGroup.class);
     private final GroupSearchQuery query;
 
     public SearchGroup(String name, GroupHierarchyType context, String searchExpression, boolean caseSensitive,
diff --git a/src/main/java/org/jabref/model/pdf/FileAnnotation.java b/src/main/java/org/jabref/model/pdf/FileAnnotation.java
index 210e08cfe23..53aa55c0b8e 100644
--- a/src/main/java/org/jabref/model/pdf/FileAnnotation.java
+++ b/src/main/java/org/jabref/model/pdf/FileAnnotation.java
@@ -6,13 +6,13 @@
 import java.util.Objects;
 import java.util.Optional;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FileAnnotation {
-    private static final Log LOGGER = LogFactory.getLog(FileAnnotation.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileAnnotation.class);
 
     private final static int ABBREVIATED_ANNOTATION_NAME_LENGTH = 45;
     private static final String DATE_TIME_STRING = "^D:\\d{14}$";
diff --git a/src/main/java/org/jabref/model/pdf/FileAnnotationType.java b/src/main/java/org/jabref/model/pdf/FileAnnotationType.java
index 95838ded61e..502b036ed2e 100644
--- a/src/main/java/org/jabref/model/pdf/FileAnnotationType.java
+++ b/src/main/java/org/jabref/model/pdf/FileAnnotationType.java
@@ -2,9 +2,9 @@
 
 import java.util.Locale;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Our representation of the type of the FileAnnotation. This is needed as some FileAnnotationTypes require special
@@ -26,7 +26,7 @@ public enum FileAnnotationType {
     UNKNOWN("Unknown", false),
     NONE("None", false);
 
-    private static final Log LOGGER = LogFactory.getLog(FileAnnotationType.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileAnnotationType.class);
 
     private final String name;
     private final boolean linkedFileAnnotationType;
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 1cabbeaabbe..8d8aba8fd81 100644
--- a/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
+++ b/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
@@ -22,15 +22,15 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 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 static final Logger LOGGER = LoggerFactory.getLogger(GrammarBasedSearchRule.class);
 
     private final boolean caseSensitiveSearch;
     private final boolean regExpSearch;
diff --git a/src/main/java/org/jabref/pdfimport/PdfImporter.java b/src/main/java/org/jabref/pdfimport/PdfImporter.java
index 19cf05599de..19804ab13ca 100644
--- a/src/main/java/org/jabref/pdfimport/PdfImporter.java
+++ b/src/main/java/org/jabref/pdfimport/PdfImporter.java
@@ -36,12 +36,12 @@
 import org.jabref.model.entry.FieldName;
 import org.jabref.preferences.JabRefPreferences;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class PdfImporter {
 
-    private static final Log LOGGER = LogFactory.getLog(PdfImporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PdfImporter.class);
     private final JabRefFrame frame;
     private final BasePanel panel;
     private final MainTable entryTable;
diff --git a/src/main/java/org/jabref/preferences/CustomExportList.java b/src/main/java/org/jabref/preferences/CustomExportList.java
index d76b9025cd1..d42409763f2 100644
--- a/src/main/java/org/jabref/preferences/CustomExportList.java
+++ b/src/main/java/org/jabref/preferences/CustomExportList.java
@@ -17,8 +17,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class handles user defined custom export formats. They are initially
@@ -34,7 +34,7 @@ public class CustomExportList {
     private static final int EXPORTER_FILENAME_INDEX = 1;
     private static final int EXPORTER_EXTENSION_INDEX = 2;
 
-    private static final Log LOGGER = LogFactory.getLog(CustomExportList.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CustomExportList.class);
     private final EventList<List<String>> list;
     private final SortedList<List<String>> sorted;
 
diff --git a/src/main/java/org/jabref/preferences/CustomImportList.java b/src/main/java/org/jabref/preferences/CustomImportList.java
index 34202085dcf..7aca6a3d720 100644
--- a/src/main/java/org/jabref/preferences/CustomImportList.java
+++ b/src/main/java/org/jabref/preferences/CustomImportList.java
@@ -7,8 +7,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Collection of user defined custom import formats.
@@ -18,7 +18,7 @@
  */
 public class CustomImportList extends TreeSet<CustomImporter> {
 
-    private static final Log LOGGER = LogFactory.getLog(CustomImportList.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CustomImportList.class);
 
     private final JabRefPreferences prefs;
 
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 54a38271b83..11227390b10 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -80,8 +80,8 @@
 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JabRefPreferences implements PreferencesService {
 
@@ -390,7 +390,7 @@ 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 Logger LOGGER = LoggerFactory.getLogger(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";