From 87e8518bd25190265adb4e85972f7fcd4c8ad123 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Tue, 11 Mar 2014 12:27:43 +0100 Subject: [PATCH] Upgraded to latest dependencies. Use latest stable Spring Data JPA release as well as Hibernate 4.3.4. Upgraded to Spring Boot 1.0 RC4, Querydsl 3.3.1 and Lombok 1.12.4. Upgraded to Spring Data MongoDB 1.5 snapshots to be able to use the geo-types from Spring Data Commons. --- jpa/pom.xml | 4 ++-- mongodb/pom.xml | 2 +- .../example/springdata/mongodb/customer/Address.java | 2 +- .../springdata/mongodb/customer/CustomerRepository.java | 6 +++--- .../customer/CustomerRepositoryIntegrationTest.java | 9 ++++----- pom.xml | 6 +++--- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/jpa/pom.xml b/jpa/pom.xml index dd351060..d3913731 100644 --- a/jpa/pom.xml +++ b/jpa/pom.xml @@ -24,8 +24,8 @@ - 1.5.0.RC1 - 4.3.1.Final + 1.5.0.RELEASE + 4.3.4.Final diff --git a/mongodb/pom.xml b/mongodb/pom.xml index 1c96e78c..515d5447 100644 --- a/mongodb/pom.xml +++ b/mongodb/pom.xml @@ -13,7 +13,7 @@ - 1.4.0.BUILD-SNAPSHOT + 1.5.0.BUILD-SNAPSHOT diff --git a/mongodb/src/main/java/example/springdata/mongodb/customer/Address.java b/mongodb/src/main/java/example/springdata/mongodb/customer/Address.java index 62257d0b..538b6b96 100644 --- a/mongodb/src/main/java/example/springdata/mongodb/customer/Address.java +++ b/mongodb/src/main/java/example/springdata/mongodb/customer/Address.java @@ -18,7 +18,7 @@ package example.springdata.mongodb.customer; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.springframework.data.mongodb.core.geo.Point; +import org.springframework.data.geo.Point; /** * A domain object to capture addresses. diff --git a/mongodb/src/main/java/example/springdata/mongodb/customer/CustomerRepository.java b/mongodb/src/main/java/example/springdata/mongodb/customer/CustomerRepository.java index c872ab26..1fe4ee6d 100644 --- a/mongodb/src/main/java/example/springdata/mongodb/customer/CustomerRepository.java +++ b/mongodb/src/main/java/example/springdata/mongodb/customer/CustomerRepository.java @@ -19,9 +19,9 @@ import java.util.List; import org.bson.types.ObjectId; import org.springframework.data.domain.Sort; -import org.springframework.data.mongodb.core.geo.Distance; -import org.springframework.data.mongodb.core.geo.GeoResults; -import org.springframework.data.mongodb.core.geo.Point; +import org.springframework.data.geo.Distance; +import org.springframework.data.geo.GeoResults; +import org.springframework.data.geo.Point; import org.springframework.data.repository.CrudRepository; /** diff --git a/mongodb/src/test/java/example/springdata/mongodb/customer/CustomerRepositoryIntegrationTest.java b/mongodb/src/test/java/example/springdata/mongodb/customer/CustomerRepositoryIntegrationTest.java index 376518a1..1efea1ec 100644 --- a/mongodb/src/test/java/example/springdata/mongodb/customer/CustomerRepositoryIntegrationTest.java +++ b/mongodb/src/test/java/example/springdata/mongodb/customer/CustomerRepositoryIntegrationTest.java @@ -24,17 +24,16 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.mongodb.core.geo.Distance; -import org.springframework.data.mongodb.core.geo.GeoResults; -import org.springframework.data.mongodb.core.geo.Metrics; -import org.springframework.data.mongodb.core.geo.Point; +import org.springframework.data.geo.Distance; +import org.springframework.data.geo.GeoResults; +import org.springframework.data.geo.Metrics; +import org.springframework.data.geo.Point; import org.springframework.data.querydsl.QSort; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import example.springdata.mongodb.ApplicationConfiguration; - /** * Integration test for {@link CustomerRepository}. * diff --git a/pom.xml b/pom.xml index 3c05a044..1a49b544 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 1.0.0.RC3 + 1.0.0.RC4 @@ -23,7 +23,7 @@ 4.0.1.RELEASE - 3.3.0 + 3.3.1 1.1.1 UTF-8 @@ -48,7 +48,7 @@ org.projectlombok lombok - 1.12.2 + 1.12.4 provided