diff --git a/build.gradle b/build.gradle index 7a4addc8..702dd9b9 100644 --- a/build.gradle +++ b/build.gradle @@ -86,6 +86,7 @@ dependencies { exclude group: "com.fasterxml.jackson.core", module: "jackson-core" exclude group: "com.fasterxml.jackson.core", module: "jackson-databind" exclude group: "org.apache.hbase", module: "hbase" + exclude group: "org.apache.logging.log4j", module: "slf4j-log4j12-impl" exclude group: "org.slf4j", module: "slf4j-api" exclude group: "org.springframework", module: "spring-aop" exclude group: "org.springframework", module: "spring-beans" diff --git a/gradle.properties b/gradle.properties index 97bf2dcb..d1e59c9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,18 @@ antlrVersion=2.7.7 -aspectjVersion=1.8.5 +aspectjVersion=1.8.9 cdiVersion=1.0 gemfireVersion=1.0.0-incubating.M2-SNAPSHOT hamcrestVersion=1.3 -jacksonVersion=2.6.0 +jacksonVersion=2.6.5 junitVersion=4.12 log4jVersion=1.2.17 mockitoVersion=1.10.19 multiThreadedtcVersion=1.01 openwebbeansVersion=1.2.8 servletApiVersion=2.5 -slf4jVersion=1.7.12 +slf4jVersion=1.7.19 spring.range="[4.0.0, 5.0.0)" springVersion=4.2.5.RELEASE -springDataBuildVersion=1.7.3.RELEASE -springDataCommonsVersion=1.11.2.RELEASE +springDataBuildVersion=1.8.1.RELEASE +springDataCommonsVersion=1.12.1.RELEASE version=1.7.0.APACHE-GEODE-EA-SNAPSHOT diff --git a/pom.xml b/pom.xml index dd0cf706..21c98924 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.springframework.data.build spring-data-parent - 1.7.3.RELEASE + 1.8.1.RELEASE org.springframework.data @@ -23,7 +23,7 @@ 1.0.0-incubating.M2-SNAPSHOT 1.01 2.5 - 1.11.2.RELEASE + 1.12.1.RELEASE @@ -95,6 +95,10 @@ org.apache.hbase hbase + + org.apache.logging.log4j + slf4j-log4j12-impl + org.codehaus.jackson jackson-core 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 2be24bf0..c53d2030 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); + super(method, metadata, factory); Assert.notNull(context); assertNonPagingQueryMethod(method); diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java index 7ded23a1..02fdc3cb 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java @@ -227,6 +227,7 @@ public class ClientRegionFactoryBeanTest { when(mockBeanFactory.containsBean(anyString())).thenReturn(true); when(mockClientCache.createClientRegionFactory(eq(ClientRegionShortcut.PROXY))).thenReturn(mockClientRegionFactory); when(mockClientRegionFactory.createSubregion(eq(mockRegion), eq("TestSubRegion"))).thenReturn(mockSubRegion); + when(mockRegion.getName()).thenReturn("Parent"); factoryBean.setAttributes(null); factoryBean.setBeanFactory(mockBeanFactory); @@ -240,7 +241,6 @@ public class ClientRegionFactoryBeanTest { verify(mockBeanFactory, times(1)).containsBean(eq(GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME)); verify(mockClientCache, times(1)).createClientRegionFactory(eq(ClientRegionShortcut.PROXY)); verify(mockClientRegionFactory, times(1)).createSubregion(eq(mockRegion), eq("TestSubRegion")); - verifyZeroInteractions(mockRegion); verifyZeroInteractions(mockSubRegion); }