335872: Replaced MavenLogger with slf4j loggers

11 files changed, 63 insertions, 38 deletions

diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
index 12b383d1..52182a9d 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
@@ -19,6 +19,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
@@ -41,7 +44,6 @@ import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.project.MavenProject;
 
 import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.internal.M2EUtils;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.core.project.IProjectConfigurationManager;
@@ -60,6 +62,7 @@ import org.eclipse.m2e.jdt.MavenJdtPlugin;
  * @author igor
  */
 public abstract class AbstractJavaProjectConfigurator extends AbstractProjectConfigurator {
+  private static final Logger log = LoggerFactory.getLogger(AbstractJavaProjectConfigurator.class);
 
   private static final String GOAL_COMPILE = "compile";
 
@@ -236,13 +239,13 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
       try {
         inclusion = toPaths(maven.getMojoParameterValue(request.getMavenSession(), compile, "includes", String[].class)); //$NON-NLS-1$
       } catch(CoreException ex) {
-        MavenLogger.log(ex);
+        log.error(ex.getMessage(), ex);
         console.logError("Failed to determine compiler inclusions, assuming defaults");
       }
       try {
         exclusion = toPaths(maven.getMojoParameterValue(request.getMavenSession(), compile, "excludes", String[].class)); //$NON-NLS-1$
       } catch(CoreException ex) {
-        MavenLogger.log(ex);
+        log.error(ex.getMessage(), ex);
         console.logError("Failed to determine compiler exclusions, assuming defaults");
       }
     }
@@ -253,14 +256,14 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
         inclusionTest = toPaths(maven.getMojoParameterValue(request.getMavenSession(), compile,
             "testIncludes", String[].class)); //$NON-NLS-1$
       } catch(CoreException ex) {
-        MavenLogger.log(ex);
+        log.error(ex.getMessage(), ex);
         console.logError("Failed to determine compiler test inclusions, assuming defaults");
       }
       try {
         exclusionTest = toPaths(maven.getMojoParameterValue(request.getMavenSession(), compile,
             "testExcludes", String[].class)); //$NON-NLS-1$
       } catch(CoreException ex) {
-        MavenLogger.log(ex);
+        log.error(ex.getMessage(), ex);
         console.logError("Failed to determine compiler test exclusions, assuming defaults");
       }
     }
@@ -398,7 +401,7 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
     try {
       source = maven.getMojoParameterValue(session, execution, parameter, String.class);
     } catch(CoreException ex) {
-      MavenLogger.log(ex);
+      log.error(ex.getMessage(), ex);
       console.logError("Failed to determine compiler " + parameter + " setting, assuming default");
     }
 
diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/BuildPathManager.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/BuildPathManager.java
index 7096bf7a..dfc292ed 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/BuildPathManager.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/BuildPathManager.java
@@ -27,6 +27,8 @@ import java.util.zip.ZipFile;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -66,7 +68,6 @@ import org.apache.maven.project.MavenProject;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.core.IMavenConstants;
 import org.eclipse.m2e.core.core.MavenConsole;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.embedder.ArtifactKey;
 import org.eclipse.m2e.core.embedder.IMaven;
 import org.eclipse.m2e.core.embedder.IMavenConfiguration;
@@ -87,6 +88,7 @@ import org.eclipse.m2e.jdt.MavenJdtPlugin;
  */
 @SuppressWarnings("restriction")
 public class BuildPathManager implements IMavenProjectChangedListener, IResourceChangeListener, IClasspathManager {
+  private static final Logger log = LoggerFactory.getLogger(BuildPathManager.class);
 
   // local repository variable
   public static final String M2_REPO = "M2_REPO"; //$NON-NLS-1$
@@ -234,7 +236,7 @@ public class BuildPathManager implements IMavenProjectChangedListener, IResource
         forcePackageExplorerRefresh(javaProject);
         saveContainerState(project, container);
       } catch(CoreException ex) {
-        MavenLogger.log(ex);
+        log.error(ex.getMessage(), ex);
       }
     }
   }
@@ -246,13 +248,13 @@ public class BuildPathManager implements IMavenProjectChangedListener, IResource
       is = new FileOutputStream(containerStateFile);
       new MavenClasspathContainerSaveHelper().writeContainer(container, is);
     } catch(IOException ex) {
-      MavenLogger.log("Can't save classpath container state for " + project.getName(), ex); //$NON-NLS-1$
+      log.error("Can't save classpath container state for " + project.getName(), ex); //$NON-NLS-1$
     } finally {
       if(is != null) {
         try {
           is.close();
         } catch(IOException ex) {
-          MavenLogger.log("Can't close output stream for " + containerStateFile.getAbsolutePath(), ex); //$NON-NLS-1$
+          log.error("Can't close output stream for " + containerStateFile.getAbsolutePath(), ex); //$NON-NLS-1$
         }
       }
     }
@@ -279,7 +281,7 @@ public class BuildPathManager implements IMavenProjectChangedListener, IResource
         try {
           is.close();
         } catch(IOException ex) {
-          MavenLogger.log("Can't close output stream for " + containerStateFile.getAbsolutePath(), ex); //$NON-NLS-1$
+          log.error("Can't close output stream for " + containerStateFile.getAbsolutePath(), ex); //$NON-NLS-1$
         }
       }
     }
@@ -620,13 +622,13 @@ public class BuildPathManager implements IMavenProjectChangedListener, IResource
       // remove custom source and javadoc configuration
       File attachmentProperties = getSourceAttachmentPropertiesFile((IProject) event.getResource());
       if(attachmentProperties.exists() && !attachmentProperties.delete()) {
-        MavenLogger.log("Can't delete " + attachmentProperties.getAbsolutePath(), null); //$NON-NLS-1$
+        log.error("Can't delete " + attachmentProperties.getAbsolutePath()); //$NON-NLS-1$
       }
 
       // remove classpath container state
       File containerState = getContainerStateFile((IProject) event.getResource());
       if(containerState.exists() && !containerState.delete()) {
-        MavenLogger.log("Can't delete " + containerState.getAbsolutePath(), null); //$NON-NLS-1$
+        log.error("Can't delete " + containerState.getAbsolutePath()); //$NON-NLS-1$
       }
     }
   }
@@ -642,7 +644,7 @@ public class BuildPathManager implements IMavenProjectChangedListener, IResource
           new NullProgressMonitor());
       changed = !newPath.equals(oldPath);
     } catch(CoreException ex) {
-      MavenLogger.log(ex);
+      log.error(ex.getMessage(), ex);
       changed = false;
     }
     return changed;
@@ -787,7 +789,7 @@ public class BuildPathManager implements IMavenProjectChangedListener, IResource
         }
       }
     } catch(CoreException e) {
-      MavenLogger.log("Could not schedule sources/javadoc download", e); //$NON-NLS-1$
+      log.error("Could not schedule sources/javadoc download", e); //$NON-NLS-1$
     }
 
   }
@@ -808,7 +810,7 @@ public class BuildPathManager implements IMavenProjectChangedListener, IResource
         }
       }
     } catch(CoreException e) {
-      MavenLogger.log("Could not schedule sources/javadoc download", e); //$NON-NLS-1$
+      log.error("Could not schedule sources/javadoc download", e); //$NON-NLS-1$
     }
   }
 
@@ -873,7 +875,7 @@ public class BuildPathManager implements IMavenProjectChangedListener, IResource
 
       javaProject.setRawClasspath(cp, monitor);
     } catch(CoreException e) {
-      MavenLogger.log(e);
+      log.error(e.getMessage(), e);
     }
   }
 }
diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/ClasspathEntryDescriptor.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/ClasspathEntryDescriptor.java
index b8892701..45c58d47 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/ClasspathEntryDescriptor.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/ClasspathEntryDescriptor.java
@@ -25,8 +25,8 @@ import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.JavaCore;
 
 import org.eclipse.m2e.core.embedder.ArtifactKey;
-import org.eclipse.m2e.jdt.IClasspathManager;
 import org.eclipse.m2e.jdt.IClasspathEntryDescriptor;
+import org.eclipse.m2e.jdt.IClasspathManager;
 
 
 /**
diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/DownloadSourcesActionDelegate.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/DownloadSourcesActionDelegate.java
index 7a9c2ff2..1b8e6eb9 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/DownloadSourcesActionDelegate.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/DownloadSourcesActionDelegate.java
@@ -10,6 +10,9 @@
  *******************************************************************************/
 package org.eclipse.m2e.jdt.internal;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.internal.ui.javaeditor.IClassFileEditorInput;
@@ -18,7 +21,6 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.ui.IEditorActionDelegate;
 import org.eclipse.ui.IEditorPart;
 
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.jdt.IClasspathManager;
 import org.eclipse.m2e.jdt.MavenJdtPlugin;
 
@@ -31,6 +33,7 @@ import org.eclipse.m2e.jdt.MavenJdtPlugin;
 
 @SuppressWarnings("restriction")
 public class DownloadSourcesActionDelegate implements IEditorActionDelegate {
+  private static final Logger log = LoggerFactory.getLogger(DownloadSourcesActionDelegate.class);
 
   public void setActiveEditor(IAction action, IEditorPart part) {
 
@@ -54,7 +57,7 @@ public class DownloadSourcesActionDelegate implements IEditorActionDelegate {
           }
         }
       } catch(Exception ex) {
-        MavenLogger.log("Could not schedule source download", ex); //$NON-NLS-1$
+        log.error("Could not schedule source download", ex); //$NON-NLS-1$
       }
     }
   }
diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/DownloadSourcesJob.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/DownloadSourcesJob.java
index c013c3a3..cfcc2fdb 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/DownloadSourcesJob.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/DownloadSourcesJob.java
@@ -40,7 +40,6 @@ import org.apache.maven.project.MavenProject;
 
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.core.MavenConsole;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.embedder.ArtifactKey;
 import org.eclipse.m2e.core.embedder.IMaven;
 import org.eclipse.m2e.core.jobs.IBackgroundProcessingQueue;
@@ -244,7 +243,7 @@ class DownloadSourcesJob extends Job implements IBackgroundProcessingQueue {
   }
 
   private void logMessage(String msg, CoreException e) {
-    MavenLogger.log(msg, e);
+    log.error(msg, e);
     console.logMessage(msg);
   }
 
diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaElementsAdapterFactory.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaElementsAdapterFactory.java
index 791c0cf1..a93684d6 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaElementsAdapterFactory.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaElementsAdapterFactory.java
@@ -11,6 +11,9 @@
 
 package org.eclipse.m2e.jdt.internal;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
@@ -24,7 +27,6 @@ import org.eclipse.jdt.internal.ui.packageview.ClassPathContainer;
 import org.eclipse.jdt.internal.ui.packageview.ClassPathContainer.RequiredProjectWrapper;
 
 import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.embedder.ArtifactKey;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.core.project.MavenProjectManager;
@@ -39,6 +41,7 @@ import org.eclipse.m2e.jdt.MavenJdtPlugin;
  */
 @SuppressWarnings({"restriction","rawtypes"})
 public class JavaElementsAdapterFactory implements IAdapterFactory {
+  private static final Logger log = LoggerFactory.getLogger(JavaElementsAdapterFactory.class);
 
   private static final Class[] ADAPTER_LIST = new Class[] {ArtifactKey.class, IPath.class, IMavenProjectFacade.class};
 
@@ -55,7 +58,7 @@ public class JavaElementsAdapterFactory implements IAdapterFactory {
           try {
             return getBuildPathManager().findArtifact(project, fragment.getPath());
           } catch(CoreException ex) {
-            MavenLogger.log(ex);
+            log.error(ex.getMessage(), ex);
             MavenPlugin.getDefault().getConsole().logError("Can't find artifact for " + fragment);
             return null;
           }
diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/MavenClasspathContainerInitializer.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/MavenClasspathContainerInitializer.java
index 4a932c89..bb7625da 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/MavenClasspathContainerInitializer.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/MavenClasspathContainerInitializer.java
@@ -11,6 +11,9 @@
 
 package org.eclipse.m2e.jdt.internal;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -25,7 +28,6 @@ import org.eclipse.jdt.core.JavaCore;
 
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.core.IMavenConstants;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.embedder.IMavenConfiguration;
 import org.eclipse.m2e.core.project.MavenProjectManager;
 import org.eclipse.m2e.core.project.MavenUpdateRequest;
@@ -38,6 +40,7 @@ import org.eclipse.m2e.jdt.MavenJdtPlugin;
  * @author Eugene Kuleshov
  */
 public class MavenClasspathContainerInitializer extends ClasspathContainerInitializer {
+  private static final Logger log = LoggerFactory.getLogger(MavenClasspathContainerInitializer.class);
 
   public void initialize(IPath containerPath, IJavaProject project) {
     if(MavenClasspathHelpers.isMaven2ClasspathContainer(containerPath)) {
@@ -49,7 +52,7 @@ public class MavenClasspathContainerInitializer extends ClasspathContainerInitia
           return;
         }
       } catch(CoreException ex) {
-        MavenLogger.log("Exception initializing classpath container " + containerPath.toString(), ex);
+        log.error("Exception initializing classpath container " + containerPath.toString(), ex);
       }
 
       // force refresh if can't read persisted state
@@ -71,7 +74,7 @@ public class MavenClasspathContainerInitializer extends ClasspathContainerInitia
         try {
           getBuildPathManager().persistAttachedSourcesAndJavadoc(project, containerSuggestion, monitor);
         } catch(CoreException ex) {
-          MavenLogger.log(ex);
+          log.error(ex.getMessage(), ex);
           return new Status(IStatus.ERROR, IMavenConstants.PLUGIN_ID, 0, Messages.MavenClasspathContainerInitializer_error_cannot_persist, ex);
         }
         return Status.OK_STATUS;
diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/MavenJdtImages.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/MavenJdtImages.java
index fb741584..09eaa718 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/MavenJdtImages.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/MavenJdtImages.java
@@ -11,12 +11,14 @@
 
 package org.eclipse.m2e.jdt.internal;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 import org.eclipse.m2e.core.core.IMavenConstants;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.jdt.MavenJdtPlugin;
 
 
@@ -24,6 +26,7 @@ import org.eclipse.m2e.jdt.MavenJdtPlugin;
  * @author Eugene Kuleshov
  */
 public class MavenJdtImages {
+  private static final Logger log = LoggerFactory.getLogger(MavenJdtImages.class);
 
   // object images
 
@@ -46,7 +49,7 @@ public class MavenJdtImages {
         return imageDescriptor;
       }
     } catch(Exception ex) {
-      MavenLogger.log(key, ex);
+      log.error(key, ex);
     }
     return null;
   }
diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/actions/OpenJavaDocAction.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/actions/OpenJavaDocAction.java
index 01ab6ba4..aadf240e 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/actions/OpenJavaDocAction.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/actions/OpenJavaDocAction.java
@@ -15,6 +15,9 @@ import java.io.File;
 import java.net.URL;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -36,7 +39,6 @@ import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 
 import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.embedder.ArtifactKey;
 import org.eclipse.m2e.core.embedder.IMaven;
 import org.eclipse.m2e.core.ui.internal.actions.SelectionUtil;
@@ -48,6 +50,7 @@ import org.eclipse.m2e.jdt.internal.Messages;
  * @author Eugene Kuleshov
  */
 public class OpenJavaDocAction extends ActionDelegate {
+  private static final Logger log = LoggerFactory.getLogger(OpenJavaDocAction.class);
 
   public static final String ID = "org.eclipse.m2e.openJavaDocAction"; //$NON-NLS-1$
   
@@ -78,7 +81,7 @@ public class OpenJavaDocAction extends ActionDelegate {
         }.schedule();
         
       } catch(CoreException ex) {
-        MavenLogger.log(ex);
+        log.error(ex.getMessage(), ex);
         PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
           public void run() {
             MessageDialog.openInformation(Display.getDefault().getActiveShell(), //
@@ -116,13 +119,13 @@ public class OpenJavaDocAction extends ActionDelegate {
                 name, name, name);
             browser.openURL(helpUrl);
           } catch(PartInitException ex) {
-            MavenLogger.log(ex);
+            log.error(ex.getMessage(), ex);
           }
         }
       });
       
     } catch(CoreException ex) {
-      MavenLogger.log("Can't download JavaDoc for " + name, ex);
+      log.error("Can't download JavaDoc for " + name, ex);
       openDialog(NLS.bind(Messages.OpenJavaDocAction_error_download,name));
       // TODO search index and offer to select other version
     }    
diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/launch/MavenLaunchConfigurationListener.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/launch/MavenLaunchConfigurationListener.java
index 71690b46..7849b155 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/launch/MavenLaunchConfigurationListener.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/launch/MavenLaunchConfigurationListener.java
@@ -11,6 +11,9 @@
 
 package org.eclipse.m2e.jdt.internal.launch;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.debug.core.ILaunchConfiguration;
@@ -20,11 +23,11 @@ import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
 import org.eclipse.jdt.launching.JavaRuntime;
 
 import org.eclipse.m2e.core.core.IMavenConstants;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.project.IMavenProjectChangedListener;
 import org.eclipse.m2e.core.project.MavenProjectChangedEvent;
 
 public class MavenLaunchConfigurationListener implements ILaunchConfigurationListener, IMavenProjectChangedListener {
+  private static final Logger log = LoggerFactory.getLogger(MavenLaunchConfigurationListener.class);
 
   public void launchConfigurationAdded(ILaunchConfiguration configuration) {
     updateLaunchConfiguration(configuration);
@@ -51,7 +54,7 @@ public class MavenLaunchConfigurationListener implements ILaunchConfigurationLis
         MavenRuntimeClasspathProvider.enable(configuration);
       }
     } catch(CoreException ex) {
-      MavenLogger.log(ex);
+      log.error(ex.getMessage(), ex);
     }
   }
 
@@ -69,7 +72,7 @@ public class MavenLaunchConfigurationListener implements ILaunchConfigurationLis
   				break;
   			}
 		  } catch (Exception e) {
-		    MavenLogger.log("Could not update launch configuration", e);
+		    log.error("Could not update launch configuration", e);
 		  }
 		}
 	}
diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/ui/filter/MavenModuleFilter.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/ui/filter/MavenModuleFilter.java
index 4088655f..f4e403b9 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/ui/filter/MavenModuleFilter.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/ui/filter/MavenModuleFilter.java
@@ -11,6 +11,9 @@
 
 package org.eclipse.m2e.jdt.internal.ui.filter;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
@@ -22,7 +25,6 @@ import org.apache.maven.project.MavenProject;
 
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.core.IMavenConstants;
-import org.eclipse.m2e.core.core.MavenLogger;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.core.project.MavenProjectManager;
 
@@ -32,6 +34,7 @@ import org.eclipse.m2e.core.project.MavenProjectManager;
  * @author Eugene Kuleshov
  */
 public class MavenModuleFilter extends ViewerFilter {
+  private static final Logger log = LoggerFactory.getLogger(MavenModuleFilter.class);
 
   public boolean select(Viewer viewer, Object parentElement, Object element) {
     if(element instanceof IFolder) {
@@ -59,7 +62,7 @@ public class MavenModuleFilter extends ViewerFilter {
           }
         }
       } catch(CoreException ex) {
-        MavenLogger.log(ex);
+        log.error(ex.getMessage(), ex);
       }
       
     }