diff --git a/build.gradle b/build.gradle index 22c3a6a6..a6697494 100644 --- a/build.gradle +++ b/build.gradle @@ -123,9 +123,9 @@ dependencies { testRuntime "javax.el:el-api:$cdiVersion" testRuntime "javax.servlet:servlet-api:$servletApiVersion" - testRuntime "log4j:log4j:$log4jVersion" testRuntime "org.apache.derby:derbyLocale_zh_TW:10.9.1.0" - testRuntime "org.slf4j:slf4j-log4j12:$slf4jVersion" + testRuntime "org.apache.logging.log4j:log4j:$log4jVersion" + testRuntime "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion" testRuntime "org.springframework.shell:spring-shell:$springShellVersion" sharedResources "org.springframework.data.build:spring-data-build-resources:$springDataBuildVersion@zip" diff --git a/gradle.properties b/gradle.properties index 497a086d..14f6ab9b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,16 +5,16 @@ cdiVersion=1.0 gemfireVersion=9.0.2 googleCodeFindbugsVersion=2.0.2 hamcrestVersion=1.3 -jacksonVersion=2.8.4 +jacksonVersion=2.8.6 junitVersion=4.12 -log4jVersion=1.2.17 -lombokVersion=1.16.10 -mockitoVersion=1.10.19 +log4jVersion=2.8.1 +lombokVersion=1.16.14 +mockitoVersion=2.7.19 multiThreadedtcVersion=1.01 openwebbeansVersion=1.2.8 servletApiVersion=2.5 slf4jVersion=1.7.21 -shiroVersion=1.3.1 +shiroVersion=1.3.2 spring.range="[5.0.0, 6.0.0)" springVersion=5.0.0.BUILD-SNAPSHOT springDataBuildVersion=2.0.0.BUILD-SNAPSHOT diff --git a/pom.xml b/pom.xml index 4c82e39c..c875e204 100644 --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,7 @@ 2.7.7 - 1.3.1 - 2.5.0 + 1.3.2 9.0.2 2.0.2 1.01 @@ -149,13 +148,6 @@ test - - org.assertj - assertj-core - ${assertj.version} - test - - org.apache.derby derbyLocale_zh_TW 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 aba13022..a513a988 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientRegionFactoryBeanTest.java @@ -215,7 +215,6 @@ public class ClientRegionFactoryBeanTest { verify(mockBeanFactory, times(1)).containsBean(eq(GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME)); verify(mockClientCache, times(1)).createClientRegionFactory(eq(ClientRegionShortcut.CACHING_PROXY)); verify(mockClientRegionFactory, times(1)).create(eq("TestRegion")); - verifyZeroInteractions(mockRegion); } @Test @@ -243,8 +242,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); } @Test @@ -271,7 +268,6 @@ public class ClientRegionFactoryBeanTest { verify(mockClientCache, times(1)).createClientRegionFactory(eq(ClientRegionShortcut.LOCAL_HEAP_LRU)); verify(mockClientRegionFactory, times(1)).create(eq("TestRegion")); verify(mockClientRegionFactory, never()).setPoolName(any(String.class)); - verifyZeroInteractions(mockRegion); } @Test