From e6f5d9bbd8943f19e9d897ac0b3e1b0640929b6b Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Fri, 19 Jun 2015 12:37:42 +0200
Subject: [PATCH] DATAREST-584 - Polished dependency setup to mitigate
 differing dependency versions.

Declare Commons IO explicitly to make sure we use a version matching both Neo4j and Solr. Extracted Guava version into property.
---
 pom.xml                         |  1 +
 spring-data-rest-core/pom.xml   |  2 +-
 spring-data-rest-webmvc/pom.xml | 23 +++++++++++++++++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 64c875c3d..4d1e82671 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
 		<hibernate.version>4.3.5.Final</hibernate.version>
 
 		<bundlor.enabled>false</bundlor.enabled>
+		<guava>16.0.1</guava>
 	</properties>
 
 	<developers>
diff --git a/spring-data-rest-core/pom.xml b/spring-data-rest-core/pom.xml
index 65b2378a0..699e508a3 100644
--- a/spring-data-rest-core/pom.xml
+++ b/spring-data-rest-core/pom.xml
@@ -68,7 +68,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>17.0</version>
+			<version>${guava}</version>
 			<optional>true</optional>
 		</dependency>
 
diff --git a/spring-data-rest-webmvc/pom.xml b/spring-data-rest-webmvc/pom.xml
index 3b598b1a1..a1267d9b1 100644
--- a/spring-data-rest-webmvc/pom.xml
+++ b/spring-data-rest-webmvc/pom.xml
@@ -116,6 +116,25 @@
 
 	<profiles>
 
+		<profile>
+			<id>unifying</id>
+
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+
+			<dependencies>
+				<!-- Neo4j VS. Solr -->
+				<dependency>
+					<groupId>commons-io</groupId>
+					<artifactId>commons-io</artifactId>
+					<version>2.3</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+
+		</profile>
+
 		<profile>
 			<id>neo4j</id>
 
@@ -130,8 +149,8 @@
 					<version>${springdata.neo4j}</version>
 					<scope>test</scope>
 				</dependency>
-
 			</dependencies>
+
 		</profile>
 
 		<profile>
@@ -223,7 +242,7 @@
 				<dependency>
 					<groupId>com.google.guava</groupId>
 					<artifactId>guava</artifactId>
-					<version>15.0</version>
+					<version>${guava}</version>
 					<scope>test</scope>
 				</dependency>