From 860f59508084afc6fd3f04d550b3f0bce521718e Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Tue, 28 Apr 2020 14:23:25 -0400
Subject: [PATCH] Upgrade dependencies

* Remove unnecessary Mockito stubbing from the `FileReadingMessageSourceTests`
---
 build.gradle                                  | 50 +++++++++----------
 .../file/FileReadingMessageSourceTests.java   |  5 +-
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/build.gradle b/build.gradle
index e612ee99f0d..fe4666acf9e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ allprojects {
 		if (version.endsWith('BUILD-SNAPSHOT')) {
 			maven { url 'https://repo.spring.io/libs-snapshot' }
 		}
-		maven { url 'https://repo.spring.io/libs-staging-local' }
+//		maven { url 'https://repo.spring.io/libs-staging-local' }
 	}
 
 	ext.javadocLinks = [
@@ -89,9 +89,9 @@ subprojects { subproject ->
 	ext {
 		activeMqVersion = '5.15.9'
 		apacheSshdVersion = '2.2.0'
-		aspectjVersion = '1.9.4'
-		assertjVersion = '3.13.1'
-		assertkVersion = '0.19'
+		aspectjVersion = '1.9.5'
+		assertjVersion = '3.15.0'
+		assertkVersion = '0.22'
 		boonVersion = '0.34'
 		commonsDbcp2Version = '2.6.0'
 		commonsIoVersion = '2.6'
@@ -101,49 +101,49 @@ subprojects { subproject ->
 		eclipseLinkVersion = '2.7.4'
 		ftpServerVersion = '1.1.1'
 		googleJsr305Version = '3.0.2'
-		groovyVersion = '2.5.7'
+		groovyVersion = '2.5.11'
 		guavaVersion = '26.0-jre'
 		hamcrestVersion = '1.3'
-		hazelcastVersion = '3.12'
-		hibernateVersion = '5.4.2.Final'
+		hazelcastVersion = '3.12.6'
+		hibernateVersion = '5.4.14.Final'
 		hsqldbVersion = '2.4.1'
 		h2Version = '1.4.199'
-		jackson2Version = '2.9.9'
+		jackson2Version = '2.9.10'
 		javaxActivationVersion = '1.1.1'
 		javaxMailVersion = '1.6.2'
 		jmsApiVersion = '2.0.1'
 		jpa21ApiVersion = '1.0.0.Final'
 		jpaApiVersion = '2.2.1'
-		jrubyVersion = '9.2.7.0'
+		jrubyVersion = '9.2.11.1'
 		jschVersion = '0.1.55'
 		jsonpathVersion = '2.4.0'
 		junit4Version = '4.12'
-		junitJupiterVersion = '5.4.1'
-		junitPlatformVersion = '1.4.1'
+		junitJupiterVersion = '5.4.2'
+		junitPlatformVersion = '1.4.2'
 		jythonVersion = '2.7.0'
 		kryoShadedVersion = '4.0.2'
 		lettuceVersion = '5.1.8.RELEASE'
-		log4jVersion = '2.11.2'
-		micrometerVersion = '1.1.8'
+		log4jVersion = '2.13.2'
+		micrometerVersion = '1.1.13'
 		mockitoVersion = '2.25.1'
 		mysqlVersion = '8.0.16'
 		pahoMqttClientVersion = '1.2.2'
 		postgresVersion = '42.2.5'
-		reactorNettyVersion = '0.8.13.RELEASE'
-		reactorVersion = '3.2.12.RELEASE'
+		reactorNettyVersion = '0.8.18.RELEASE'
+		reactorVersion = '3.2.17.RELEASE'
 		romeToolsVersion = '1.9.0'
 		servletApiVersion = '4.0.0'
 		smackVersion = '4.3.3'
-		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.1.12.RELEASE'
-		springDataJpaVersion = '2.1.12.RELEASE'
-		springDataMongoVersion = '2.1.12.RELEASE'
-		springDataRedisVersion = '2.1.12.RELEASE'
-		springGemfireVersion = '2.1.12.RELEASE'
-		springSecurityVersion = '5.1.7.RELEASE'
-		springRetryVersion = '1.2.4.RELEASE'
-		springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.1.11.RELEASE'
-		springWsVersion = '3.0.8.RELEASE'
-		tomcatVersion = '9.0.19'
+		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.1.14.RELEASE'
+		springDataJpaVersion = '2.1.17.RELEASE'
+		springDataMongoVersion = '2.1.17.RELEASE'
+		springDataRedisVersion = '2.1.17.RELEASE'
+		springGemfireVersion = '2.1.17.RELEASE'
+		springSecurityVersion = '5.1.9.RELEASE'
+		springRetryVersion = '1.2.5.RELEASE'
+		springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.1.15.RELEASE'
+		springWsVersion = '3.0.9.RELEASE'
+		tomcatVersion = '9.0.34'
 		xstreamVersion = '1.4.11.1'
 	}
 
diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java
index 4599756082c..b5140594116 100644
--- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java
+++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,9 +64,6 @@ public class FileReadingMessageSourceTests {
 	private Comparator<File> comparator;
 
 	public void prepResource() throws Exception {
-		when(inputDirectoryMock.isDirectory()).thenReturn(true);
-		when(inputDirectoryMock.exists()).thenReturn(true);
-		when(inputDirectoryMock.canRead()).thenReturn(true);
 		when(inputDirectoryMock.getAbsolutePath()).thenReturn("foo/bar");
 		when(fileMock.getAbsolutePath()).thenReturn("foo/bar/fileMock");
 		when(locker.lock(isA(File.class))).thenReturn(true);