From a1181efbcdb8b9e78437bc57d9370d24d7d783f8 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Tue, 30 Oct 2012 13:53:28 +0100 Subject: [PATCH] Dependency updates - Upgraded to latest Spring Data releases. Spring Data Gemfire - 1.2.1.RELEASE Spring Data JPA - 1.2.0.RELEASE Spring Data MongoDB - 1.1.1.RELEASE Spring Data Neo4j - 2.1.0.RELEASE Spring Data REST - 1.0.0.RELEASE Polished Querydsl configuration to be consistent across modules. --- gemfire/pom.xml | 2 +- jpa/pom.xml | 4 +--- mongodb/pom.xml | 6 ++---- neo4j/pom.xml | 29 +++++++++++++---------------- pom.xml | 11 ----------- querydsl/pom.xml | 4 +--- rest/pom.xml | 2 +- 7 files changed, 19 insertions(+), 39 deletions(-) diff --git a/gemfire/pom.xml b/gemfire/pom.xml index 6ad1a18a..006b781c 100644 --- a/gemfire/pom.xml +++ b/gemfire/pom.xml @@ -18,7 +18,7 @@ org.springframework.data spring-data-gemfire - 1.2.0.RELEASE + 1.2.1.RELEASE diff --git a/jpa/pom.xml b/jpa/pom.xml index 16b51cfc..1bf7847d 100644 --- a/jpa/pom.xml +++ b/jpa/pom.xml @@ -75,9 +75,6 @@ com.mysema.maven maven-apt-plugin 1.0.4 - - com.mysema.query.apt.jpa.JPAAnnotationProcessor - com.mysema.querydsl @@ -93,6 +90,7 @@ target/generated-sources + com.mysema.query.apt.jpa.JPAAnnotationProcessor diff --git a/mongodb/pom.xml b/mongodb/pom.xml index 1b4d95ca..1162e910 100644 --- a/mongodb/pom.xml +++ b/mongodb/pom.xml @@ -20,7 +20,7 @@ org.springframework.data spring-data-mongodb - 1.1.0.RELEASE + 1.1.1.RELEASE @@ -51,9 +51,6 @@ com.mysema.maven maven-apt-plugin 1.0.4 - - org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor - generate-sources @@ -62,6 +59,7 @@ target/generated-sources + org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor diff --git a/neo4j/pom.xml b/neo4j/pom.xml index b8f81cc1..65ff77e4 100644 --- a/neo4j/pom.xml +++ b/neo4j/pom.xml @@ -13,10 +13,6 @@ ../pom.xml - - 1.8.M07 - - @@ -45,9 +41,9 @@ - org.apache.lucene - lucene-core - 3.5.0 + org.neo4j + neo4j-cypher-dsl + 1.8 @@ -70,16 +66,12 @@ com.mysema.maven maven-apt-plugin 1.0.4 - - target/generated-sources/java - org.springframework.data.neo4j.querydsl.SDNAnnotationProcessor - - - com.mysema.querydsl - querydsl-apt - ${querydsl.version} - + + com.mysema.querydsl + querydsl-apt + ${querydsl.version} + @@ -87,6 +79,11 @@ process + + target/generated-sources + org.springframework.data.neo4j.querydsl.SDNAnnotationProcessor + + diff --git a/pom.xml b/pom.xml index bdf52182..3396be37 100644 --- a/pom.xml +++ b/pom.xml @@ -140,18 +140,7 @@ false - - true - - - spring-snapshots - http://repo.springsource.org/libs-snapshot - - true - - - diff --git a/querydsl/pom.xml b/querydsl/pom.xml index 3dcffe43..fb082148 100644 --- a/querydsl/pom.xml +++ b/querydsl/pom.xml @@ -33,9 +33,6 @@ com.mysema.maven maven-apt-plugin 1.0.4 - - com.mysema.query.apt.QuerydslAnnotationProcessor - com.mysema.querydsl @@ -51,6 +48,7 @@ target/generated-sources/java + com.mysema.query.apt.QuerydslAnnotationProcessor diff --git a/rest/pom.xml b/rest/pom.xml index 2e032fd3..2ce896af 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -23,7 +23,7 @@ org.springframework.data spring-data-rest-webmvc - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RELEASE