Spring/spring-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SGF-489 - Update Spring Data and 3rd party dependencies.

Browse Source
This commit is contained in:
John Blum
2016-04-24 13:31:02 -07:00
parent b300c3b245
commit 4479e5a1a5
5 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@@ -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"

10
gradle.properties
View File

@@ -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

8
pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-parent</artifactId>
<version>1.7.3.RELEASE</version>
<version>1.8.1.RELEASE</version>
</parent>
<groupId>org.springframework.data</groupId>
@@ -23,7 +23,7 @@
<gemfire.version>1.0.0-incubating.M2-SNAPSHOT</gemfire.version>
<multithreadedtc.version>1.01</multithreadedtc.version>
<servlet-api.version>2.5</servlet-api.version>
<springdata.commons>1.11.2.RELEASE</springdata.commons>
<springdata.commons>1.12.1.RELEASE</springdata.commons>
</properties>
<repositories>
@@ -95,6 +95,10 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>slf4j-log4j12-impl</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core</artifactId>

2
src/main/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethod.java
View File

@@ -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);
super(method, metadata, factory);
Assert.notNull(context);
assertNonPagingQueryMethod(method);

2
src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java
View File

@@ -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);
}