Merge pull request #149 from adangel:issue-134-logback

Do not depend on slf4j and logback bundles #149

Author: adangel

ReleaseNotes.md

@@ -15,6 +15,8 @@ This is a minor release.
 
 ### Fixed Issues
 
+*   [#134](https://github.com/pmd/pmd-eclipse-plugin/issues/134): Incompatibility between Groovy Eclipse Plugin and PMD Plugin
+
 ### API Changes
 
 ### External Contributions

kepler/kepler.target

@@ -15,12 +15,6 @@
             <unit id="org.apache.commons.lang.source" version="2.6.0.v201205030909"/>
             <unit id="org.junit" version="4.11.0.v201303080030"/>
             <unit id="org.junit.source" version="4.11.0.v201303080030"/>
-            <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
-            <unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
-            <unit id="ch.qos.logback.slf4j" version="1.0.7.v20121108-1250"/>
-            <unit id="ch.qos.logback.slf4j.source" version="1.0.7.v20121108-1250"/>
-            <unit id="org.slf4j.jul" version="1.7.2.v20121108-1250"/>
-            <unit id="org.slf4j.jul.source" version="1.7.2.v20121108-1250"/>
         </location>
     </locations>
     <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

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

@@ -14,7 +14,5 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jdt.launching,
  org.junit,
  org.apache.commons.io
-Import-Package: ch.qos.logback.classic,
- org.slf4j
 Bundle-Activator: net.sourceforge.pmd.eclipse.internal.TestActivator
 Bundle-ActivationPolicy: lazy

net.sourceforge.pmd.eclipse.plugin.test/pom.xml

@@ -58,11 +58,6 @@
                 <id>net.sourceforge.pmd.eclipse.plugin.test.fragment</id>
                 <versionRange>0.0.0</versionRange>
               </requirement>
-              <requirement>
-                <type>eclipse-plugin</type>
-                <id>ch.qos.logback.slf4j</id>
-                <versionRange>0.0.0</versionRange>
-              </requirement>
             </extraRequirements>
           </dependency-resolution>
         </configuration>

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

@@ -16,9 +16,7 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.help,
  org.eclipse.help.ui,
  org.eclipse.wst.xml.core,
- org.eclipse.ui.workbench.texteditor,
- ch.qos.logback.classic,
- ch.qos.logback.core
+ org.eclipse.ui.workbench.texteditor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-Vendor: %plugin.provider
@@ -37,7 +35,10 @@ Bundle-ClassPath: target/lib/antlr-runtime.jar,
  target/lib/jaxb-core.jar,
  target/lib/jaxb-impl.jar,
  target/lib/jcommander.jar,
+ target/lib/jul-to-slf4j.jar,
  target/lib/lenses_2.13.jar,
+ target/lib/logback-classic.jar,
+ target/lib/logback-core.jar,
  target/lib/parsers_2.13.jar,
  target/lib/pmd-apex-jorje-lib.jar,
  target/lib/pmd-apex.jar,
@@ -67,14 +68,16 @@ Bundle-ClassPath: target/lib/antlr-runtime.jar,
  target/lib/saxon.jar,
  target/lib/scala-library.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,
  target/classes/,
  target/schema/,
  .
 Bundle-Localization: plugin
-Export-Package: name.herlin.command,
+Export-Package: ch.qos.logback.classic;x-friends:="net.sourceforge.pmd.eclipse.plugin.test",
+ name.herlin.command,
  net.sourceforge.pmd;
   uses:="net.sourceforge.pmd.stat,
    net.sourceforge.pmd.lang,
@@ -162,5 +165,5 @@ Export-Package: name.herlin.command,
  net.sourceforge.pmd.renderers,
  net.sourceforge.pmd.stat,
  net.sourceforge.pmd.util;uses:="net.sourceforge.pmd.lang.java.ast",
- net.sourceforge.pmd.util.datasource
-Import-Package: org.slf4j
+ net.sourceforge.pmd.util.datasource,
+ org.slf4j;x-friends:="net.sourceforge.pmd.eclipse.plugin.test"

net.sourceforge.pmd.eclipse.plugin/pom.xml

@@ -39,6 +39,22 @@
       <artifactId>jaxb-impl</artifactId>
       <version>2.3.1</version>
     </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.31</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.2.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>1.7.31</version>
+    </dependency>
   </dependencies>
 
   <build>