From 4f83b9e6d2ce9d788372ca08ba8bc93e62fcd57b Mon Sep 17 00:00:00 2001
From: Dmitry Baev <charlie@yandex-team.ru>
Date: Tue, 9 Jun 2015 01:53:26 +0300
Subject: [PATCH] remove slf4j implementations

---
 allure-commons/pom.xml                        |  9 ++++++++
 allure-java-adaptor-api/pom.xml               |  9 +++-----
 .../src/test/resources/log4j.properties       |  3 ---
 allure-java-aspects/pom.xml                   |  9 ++++++++
 allure-junit-adaptor/pom.xml                  |  3 ++-
 allure-model/pom.xml                          | 10 ++++++++-
 .../src/main/resources/log4j.properties       |  3 ---
 allure-report-data/pom.xml                    | 21 +++++++++++--------
 .../src/main/resources/log4j.properties       |  3 ---
 allure-testng-adaptor/pom.xml                 |  4 ++++
 pom.xml                                       | 12 ++++++-----
 11 files changed, 55 insertions(+), 31 deletions(-)
 delete mode 100644 allure-java-adaptor-api/src/test/resources/log4j.properties
 delete mode 100644 allure-model/src/main/resources/log4j.properties
 delete mode 100644 allure-report-data/src/main/resources/log4j.properties

diff --git a/allure-commons/pom.xml b/allure-commons/pom.xml
index c3ee31b7..18e204b3 100644
--- a/allure-commons/pom.xml
+++ b/allure-commons/pom.xml
@@ -19,17 +19,26 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+        </dependency>
+
+        <!-- Testing -->
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/allure-java-adaptor-api/pom.xml b/allure-java-adaptor-api/pom.xml
index 46bd2c9a..8c579cf2 100644
--- a/allure-java-adaptor-api/pom.xml
+++ b/allure-java-adaptor-api/pom.xml
@@ -28,24 +28,21 @@
             <groupId>ru.yandex.qatools.allure</groupId>
             <artifactId>allure-commons</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>ru.yandex.qatools.allure</groupId>
-                    <artifactId>allure-model</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/allure-java-adaptor-api/src/test/resources/log4j.properties b/allure-java-adaptor-api/src/test/resources/log4j.properties
deleted file mode 100644
index 5253470a..00000000
--- a/allure-java-adaptor-api/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-log4j.rootCategory=ERROR, console
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
\ No newline at end of file
diff --git a/allure-java-aspects/pom.xml b/allure-java-aspects/pom.xml
index d58d03f3..918fdbdf 100644
--- a/allure-java-aspects/pom.xml
+++ b/allure-java-aspects/pom.xml
@@ -26,13 +26,22 @@
             <artifactId>aspectjrt</artifactId>
             <version>${aspectj.version}</version>
         </dependency>
+
+        <!-- Testing -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/allure-junit-adaptor/pom.xml b/allure-junit-adaptor/pom.xml
index 78250e60..16b45ac4 100644
--- a/allure-junit-adaptor/pom.xml
+++ b/allure-junit-adaptor/pom.xml
@@ -18,15 +18,16 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>ru.yandex.qatools.allure</groupId>
diff --git a/allure-model/pom.xml b/allure-model/pom.xml
index eef6e9d8..e46f47fd 100644
--- a/allure-model/pom.xml
+++ b/allure-model/pom.xml
@@ -73,16 +73,24 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-api</artifactId>
         </dependency>
 
+        <!-- Testing -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/allure-model/src/main/resources/log4j.properties b/allure-model/src/main/resources/log4j.properties
deleted file mode 100644
index 5253470a..00000000
--- a/allure-model/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-log4j.rootCategory=ERROR, console
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
\ No newline at end of file
diff --git a/allure-report-data/pom.xml b/allure-report-data/pom.xml
index 7cacaece..8b9453c4 100644
--- a/allure-report-data/pom.xml
+++ b/allure-report-data/pom.xml
@@ -105,19 +105,19 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>ru.yandex.qatools.allure</groupId>
-            <artifactId>allure-commons</artifactId>
-        </dependency>
         <dependency>
             <groupId>ru.yandex.qatools.allure</groupId>
             <artifactId>allure-report-plugin-api</artifactId>
         </dependency>
-
-        <!--Logging-->
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <groupId>ru.yandex.qatools.allure</groupId>
+            <artifactId>allure-commons</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-nop</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--Jackson dependencies for serialize to JSON-->
@@ -161,18 +161,21 @@
             <version>18.0</version>
         </dependency>
 
-
+        <!-- Testing -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/allure-report-data/src/main/resources/log4j.properties b/allure-report-data/src/main/resources/log4j.properties
deleted file mode 100644
index 5253470a..00000000
--- a/allure-report-data/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-log4j.rootCategory=ERROR, console
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
\ No newline at end of file
diff --git a/allure-testng-adaptor/pom.xml b/allure-testng-adaptor/pom.xml
index 1f19c7a6..484e308c 100644
--- a/allure-testng-adaptor/pom.xml
+++ b/allure-testng-adaptor/pom.xml
@@ -21,13 +21,17 @@
             <groupId>ru.yandex.qatools.allure</groupId>
             <artifactId>allure-java-aspects</artifactId>
         </dependency>
+
+        <!-- Testing -->
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>ru.yandex.qatools.allure</groupId>
diff --git a/pom.xml b/pom.xml
index 0d8fad4c..05811063 100644
--- a/pom.xml
+++ b/pom.xml
@@ -332,27 +332,29 @@
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-                <version>1.7.10</version>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.7.12</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-nop</artifactId>
+                <version>1.7.12</version>
             </dependency>
 
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>4.12</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-all</artifactId>
                 <version>1.10.19</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>
                 <artifactId>hamcrest-all</artifactId>
                 <version>1.3</version>
-                <scope>test</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>