diff --git a/build.gradle b/build.gradle
index 9a1f1095e..fc506e2e5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,6 +36,7 @@ allprojects {
 	group = 'org.springframework.batch'
 
 	repositories {
+		maven { url 'https://repo.spring.io/libs-snapshot' }
 		maven { url 'https://repo.spring.io/libs-milestone' }
 		maven { url 'https://repo.spring.io/plugins-release' }
 		mavenCentral()
@@ -45,16 +46,16 @@ allprojects {
 
 		environmentProperty = project.hasProperty('environment') ? getProperty('environment') : 'hsql'
 
-		springVersionDefault = '5.0.0.RC1'
+		springVersionDefault = '5.0.0.BUILD-SNAPSHOT'
 		springVersion = project.hasProperty('springVersion') ? getProperty('springVersion') : springVersionDefault
 		springRetryVersion = '1.2.0.RELEASE'
-		springAmqpVersion = '2.0.0.M4'
-		springDataCommonsVersion = '2.0.0.M3'
-		springDataGemfireVersion = '2.0.0.M3'
-		springDataJpaVersion = '2.0.0.M3'
-		springDataMongodbVersion = '2.0.0.M3'
-		springDataNeo4jVersion = '5.0.0.M3'
-		springIntegrationVersion = '5.0.0.M4'
+		springAmqpVersion = '2.0.0.BUILD-SNAPSHOT'
+		springDataCommonsVersion = '2.0.0.BUILD-SNAPSHOT'
+		springDataGemfireVersion = '2.0.0.BUILD-SNAPSHOT'
+		springDataJpaVersion = '2.0.0.BUILD-SNAPSHOT'
+		springDataMongodbVersion = '2.0.0.BUILD-SNAPSHOT'
+		springDataNeo4jVersion = '5.0.0.BUILD-SNAPSHOT'
+		springIntegrationVersion = '5.0.0.BUILD-SNAPSHOT'
 		springLdapVersion = '2.3.1.RELEASE'
 
 		activemqVersion = '5.14.5'
diff --git a/publish-maven.gradle b/publish-maven.gradle
index fdc22cf44..aca00deb5 100644
--- a/publish-maven.gradle
+++ b/publish-maven.gradle
@@ -46,17 +46,16 @@ def customizePom(pom, gradleProject) {
 				developer {
 					id = 'dsyer'
 					name = 'Dave Syer'
-					email = 'dsyer@gopivotal.com'
+					email = 'dsyer@pivotal.io'
 				}
 				developer {
 					id = 'nebhale'
 					name = 'Ben Hale'
-					email = 'bhale@gopivotal.com'
+					email = 'bhale@gpivotal.io'
 				}
 				developer {
 					id = 'lward'
 					name = 'Lucas Ward'
-					email = 'lucas.l.ward@accenture.com'
 				}
 				developer {
 					id = 'robokaso'
@@ -66,7 +65,7 @@ def customizePom(pom, gradleProject) {
 				developer {
 					id = 'trisberg'
 					name = 'Thomas Risberg'
-					email = 'trisberg@gopivotal.com'
+					email = 'trisberg@pivotal.io'
 				}
 				developer {
 					id = 'dhgarrette'
@@ -76,13 +75,13 @@ def customizePom(pom, gradleProject) {
 				developer {
 					id = 'mminella'
 					name = 'Michael Minella'
-					email = 'mminella@gopivotal.com'
+					email = 'mminella@pivotal.io'
 					roles = ["project lead"]
 				}
 				developer {
 					id = 'chrisjs'
 					name = 'Chris Schaefer'
-					email = 'cschaefer@gopivotal.com'
+					email = 'cschaefer@pivotal.io'
 				}
 			}
 		}
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/MongoItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/MongoItemReaderTests.java
index c58f59cd7..d4b978c12 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/MongoItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/MongoItemReaderTests.java
@@ -31,7 +31,7 @@ import org.springframework.data.mongodb.core.query.Query;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
@@ -140,7 +140,7 @@ public class MongoItemReaderTests {
 		assertEquals(100, query.getSkip());
 		assertEquals("{ }", query.getQueryObject().toJson());
 		assertEquals("{ \"name\" : -1 }", query.getSortObject().toJson());
-		assertNull(query.getFieldsObject());
+		assertTrue(query.getFieldsObject().isEmpty());
 	}
 
 	@Test