From 184f05bf30c5b012d921593c7866c657c2c9866e Mon Sep 17 00:00:00 2001 From: John Blum Date: Thu, 11 Feb 2016 16:49:25 -0800 Subject: [PATCH] SGF-471 - Change spring-data-build and spring-data-commons dependency versions to GA releases... Because Spring Data GemFire with Apache Geode support (apache-geode) is not part of the Spring Data Release Trains (e.g. Fowler, Gosling, Hopper, etc) it makes more sense to maintain a constant and stable dependency on both Spring Data Build and Spring Data Commons, respectively. Until Apache Geode has an official GA release, SDG with Apache Geode support cannot progress along with the other SD modules during pre-release, development milestones (e.g. M1, RC1) since Apache Geode does not maintain a predictable and similar release cycle. Therefore, it makes sense that SDG with Apache Geode support be coupled with the Apache Geode release cycle until the first GA release. At which time, SDG with Apache Geode support can then maintain a constant, fixed dependency on Apache Geode, as a 'driver' (similar to SDG with Pivotal GemFire support, which depends only on GA GemFire releases) and subsequently, be sync'd with the SD Release Train. --- build.gradle | 4 ++-- gradle.properties | 4 ++-- .../data/gemfire/repository/query/GemfireQueryMethod.java | 2 +- .../repository/support/GemfireRepositoryFactory.java | 6 +++++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index efab809e..0f50a274 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ description = 'Spring Data GemFire' group = 'org.springframework.data' repositories { - maven { url "https://repo.spring.io/libs-snapshot" } + maven { url "https://repo.spring.io/libs-release" } maven { url "https://repo.spring.io/plugins-release"} maven { url "https://repository.apache.org/content/repositories/snapshots" } } @@ -40,7 +40,7 @@ if (project.hasProperty('platformVersion')) { apply plugin: 'spring-io' repositories { - maven { url "https://repo.spring.io/libs-snapshot" } + maven { url "https://repo.spring.io/libs-release" } } dependencyManagement { diff --git a/gradle.properties b/gradle.properties index 94c48217..59b18f77 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,6 +10,6 @@ multiThreadedtcVersion=1.01 slf4jVersion=1.7.12 spring.range="[4.0.0, 5.0.0)" springVersion=4.1.9.RELEASE -springDataBuildVersion=1.8.0.BUILD-SNAPSHOT -springDataCommonsVersion=1.12.0.BUILD-SNAPSHOT +springDataBuildVersion=1.7.3.RELEASE +springDataCommonsVersion=1.11.2.RELEASE version=1.7.0.APACHE-GEODE-EA-SNAPSHOT diff --git a/src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethod.java b/src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethod.java index c53d2030..2be24bf0 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethod.java +++ b/src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethod.java @@ -59,7 +59,7 @@ public class GemfireQueryMethod extends QueryMethod { public GemfireQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFactory factory, MappingContext, GemfirePersistentProperty> context) { - super(method, metadata, factory); + super(method, metadata); Assert.notNull(context); assertNonPagingQueryMethod(method); diff --git a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java index 187b40ec..58965b1f 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java +++ b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java @@ -149,8 +149,12 @@ public class GemfireRepositoryFactory extends RepositoryFactorySupport { protected QueryLookupStrategy getQueryLookupStrategy(Key key) { return new QueryLookupStrategy() { - + @Override + public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, NamedQueries namedQueries) { + return resolveQuery(method, metadata, null, namedQueries); + } + public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory, NamedQueries namedQueries) {