From aaa44b3369e477e2ff7551477c847d9c17f5364b Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@vmware.com>
Date: Mon, 3 Sep 2012 16:56:13 +0200
Subject: [PATCH] DATAMONGO-529 - Update Querydsl setup to use 1.0.4.

Raised Maven compiler plugin version to 2.5.1.
---
 spring-data-mongodb-parent/pom.xml |  6 +++++-
 spring-data-mongodb/pom.xml        | 22 ++++++++--------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/spring-data-mongodb-parent/pom.xml b/spring-data-mongodb-parent/pom.xml
index 88131bbad..53d3eb1a4 100644
--- a/spring-data-mongodb-parent/pom.xml
+++ b/spring-data-mongodb-parent/pom.xml
@@ -160,7 +160,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.5.1</version>
         <configuration>
           <source>1.5</source>
           <target>1.5</target>
@@ -244,6 +244,10 @@
       <id>spring-plugins-release</id>
       <url>http://repo.springsource.org/plugins-release</url>
     </pluginRepository>
+    <pluginRepository>
+      <id>querydsl</id>
+      <url>http://source.mysema.com/maven2/releases</url>
+    </pluginRepository>
   </pluginRepositories>
   <repositories>
     <repository>
diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml
index d136285ef..68e046159 100644
--- a/spring-data-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -78,19 +78,6 @@
 			<artifactId>querydsl-mongodb</artifactId>
 			<version>${querydsl.version}</version>
 			<optional>true</optional>
-			<exclusions>
-				<exclusion>
-					<groupId>com.google.code.morphia</groupId>
-					<artifactId>morphia</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>com.mysema.querydsl</groupId>
-			<artifactId>querydsl-apt</artifactId>
-			<version>${querydsl.version}</version>
-			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
@@ -181,7 +168,14 @@
 			<plugin>
 				<groupId>com.mysema.maven</groupId>
 				<artifactId>maven-apt-plugin</artifactId>
-				<version>1.0.2</version>
+				<version>1.0.4</version>
+				<dependencies>
+					<dependency>
+						<groupId>com.mysema.querydsl</groupId>
+						<artifactId>querydsl-apt</artifactId>
+						<version>${querydsl.version}</version>
+					</dependency>
+				</dependencies>
 				<executions>
 					<execution>
 						<phase>generate-test-sources</phase>