Fix missing dependencies when installing

* removed dependency to apache commons logging
* removed feature plugin dependency to slf4j logback binding. Newer
  eclipse distributions have this by default, so it is not needed.
  If it is missing, it needs to be installed manually from orbit.
* removed slf4j-api from plugin classpath

Fixes #115

Author: adangel

ReleaseNotes.md

@@ -14,6 +14,7 @@ Eclipse Update Site:
 ### Fixed Issues
 
 *   [#114](https://github.com/pmd/pmd-eclipse-plugin/issues/114): NPE in PriorityDescriptorCache
+*   [#115](https://github.com/pmd/pmd-eclipse-plugin/issues/115): Missing dependencies when installing
 
 ### API Changes
 

net.sourceforge.pmd.eclipse.plugin.test/META-INF/MANIFEST.MF

@@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jdt.core,
  org.eclipse.jdt.launching,
  org.junit,
- org.apache.log4j,
  org.apache.commons.io
 Import-Package: ch.qos.logback.classic,
  org.slf4j

net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF

@@ -4,8 +4,7 @@ Bundle-Name: %plugin.name
 Bundle-SymbolicName: net.sourceforge.pmd.eclipse.plugin;singleton:=true
 Bundle-Version: 4.10.1.qualifier
 Bundle-Activator: net.sourceforge.pmd.eclipse.plugin.PMDPlugin
-Require-Bundle: org.apache.commons.logging;bundle-version="1.0.4",
- org.eclipse.core.resources,
+Require-Bundle: org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.jdt.core,
  org.eclipse.jface.text,
@@ -19,8 +18,7 @@ Require-Bundle: org.apache.commons.logging;bundle-version="1.0.4",
  org.eclipse.wst.xml.core,
  org.eclipse.ui.workbench.texteditor,
  ch.qos.logback.classic,
- ch.qos.logback.core,
- org.slf4j.jul
+ ch.qos.logback.core
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: %plugin.provider
@@ -75,7 +73,6 @@ Bundle-ClassPath: target/lib/antlr-runtime.jar,
  target/lib/scalameta_2.13.jar,
  target/lib/scalap.jar,
  target/lib/scalapb-runtime_2.13.jar,
- target/lib/slf4j-api.jar,
  target/lib/sourcecode_2.13.jar,
  target/lib/stringtemplate.jar,
  target/lib/trees_2.13.jar,

net.sourceforge.pmd.eclipse.plugin/build.properties

@@ -16,7 +16,7 @@ bin.includes = .,\
                welcome.xml,\
                doc/,\
                target/lib/,\
-               target/schema/,\
+               target/schema/
 src.includes = icons/,\
                META-INF/,\
                plugin.xml,\

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/logging/internal/JulLoggingHandler.java

@@ -0,0 +1,87 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.eclipse.logging.internal;
+
+import java.text.MessageFormat;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This logger is needed in order to channel PMD's own logs through eclipse/logback.
+ */
+public class JulLoggingHandler extends Handler {
+
+    public static void install() {
+        java.util.logging.Logger julLogger = java.util.logging.Logger.getLogger(LogbackConfiguration.ROOT_LOG_ID);
+        for (Handler handler : julLogger.getHandlers()) {
+            if (handler instanceof JulLoggingHandler) {
+                return; // already installed
+            }
+        }
+        julLogger.addHandler(new JulLoggingHandler());
+        julLogger.setUseParentHandlers(false);
+    }
+
+    public static void uninstall() {
+        JulLoggingHandler julLoggingHandler = null;
+        java.util.logging.Logger julLogger = java.util.logging.Logger.getLogger(LogbackConfiguration.ROOT_LOG_ID);
+        for (Handler handler : julLogger.getHandlers()) {
+            if (handler instanceof JulLoggingHandler) {
+                julLoggingHandler = (JulLoggingHandler) handler;
+                break;
+            }
+        }
+        julLogger.removeHandler(julLoggingHandler);
+        julLogger.setUseParentHandlers(true);
+    }
+
+    @Override
+    public void publish(LogRecord record) {
+        if (record == null) {
+            return;
+        }
+
+        String loggerName = record.getLoggerName();
+        if (loggerName == null) {
+            loggerName = LogbackConfiguration.ROOT_LOG_ID;
+        }
+        String message = record.getMessage();
+        if (message == null) {
+            message = "";
+        }
+        Object[] parameters = record.getParameters();
+        if (parameters != null) {
+            message = MessageFormat.format(message, parameters);
+        }
+        Throwable thrown = record.getThrown();
+        int loglevel = record.getLevel().intValue();
+
+        Logger slf4j = LoggerFactory.getLogger(loggerName);
+
+        if (loglevel <= Level.FINE.intValue()) {
+            slf4j.debug(message, thrown);
+        } else if (loglevel <= Level.INFO.intValue()) {
+            slf4j.info(message, thrown);
+        } else if (loglevel <= Level.WARNING.intValue()) {
+            slf4j.warn(message, thrown);
+        } else {
+            slf4j.error(message, thrown);
+        }
+    }
+
+    @Override
+    public void close() throws SecurityException {
+        // empty
+    }
+
+    @Override
+    public void flush() {
+        // empty
+    }
+}

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/logging/internal/LogbackConfiguration.java

@@ -9,7 +9,6 @@
 import org.eclipse.core.runtime.Status;
 import org.slf4j.ILoggerFactory;
 import org.slf4j.LoggerFactory;
-import org.slf4j.bridge.SLF4JBridgeHandler;
 
 import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
 
@@ -55,9 +54,7 @@ public void configureLogback() {
         l.addAppender(logbackEclipseAppender);
         l.setAdditive(false);
 
-        if (!SLF4JBridgeHandler.isInstalled()) {
-            SLF4JBridgeHandler.install();
-        }
+        JulLoggingHandler.install();
     }
 
     public void unconfigureLogback() {
@@ -69,7 +66,7 @@ public void unconfigureLogback() {
         Logger l = logbackContext.getLogger(ROOT_LOG_ID);
         l.detachAndStopAllAppenders();
 
-        SLF4JBridgeHandler.uninstall();
+        JulLoggingHandler.uninstall();
     }
 
     private void configureLogs(String logFileName, String logLevel) {

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/preferences/GeneralPreferencesPage.java

@@ -5,11 +5,11 @@
 package net.sourceforge.pmd.eclipse.ui.preferences;
 
 import java.text.MessageFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.log4j.Level;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.preferences.InstanceScope;
@@ -553,7 +553,7 @@ public void widgetDefaultSelected(SelectionEvent event) {
             }
         });
 
-        logLevelScale.setSelection(intLogLevel(this.preferences.getLogLevel()));
+        logLevelScale.setSelection(intLogLevel(this.preferences.getLogLevelName()));
         updateLogLevelValueLabel();
 
         return loggingGroup;
@@ -801,7 +801,7 @@ protected void performDefaults() {
         setText(logFileNameText, IPreferences.LOG_FILENAME_DEFAULT);
 
         if (logLevelScale != null) {
-            logLevelScale.setSelection(intLogLevel(IPreferences.LOG_LEVEL));
+            logLevelScale.setSelection(intLogLevel(IPreferences.LOG_LEVEL_DEFAULT));
             updateLogLevelValueLabel();
         }
     }
@@ -934,7 +934,7 @@ public boolean performOk() {
         }
 
         if (logLevelScale != null) {
-            preferences.setLogLevel(Level.toLevel(LOG_LEVELS[logLevelScale.getSelection()]));
+            preferences.setLogLevel(LOG_LEVELS[logLevelScale.getSelection()]);
         }
 
         preferences.sync();
@@ -947,27 +947,12 @@ public boolean performOk() {
     /**
      * Return the selection index corresponding to the log level
      */
-    private int intLogLevel(Level level) {
-        int result = 0;
-
-        if (level.equals(Level.OFF)) {
+    private int intLogLevel(String level) {
+        int result = Arrays.asList(LOG_LEVELS).indexOf(level);
+        if (result < 0 || result > 6) {
             result = 0;
-        } else if (level.equals(Level.FATAL)) {
-            result = 1;
-        } else if (level.equals(Level.ERROR)) {
-            result = 2;
-        } else if (level.equals(Level.WARN)) {
-            result = 3;
-        } else if (level.equals(Level.INFO)) {
-            result = 4;
-        } else if (level.equals(Level.DEBUG)) {
-            result = 5;
-        } else if (level.equals(Level.ALL)) {
-            result = 6;
         }
-
         return result;
-
     }
 
     /**

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/views/ViolationOverviewContentProvider.java

@@ -9,15 +9,15 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import net.sourceforge.pmd.eclipse.ui.model.AbstractPMDRecord;
 import net.sourceforge.pmd.eclipse.ui.model.FileRecord;
@@ -38,7 +38,7 @@
 public class ViolationOverviewContentProvider
         implements ITreeContentProvider, IStructuredContentProvider, IResourceChangeListener {
 
-    private static final Log LOG = LogFactory.getLog(ViolationOverviewContentProvider.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ViolationOverviewContentProvider.class);
     protected boolean filterPackages;
 
     private final ViolationOverview violationView;

net.sourceforge.pmd.eclipse/feature.xml

@@ -38,12 +38,4 @@
          install-size="0"
          version="4.10.1.qualifier"/>
 
-   <plugin
-         id="ch.qos.logback.slf4j"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
 </feature>