Merge branch 'logging' of https://github.com/nhajratw/cucumber-jvm into nhajratw-logging

aslakhellesoy · aslakhellesoy · commit f6ce5096b3de · 2014-06-26T21:51:49.000+01:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Stories in Ready](https://badge.waffle.io/cucumber/cucumber-jvm.png?label=ready)](https://waffle.io/cucumber/cucumber-jvm)  
+[![Stories in Ready](https://badge.waffle.io/cucumber/cucumber-jvm.png?label=ready)](https://waffle.io/cucumber/cucumber-jvm)
 [![Build Status](https://secure.travis-ci.org/cucumber/cucumber-jvm.png)](http://travis-ci.org/cucumber/cucumber-jvm)
 
 Cucumber-JVM is a pure Java implementation of Cucumber that supports the [most popular](http://cukes.info/platforms.html) programming languages for the JVM.
diff --git a/examples/android/android-test/pom.xml b/examples/android/android-test/pom.xml
@@ -7,7 +7,7 @@
         <groupId>info.cukes.android-examples</groupId>
         <artifactId>android-examples</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.1.8-SNAPSHOT</version>
+        <version>1.1.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>cucumber-android-test</artifactId>
diff --git a/examples/android/cukeulator-test/pom.xml b/examples/android/cukeulator-test/pom.xml
@@ -7,7 +7,7 @@
         <groupId>info.cukes.android-examples</groupId>
         <artifactId>android-examples</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.1.8-SNAPSHOT</version>
+        <version>1.1.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>cukelator-test</artifactId>
diff --git a/examples/android/cukeulator/pom.xml b/examples/android/cukeulator/pom.xml
@@ -7,7 +7,7 @@
         <groupId>info.cukes.android-examples</groupId>
         <artifactId>android-examples</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.1.8-SNAPSHOT</version>
+        <version>1.1.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>cukelator</artifactId>
diff --git a/examples/android/pom.xml b/examples/android/pom.xml
@@ -7,12 +7,11 @@
         <groupId>info.cukes</groupId>
         <artifactId>cucumber-jvm</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.1.8-SNAPSHOT</version>
+        <version>1.1.9-SNAPSHOT</version>
     </parent>
 
     <groupId>info.cukes.android-examples</groupId>
     <artifactId>android-examples</artifactId>
-    <version>1.1.8-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Examples: Android</name>
 
diff --git a/examples/java-calculator-testng/pom.xml b/examples/java-calculator-testng/pom.xml
@@ -5,7 +5,7 @@
         <groupId>info.cukes</groupId>
         <artifactId>cucumber-jvm</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.1.8-SNAPSHOT</version>
+        <version>1.1.9-SNAPSHOT</version>
     </parent>
 
     <artifactId>java-calculator-testng</artifactId>
diff --git a/examples/java-webbit-websockets-selenium/pom.xml b/examples/java-webbit-websockets-selenium/pom.xml
@@ -69,5 +69,15 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/examples/java-wicket/java-wicket-main/pom.xml b/examples/java-wicket/java-wicket-main/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>info.cukes</groupId>
         <artifactId>java-wicket</artifactId>
-        <version>1.1.8-SNAPSHOT</version>
+        <version>1.1.9-SNAPSHOT</version>
     </parent>
     <artifactId>java-wicket-main</artifactId>
     <name>Examples: Wicket application</name>
@@ -17,6 +17,14 @@
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/examples/java-wicket/java-wicket-main/src/main/resources/logback.xml b/examples/java-wicket/java-wicket-main/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+      <encoder>
+          <pattern>%date [%thread] %-5level %logger{36} - %msg%n</pattern>
+      </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/examples/java-wicket/java-wicket-test/pom.xml b/examples/java-wicket/java-wicket-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>info.cukes</groupId>
         <artifactId>java-wicket</artifactId>
-        <version>1.1.8-SNAPSHOT</version>
+        <version>1.1.9-SNAPSHOT</version>
     </parent>
     <artifactId>java-wicket-test</artifactId>
     <name>Examples: Wicket application tested with Selenium</name>
@@ -100,5 +100,15 @@
             <artifactId>selenium-java</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/examples/java-wicket/java-wicket-test/src/test/resources/logback-test.xml b/examples/java-wicket/java-wicket-test/src/test/resources/logback-test.xml
@@ -0,0 +1,13 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+      <encoder>
+          <pattern>%date [%thread] %-5level %logger{36} - %msg%n</pattern>
+      </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/examples/java-wicket/pom.xml b/examples/java-wicket/pom.xml
@@ -5,7 +5,7 @@
         <groupId>info.cukes</groupId>
         <artifactId>cucumber-jvm</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.1.8-SNAPSHOT</version>
+        <version>1.1.9-SNAPSHOT</version>
     </parent>
     <artifactId>java-wicket</artifactId>
     <packaging>pom</packaging>
diff --git a/examples/spring-txn/pom.xml b/examples/spring-txn/pom.xml
@@ -75,12 +75,8 @@
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
         </dependency>
 
         <dependency>
diff --git a/examples/spring-txn/src/main/resources/log4j.properties b/examples/spring-txn/src/main/resources/log4j.properties
diff --git a/examples/spring-txn/src/main/resources/logback.xml b/examples/spring-txn/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+      <encoder>
+          <pattern>%date [%thread] %-5level %logger{36} - %msg%n</pattern>
+      </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/needle/pom.xml b/needle/pom.xml
@@ -56,13 +56,8 @@
             <artifactId>jbosscc-needle</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -78,4 +73,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/needle/src/test/resources/log4j.properties b/needle/src/test/resources/log4j.properties
diff --git a/needle/src/test/resources/logback-test.xml b/needle/src/test/resources/logback-test.xml
@@ -0,0 +1,13 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+      <encoder>
+          <pattern>%date [%thread] %-5level %logger{36} - %msg%n</pattern>
+      </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/pom.xml b/pom.xml
@@ -59,7 +59,7 @@
         <!-- For some reason, upgrading cobertura completely breaks the entire build (?!) -->
         <cobertura.version>1.9.4.1</cobertura.version>
         <dbunit.version>2.4.9</dbunit.version>
-        <log4j.version>1.2.17</log4j.version>
+        <logback.version>1.1.2</logback.version>
         <slf4j.version>1.7.7</slf4j.version>
         <freemarker.version>2.3.20</freemarker.version>
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
@@ -180,6 +180,17 @@
             </dependency>
 
             <!-- Spring stuff -->
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-core</artifactId>
+                <version>${spring.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-tx</artifactId>
@@ -267,16 +278,10 @@
                 <version>${slf4j.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
-                <version>${slf4j.version}</version>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>${logback.version}</version>
             </dependency>
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>${log4j.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>javax.servlet-api</artifactId>
@@ -342,6 +347,12 @@
                 <groupId>org.seleniumhq.selenium</groupId>
                 <artifactId>selenium-firefox-driver</artifactId>
                 <version>${selenium.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.seleniumhq.selenium</groupId>
@@ -352,6 +363,12 @@
                 <groupId>org.seleniumhq.selenium</groupId>
                 <artifactId>selenium-java</artifactId>
                 <version>${selenium.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.webbitserver</groupId>
@@ -382,12 +399,24 @@
                 <groupId>org.apache.openejb</groupId>
                 <artifactId>openejb-core</artifactId>
                 <version>${openejb-core.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
                 <groupId>net.sourceforge.cobertura</groupId>
                 <artifactId>cobertura</artifactId>
                 <version>${cobertura.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -820,6 +849,12 @@
                                     <phases>clean,deploy,site</phases>
                                     <unCheckedPluginList>org.codehaus.mojo:cobertura-maven-plugin</unCheckedPluginList>
                                 </requirePluginVersions>
+                                <bannedDependencies>
+                                    <excludes>
+                                        <exclude>commons-logging</exclude>               <!-- use slf4j -->
+                                        <exclude>log4j</exclude>                         <!-- use slf4j -->
+                                    </excludes>
+                                </bannedDependencies>
                             </rules>
                         </configuration>
                         <goals>
diff --git a/spring/pom.xml b/spring/pom.xml
@@ -43,6 +43,11 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-[![Stories in Ready](https://badge.waffle.io/cucumber/cucumber-jvm.png?label=ready)](https://waffle.io/cucumber/cucumber-jvm)`
	`1`	`+[![Stories in Ready](https://badge.waffle.io/cucumber/cucumber-jvm.png?label=ready)](https://waffle.io/cucumber/cucumber-jvm)`
`2`	`2`	`[![Build Status](https://secure.travis-ci.org/cucumber/cucumber-jvm.png)](http://travis-ci.org/cucumber/cucumber-jvm)`
`3`	`3`
`4`	`4`	`Cucumber-JVM is a pure Java implementation of Cucumber that supports the [most popular](http://cukes.info/platforms.html) programming languages for the JVM.`