Skip to content

Commit 860f595

Browse files
committed
Upgrade dependencies
* Remove unnecessary Mockito stubbing from the `FileReadingMessageSourceTests`
1 parent a28f5b6 commit 860f595

File tree

2 files changed

+26
-29
lines changed

2 files changed

+26
-29
lines changed

build.gradle

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ allprojects {
3939
if (version.endsWith('BUILD-SNAPSHOT')) {
4040
maven { url 'https://repo.spring.io/libs-snapshot' }
4141
}
42-
maven { url 'https://repo.spring.io/libs-staging-local' }
42+
// maven { url 'https://repo.spring.io/libs-staging-local' }
4343
}
4444

4545
ext.javadocLinks = [
@@ -89,9 +89,9 @@ subprojects { subproject ->
8989
ext {
9090
activeMqVersion = '5.15.9'
9191
apacheSshdVersion = '2.2.0'
92-
aspectjVersion = '1.9.4'
93-
assertjVersion = '3.13.1'
94-
assertkVersion = '0.19'
92+
aspectjVersion = '1.9.5'
93+
assertjVersion = '3.15.0'
94+
assertkVersion = '0.22'
9595
boonVersion = '0.34'
9696
commonsDbcp2Version = '2.6.0'
9797
commonsIoVersion = '2.6'
@@ -101,49 +101,49 @@ subprojects { subproject ->
101101
eclipseLinkVersion = '2.7.4'
102102
ftpServerVersion = '1.1.1'
103103
googleJsr305Version = '3.0.2'
104-
groovyVersion = '2.5.7'
104+
groovyVersion = '2.5.11'
105105
guavaVersion = '26.0-jre'
106106
hamcrestVersion = '1.3'
107-
hazelcastVersion = '3.12'
108-
hibernateVersion = '5.4.2.Final'
107+
hazelcastVersion = '3.12.6'
108+
hibernateVersion = '5.4.14.Final'
109109
hsqldbVersion = '2.4.1'
110110
h2Version = '1.4.199'
111-
jackson2Version = '2.9.9'
111+
jackson2Version = '2.9.10'
112112
javaxActivationVersion = '1.1.1'
113113
javaxMailVersion = '1.6.2'
114114
jmsApiVersion = '2.0.1'
115115
jpa21ApiVersion = '1.0.0.Final'
116116
jpaApiVersion = '2.2.1'
117-
jrubyVersion = '9.2.7.0'
117+
jrubyVersion = '9.2.11.1'
118118
jschVersion = '0.1.55'
119119
jsonpathVersion = '2.4.0'
120120
junit4Version = '4.12'
121-
junitJupiterVersion = '5.4.1'
122-
junitPlatformVersion = '1.4.1'
121+
junitJupiterVersion = '5.4.2'
122+
junitPlatformVersion = '1.4.2'
123123
jythonVersion = '2.7.0'
124124
kryoShadedVersion = '4.0.2'
125125
lettuceVersion = '5.1.8.RELEASE'
126-
log4jVersion = '2.11.2'
127-
micrometerVersion = '1.1.8'
126+
log4jVersion = '2.13.2'
127+
micrometerVersion = '1.1.13'
128128
mockitoVersion = '2.25.1'
129129
mysqlVersion = '8.0.16'
130130
pahoMqttClientVersion = '1.2.2'
131131
postgresVersion = '42.2.5'
132-
reactorNettyVersion = '0.8.13.RELEASE'
133-
reactorVersion = '3.2.12.RELEASE'
132+
reactorNettyVersion = '0.8.18.RELEASE'
133+
reactorVersion = '3.2.17.RELEASE'
134134
romeToolsVersion = '1.9.0'
135135
servletApiVersion = '4.0.0'
136136
smackVersion = '4.3.3'
137-
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.1.12.RELEASE'
138-
springDataJpaVersion = '2.1.12.RELEASE'
139-
springDataMongoVersion = '2.1.12.RELEASE'
140-
springDataRedisVersion = '2.1.12.RELEASE'
141-
springGemfireVersion = '2.1.12.RELEASE'
142-
springSecurityVersion = '5.1.7.RELEASE'
143-
springRetryVersion = '1.2.4.RELEASE'
144-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.1.11.RELEASE'
145-
springWsVersion = '3.0.8.RELEASE'
146-
tomcatVersion = '9.0.19'
137+
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.1.14.RELEASE'
138+
springDataJpaVersion = '2.1.17.RELEASE'
139+
springDataMongoVersion = '2.1.17.RELEASE'
140+
springDataRedisVersion = '2.1.17.RELEASE'
141+
springGemfireVersion = '2.1.17.RELEASE'
142+
springSecurityVersion = '5.1.9.RELEASE'
143+
springRetryVersion = '1.2.5.RELEASE'
144+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.1.15.RELEASE'
145+
springWsVersion = '3.0.9.RELEASE'
146+
tomcatVersion = '9.0.34'
147147
xstreamVersion = '1.4.11.1'
148148
}
149149

spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -64,9 +64,6 @@ public class FileReadingMessageSourceTests {
6464
private Comparator<File> comparator;
6565

6666
public void prepResource() throws Exception {
67-
when(inputDirectoryMock.isDirectory()).thenReturn(true);
68-
when(inputDirectoryMock.exists()).thenReturn(true);
69-
when(inputDirectoryMock.canRead()).thenReturn(true);
7067
when(inputDirectoryMock.getAbsolutePath()).thenReturn("foo/bar");
7168
when(fileMock.getAbsolutePath()).thenReturn("foo/bar/fileMock");
7269
when(locker.lock(isA(File.class))).thenReturn(true);

0 commit comments

Comments
 (0)