From b6662fb4546fa989e4f502da61b38d04f2327d56 Mon Sep 17 00:00:00 2001
From: Frank Greguska <fgreguska@gmail.com>
Date: Fri, 1 May 2015 10:29:18 -0500
Subject: [PATCH 1/2] Downgraded AssertJ to version compatible with Java 6

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 59fdd7629..939f465f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
 
 		<!-- Test -->
 		<junit.version>4.12</junit.version>
-		<assertj.version>2.0.0</assertj.version>
+		<assertj.version>1.7.1</assertj.version>
   
 		<!-- Dates -->
 		<jodatime-hibernate.version>1.3</jodatime-hibernate.version>

From 8251f42fa9a824495bf84c400013edc8651e54b1 Mon Sep 17 00:00:00 2001
From: Frank Greguska <fgreguska@gmail.com>
Date: Fri, 1 May 2015 10:30:50 -0500
Subject: [PATCH 2/2] Marked AssertJ as test scope

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 939f465f3..075e29d16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -282,6 +282,7 @@
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
 			<version>${assertj.version}</version>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>