Merge remote-tracking branch 'origin/master'

pom.xml

@@ -127,6 +127,12 @@
 			<artifactId>druid</artifactId>
 			<version>1.1.9</version>
 		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>