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<? extends GemfirePersistentEntity<?>, 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) {