From 9db807b33431143143017bda0d0f913f13cf0bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0irok=C3=BD?= <siroky.petr@gmail.com>
Date: Mon, 27 Jun 2016 21:55:18 +0200
Subject: [PATCH] [DROOLS-1216] exclude commons-logging and use jcl-over-slf4j
 instead (#209)

---
 .../drools-wb-jcr2vfs-export/pom.xml          | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/drools-wb-jcr2vfs-migration/drools-wb-jcr2vfs-export/pom.xml b/drools-wb-jcr2vfs-migration/drools-wb-jcr2vfs-export/pom.xml
index 44b204cb2e7..3a47081a6d4 100644
--- a/drools-wb-jcr2vfs-migration/drools-wb-jcr2vfs-export/pom.xml
+++ b/drools-wb-jcr2vfs-migration/drools-wb-jcr2vfs-export/pom.xml
@@ -60,6 +60,12 @@
         <groupId>org.apache.pdfbox</groupId>
         <artifactId>pdfbox</artifactId>
         <version>${version.org.apache.pdfbox}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <!-- Use newer SLF4J and Logback with better support for logging exceptions with stacktraces. -->
       <dependency>
@@ -67,6 +73,12 @@
         <artifactId>slf4j-api</artifactId>
         <version>${version.org.slf4j}</version>
       </dependency>
+      <!-- Replacement for the above excluded 'commons-logging:commons-logging' -->
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>${version.org.slf4j}</version>
+      </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
@@ -119,6 +131,12 @@
       <groupId>org.slf4j</groupId>
       <artifactId>log4j-over-slf4j</artifactId>
     </dependency>
+    <!-- Replacement for the above excluded 'commons-logging:commons-logging' -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <scope>runtime</scope>
+    </dependency>
 
     <dependency>
       <groupId>commons-cli</groupId>
@@ -167,6 +185,10 @@
       <groupId>org.drools</groupId>
       <artifactId>guvnor-webapp-core</artifactId>
       <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>