diff --git a/build.gradle b/build.gradle
index 503c6fccf..9e9917fb5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,55 +46,55 @@ allprojects {
 
 		environmentProperty = project.hasProperty('environment') ? getProperty('environment') : 'hsql'
 
-		springVersionDefault = '5.0.0.RELEASE'
+		springVersionDefault = '5.1.0.BUILD-SNAPSHOT'
 		springVersion = project.hasProperty('springVersion') ? getProperty('springVersion') : springVersionDefault
-		springRetryVersion = '1.2.1.RELEASE'
-		springAmqpVersion = '2.0.0.RELEASE'
-		springDataCommonsVersion = '2.0.0.RELEASE'
-		springDataGemfireVersion = '2.0.0.RELEASE'
-		springDataJpaVersion = '2.0.0.RELEASE'
-		springDataMongodbVersion = '2.0.0.RELEASE'
-		springDataNeo4jVersion = '5.0.0.RELEASE'
-		springIntegrationVersion = '5.0.0.RELEASE'
+		springRetryVersion = '1.2.2.RELEASE'
+		springAmqpVersion = '2.1.0.M3'
+		springDataCommonsVersion = '2.1.0.RC2'
+		springDataGemfireVersion = '2.1.0.RC2'
+		springDataJpaVersion = '2.1.0.RC2'
+		springDataMongodbVersion = '2.1.0.RC2'
+		springDataNeo4jVersion = '5.1.0.RC2'
+		springIntegrationVersion = '5.1.0.M2'
 		springLdapVersion = '2.3.2.RELEASE'
 
-		activemqVersion = '5.15.2'
-		aspectjVersion = '1.8.12'
+		activemqVersion = '5.15.6'
+		aspectjVersion = '1.9.1'
 		castorVersion = '1.4.1'
 		commonsCollectionsVersion = '3.2.2'
-		commonsDdbcpVersion = '2.1.1'
+		commonsDdbcpVersion = '2.5.0'
 		commonsIoVersion = '2.6'
-		commonsLangVersion = '3.6'
+		commonsLangVersion = '3.8'
 		commonsPoolVersion = '1.6'
-		derbyVersion = '10.14.1.0'
-		groovyVersion = '2.5.0-beta-1'
+		derbyVersion = '10.14.2.0'
+		groovyVersion = '2.5.2'
 		hamcrestVersion = '1.3'
-		h2databaseVersion = '1.4.196'
-		hibernateVersion = '5.2.12.Final'
-		hibernateValidatorVersion = '6.0.4.Final'
+		h2databaseVersion = '1.4.197'
+		hibernateVersion = '5.3.6.Final'
+		hibernateValidatorVersion = '6.0.12.Final'
 		javaxElVersion = '3.0.0'
-		hsqldbVersion = '2.4.0'
-		jackson2Version = '2.9.2'
+		hsqldbVersion = '2.4.1'
+		jackson2Version = '2.9.6'
 		gsonVersion = '2.8.5'
-		javaMailVersion = '1.6.0'
+		javaMailVersion = '1.6.2'
 		javaxBatchApiVersion = '1.0'
 		javaxInjectVersion = '1'
-		javaxTransactionVersion = '1.2'
+		javaxTransactionVersion = '1.3'
 		jbatchTckSpi = '1.0'
 		jettisonVersion = '1.2' //?
 		jmsVersion = '2.0.1'
 		junitVersion = '4.12'
-		log4jVersion = '2.9.1'
-		mysqlVersion = '5.1.44'
-		mockitoVersion = '2.11.0'
-		postgresqlVersion = '42.1.4'
+		log4jVersion = '2.11.1'
+		mysqlVersion = '8.0.12'
+		mockitoVersion = '2.22.0'
+		postgresqlVersion = '42.2.5'
 		quartzVersion = '2.3.0'
-		servletApiVersion = '3.1.0'
+		servletApiVersion = '4.0.1'
 		sqlfireclientVersion = '1.0.3'
-		sqliteVersion = '3.20.1'
+		sqliteVersion = '3.23.1'
 		woodstoxVersion = '5.0.3'
 		xercesVersion = '2.11.0' //?
-		xmlunitVersion = '2.5.0'
+		xmlunitVersion = '2.6.2'
 		xstreamVersion = '1.4.10'
 		jrubyVersion = '1.7.26'
 		beanshellVersion = '2.0b5'
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java
index a0c7dec92..251b888af 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java
@@ -20,7 +20,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import org.hibernate.query.Query;
+import org.hibernate.Query;
 import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
 import org.hibernate.Session;