From 5678e4b78e670ed754b596849e0d871312debf9c Mon Sep 17 00:00:00 2001
From: David Rauschenbach <davidr@zimbra.com>
Date: Mon, 14 Jul 2014 19:08:28 -0700
Subject: [PATCH] Fixed compilation errors due to incomplete Maven pom.xml, and
 a reference to a non-existent parent pom. Fixed missing log4j.xml wanted by
 unit tests.

---
 pom.xml                      | 49 +++++++++++++++++++++++++++++++-----
 src/test/resources/log4j.xml | 21 ++++++++++++++++
 2 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 src/test/resources/log4j.xml

diff --git a/pom.xml b/pom.xml
index c321992..baabb30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,6 +4,20 @@
 	<groupId>com.ciq</groupId>
 	<artifactId>qless-java</artifactId>
 	<version>0.0.4-SNAPSHOT</version>
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<configuration>
+						<source>1.7</source>
+						<target>1.7</target>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
 	<dependencies>
 		<dependency>
 			<groupId>joda-time</groupId>
@@ -23,13 +37,41 @@
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
-			<version>2.2.1-SNAPSHOT</version>
+			<version>2.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-api</artifactId>
 			<version>1.0</version>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.6.4</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.inject</groupId>
+			<artifactId>guice</artifactId>
+			<version>3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.inject.extensions</groupId>
+			<artifactId>guice-assistedinject</artifactId>
+			<version>3.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.8.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.6.4</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<name>qless Java Client</name>
 	<url>http://github.com/ChannelIQ/qless-java</url>
@@ -39,9 +81,4 @@
 		<connection>scm:git:git@github.com:ChannelIQ/qless-java.git</connection>
 		<developerConnection>scm:git:git@github.com:ChannelIQ/qless-java.git</developerConnection>
 	</scm>
-	<parent>
-		<groupId>com.ciq</groupId>
-		<artifactId>project-base</artifactId>
-		<version>0.0.2-SNAPSHOT</version>
-	</parent>
 </project>
\ No newline at end of file
diff --git a/src/test/resources/log4j.xml b/src/test/resources/log4j.xml
new file mode 100644
index 0000000..8a976c9
--- /dev/null
+++ b/src/test/resources/log4j.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="US-ASCII" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
+    <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+        <param name="Threshold" value="TRACE" />
+        <param name="Target" value="System.out" />
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%-4r [%t] %-5p %-30.50c %x - %m%n"/>
+        </layout>
+    </appender>
+
+	<logger name="com.ciq.qless.java">
+		<level value="debug"/>
+	</logger>
+
+    <root>
+        <priority value ="debug" />
+        <appender-ref ref="CONSOLE" />
+    </root>
+</log4j:configuration>
\ No newline at end of file