From d72f1968ea0baeb666e4e6369f212f42df0f5f87 Mon Sep 17 00:00:00 2001
From: Ruben Dijkstra <ruben.dijkstra@hva.nl>
Date: Sat, 24 May 2014 22:45:00 +0200
Subject: [PATCH] Update to guava 17.0

Querydsl JPA module requires guava version < 15
---
 querydsl-jpa/pom.xml  | 7 +++++++
 querydsl-root/pom.xml | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/querydsl-jpa/pom.xml b/querydsl-jpa/pom.xml
index d1db8c6bc..19a24519d 100644
--- a/querydsl-jpa/pom.xml
+++ b/querydsl-jpa/pom.xml
@@ -130,6 +130,13 @@
       <version>2.0.1.2</version>
       <scope>test</scope>
      </dependency>
+     <!-- override Querydsl Core's guava version for Batoo JPA -->
+     <dependency>
+         <groupId>com.google.guava</groupId>
+         <artifactId>guava</artifactId>
+         <version>14.0</version>
+         <scope>compile</scope>
+     </dependency>
      <dependency>
       <groupId>com.jolbox</groupId>
       <artifactId>bonecp</artifactId>
diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml
index 319e8dd87..2f7277198 100644
--- a/querydsl-root/pom.xml
+++ b/querydsl-root/pom.xml
@@ -35,7 +35,7 @@
     <sqlite.version>3.7.2</sqlite.version>
     <teradata.version>13.10.00.35</teradata.version>
     
-    <guava.version>15.0</guava.version>
+    <guava.version>17.0</guava.version>
     <codegen.version>0.6.2</codegen.version>
     <mysema.lang.version>0.2.4</mysema.lang.version>
     <cglib.version>2.2.2</cglib.version>