diff --git a/build.gradle b/build.gradle index a5a93abc0..a7d07bf63 100644 --- a/build.gradle +++ b/build.gradle @@ -43,11 +43,11 @@ allprojects { springVersion = project.hasProperty('springVersion') ? getProperty('springVersion') : springVersionDefault springRetryVersion = '1.1.0.RC3' springAmqpVersion = '1.3.2.RELEASE' - springDataCommonsVersion = '1.7.2.RELEASE' - springDataGemfireVersion = '1.3.4.RELEASE' - springDataJpaVersion = '1.5.2.RELEASE' - springDataMongodbVersion = '1.4.2.RELEASE' - springDataNeo4jVersion = '3.0.2.RELEASE' + springDataCommonsVersion = '1.8.0.RC1' + springDataGemfireVersion = '1.4.0.RC1' + springDataJpaVersion = '1.6.0.RC1' + springDataMongodbVersion = '1.5.0.RC1' + springDataNeo4jVersion = '3.1.0.RC1' springIntegrationVersion = '4.0.0.RELEASE' springLdapVersion = '2.0.1.RELEASE' springIoVersion = '1.0.0.BUILD-SNAPSHOT' diff --git a/gradle.properties b/gradle.properties index 602ec724e..7645a9fa6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=3.0.0.RC1 +version=3.0.0.BUILD-SNAPSHOT diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/Neo4jItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/Neo4jItemReaderTests.java index 74eda24e0..bfb92f803 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/Neo4jItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/Neo4jItemReaderTests.java @@ -15,27 +15,26 @@ */ package org.springframework.batch.item.data; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Matchers.isNull; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.Map; - import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.springframework.data.neo4j.conversion.DefaultConverter; -import org.springframework.data.neo4j.conversion.EndResult; import org.springframework.data.neo4j.conversion.Result; import org.springframework.data.neo4j.conversion.ResultConverter; import org.springframework.data.neo4j.template.Neo4jOperations; +import java.util.ArrayList; +import java.util.Map; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Matchers.isNull; +import static org.mockito.Mockito.when; + public class Neo4jItemReaderTests { private Neo4jItemReader reader; @@ -44,7 +43,7 @@ public class Neo4jItemReaderTests { @Mock private Result> result; @Mock - private EndResult endResult; + private Result endResult; @Before public void setUp() throws Exception {