From b46ad5d596e81856627beb952c1b5d9cabc63ff3 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:28 +0200
Subject: [PATCH] [DROOLS-1216] exclude commons-logging and use jcl-over-slf4j
 instead (#303)

(cherry picked from commit a5f6c09d6356a6a591fd91fee92ecf1fbf8eed00)
---
 kie-config-cli/pom.xml                         | 12 ++++++++++++
 .../kie-drools-wb-distribution-wars/pom.xml    | 13 +++++++++++++
 kie-wb-tests/kie-wb-tests-gui/pom.xml          | 12 ++++++++++++
 kie-wb-tests/kie-wb-tests-rest/pom.xml         | 18 ++++++++++++++++++
 kie-wb/kie-wb-distribution-wars/pom.xml        | 13 +++++++++++++
 5 files changed, 68 insertions(+)

diff --git a/kie-config-cli/pom.xml b/kie-config-cli/pom.xml
index 7b62de1cb6..9dca11dc0b 100644
--- a/kie-config-cli/pom.xml
+++ b/kie-config-cli/pom.xml
@@ -19,6 +19,18 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </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>org.jboss.errai</groupId>
diff --git a/kie-drools-wb/kie-drools-wb-distribution-wars/pom.xml b/kie-drools-wb/kie-drools-wb-distribution-wars/pom.xml
index 09871941e8..9ea4d52310 100644
--- a/kie-drools-wb/kie-drools-wb-distribution-wars/pom.xml
+++ b/kie-drools-wb/kie-drools-wb-distribution-wars/pom.xml
@@ -91,6 +91,12 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jaxrs</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
@@ -230,6 +236,13 @@
     <dependency>
       <groupId>org.scannotation</groupId>
       <artifactId>scannotation</artifactId>
+      <exclusions>
+        <!-- Replaced by 'org.javassist:javassist' -->
+        <exclusion>
+          <groupId>javassist</groupId>
+          <artifactId>javassist</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- For WAS8 shading -->
diff --git a/kie-wb-tests/kie-wb-tests-gui/pom.xml b/kie-wb-tests/kie-wb-tests-gui/pom.xml
index 2e19e8cc80..19e125d9e7 100644
--- a/kie-wb-tests/kie-wb-tests-gui/pom.xml
+++ b/kie-wb-tests/kie-wb-tests-gui/pom.xml
@@ -94,6 +94,12 @@
       <groupId>org.jboss.arquillian.graphene</groupId>
       <artifactId>graphene-webdriver</artifactId>
       <type>pom</type>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.extension</groupId>
@@ -108,6 +114,12 @@
       <artifactId>arquillian-junit-standalone</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>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
diff --git a/kie-wb-tests/kie-wb-tests-rest/pom.xml b/kie-wb-tests/kie-wb-tests-rest/pom.xml
index 5ba6b828f9..06bd830e3c 100644
--- a/kie-wb-tests/kie-wb-tests-rest/pom.xml
+++ b/kie-wb-tests/kie-wb-tests-rest/pom.xml
@@ -26,6 +26,12 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.codehaus.jackson</groupId>
@@ -42,6 +48,12 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jaxrs</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.kie.remote</groupId>
@@ -51,6 +63,12 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</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>
   </dependencies>
 
   <build>
diff --git a/kie-wb/kie-wb-distribution-wars/pom.xml b/kie-wb/kie-wb-distribution-wars/pom.xml
index f9d6b78f02..ebeb40d601 100644
--- a/kie-wb/kie-wb-distribution-wars/pom.xml
+++ b/kie-wb/kie-wb-distribution-wars/pom.xml
@@ -104,6 +104,12 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jaxrs</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
@@ -282,6 +288,13 @@
     <dependency>
       <groupId>org.scannotation</groupId>
       <artifactId>scannotation</artifactId>
+      <exclusions>
+        <!-- Replaced by 'org.javassist:javassist' -->
+        <exclusion>
+          <groupId>javassist</groupId>
+          <artifactId>javassist</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- For WAS8 shading -->