From 097e159b6febe3f66105cbb04bb25b51d6ab9fd1 Mon Sep 17 00:00:00 2001
From: WonderCsabo <kozakcsabi@gmail.com>
Date: Thu, 1 May 2014 14:35:03 +0200
Subject: [PATCH] Update Guava to 15.0

We want to integrate Parceler, but we ran into a problem. The Guava
version used by Parceler is 15.0, but our pom is declaring the 13.0.1
version. Because of this when using Parceler in conjunction with AA,
the older Guava dependency is resolved, witch results in problems,
since Parceler needs the new classes introduced since 13.0.1.

This commit addresses this issue by simply updating the Guava version to
15.0. This is enough because our code do not uses any classes which are
changed since 13.0.1.
---
 AndroidAnnotations/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AndroidAnnotations/pom.xml b/AndroidAnnotations/pom.xml
index d68ab769c8..87f12b624e 100644
--- a/AndroidAnnotations/pom.xml
+++ b/AndroidAnnotations/pom.xml
@@ -168,7 +168,7 @@
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<version>13.0.1</version>
+				<version>15.0</version>
 				<scope>test</scope>
 			</dependency>
 		</dependencies>