Skip to content

Commit 3b57713

Browse files
artembilanartembilan
committed
Upgrade dependencies, Gradle; prepare for release
* Fix Checkstyle violations according the latest update
1 parent cea47f7 commit 3b57713

File tree

7 files changed

+56
-31
lines changed

7 files changed

+56
-31
lines changed

‎build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlinVersion = '1.3.30'
2+
ext.kotlinVersion = '1.3.31'
33
repositories {
44
maven { url 'https://repo.spring.io/plugins-release' }
55
}
@@ -90,9 +90,9 @@ subprojects { subproject ->
9090
ext {
9191
activeMqVersion = '5.15.9'
9292
apacheSshdVersion = '2.2.0'
93-
aspectjVersion = '1.9.3'
93+
aspectjVersion = '1.9.4'
9494
assertjVersion = '3.12.2'
95-
assertkVersion = '0.13'
95+
assertkVersion = '0.14'
9696
awaitilityVersion = '3.1.6'
9797
boonVersion = '0.34'
9898
commonsDbcp2Version = '2.6.0'
@@ -102,12 +102,12 @@ subprojects { subproject ->
102102
derbyVersion = '10.14.2.0'
103103
ftpServerVersion = '1.1.1'
104104
googleJsr305Version = '3.0.2'
105-
groovyVersion = '2.5.6'
105+
groovyVersion = '2.5.7'
106106
hamcrestVersion = '2.1'
107107
hazelcastVersion = '3.12'
108108
hibernateVersion = '5.4.2.Final'
109109
hsqldbVersion = '2.4.1'
110-
h2Version = '1.4.197'
110+
h2Version = '1.4.199'
111111
jackson2Version = '2.9.8'
112112
javaxActivationVersion = '1.2.0'
113113
javaxMailVersion = '1.6.2'
@@ -126,7 +126,7 @@ subprojects { subproject ->
126126
log4jVersion = '2.11.2'
127127
micrometerVersion = '1.1.4'
128128
mockitoVersion = '2.26.0'
129-
mysqlVersion = '8.0.15'
129+
mysqlVersion = '8.0.16'
130130
pahoMqttClientVersion = '1.2.0'
131131
postgresVersion = '42.2.5'
132132
reactorNettyVersion = '0.9.0.M1'
@@ -145,7 +145,7 @@ subprojects { subproject ->
145145
springRetryVersion = '1.2.4.RELEASE'
146146
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.M2'
147147
springWsVersion = '3.0.7.RELEASE'
148-
tomcatVersion = "9.0.17"
148+
tomcatVersion = "9.0.19"
149149
xstreamVersion = '1.4.11.1'
150150
}
151151

@@ -303,7 +303,7 @@ subprojects { subproject ->
303303

304304
checkstyle {
305305
configFile = file("$rootDir/src/checkstyle/checkstyle.xml")
306-
toolVersion = "8.19"
306+
toolVersion = "8.20"
307307
}
308308

309309
artifacts {

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎spring-integration-core/src/test/java/org/springframework/integration/util/SimplePoolTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ public void testOverCommitAndResize() {
8181
pool.getItem();
8282
fail("Expected exception");
8383
}
84-
catch (PoolItemNotAvailableException e) { }
84+
catch (PoolItemNotAvailableException e) {
85+
86+
}
8587

8688
// resize up
8789
pool.setPoolSize(4);

‎spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketTestUtils.java

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
*
4040
* @author Gary Russell
4141
* @author Gunnar Hillert
42+
* @author Artem Bilan
4243
*
4344
*/
4445
public class SocketTestUtils {
@@ -78,14 +79,16 @@ public static CountDownLatch testSendLength(final int port, final CountDownLatch
7879
testCompleteLatch.await(10, TimeUnit.SECONDS);
7980
}
8081
catch (Exception e1) {
81-
e1.printStackTrace();
82+
logger.error(e1);
8283
}
8384
finally {
8485
if (socket != null) {
8586
try {
8687
socket.close();
8788
}
88-
catch (IOException e2) { }
89+
catch (IOException e2) {
90+
91+
}
8992
}
9093
}
9194
});
@@ -110,14 +113,16 @@ public static CountDownLatch testSendLengthOverflow(final int port) {
110113
testCompleteLatch.await(10, TimeUnit.SECONDS);
111114
}
112115
catch (Exception e1) {
113-
e1.printStackTrace();
116+
logger.error(e1);
114117
}
115118
finally {
116119
if (socket != null) {
117120
try {
118121
socket.close();
119122
}
120-
catch (IOException e2) { }
123+
catch (IOException e2) {
124+
125+
}
121126
}
122127
}
123128
});
@@ -149,14 +154,16 @@ public static CountDownLatch testSendFragmented(final int port, final int howMan
149154
testCompleteLatch.await(10, TimeUnit.SECONDS);
150155
}
151156
catch (Exception e1) {
152-
e1.printStackTrace();
157+
logger.error(e1);
153158
}
154159
finally {
155160
if (socket != null) {
156161
try {
157162
socket.close();
158163
}
159-
catch (IOException e2) { }
164+
catch (IOException e2) {
165+
166+
}
160167
}
161168
}
162169
});
@@ -201,14 +208,16 @@ public static CountDownLatch testSendStxEtx(final int port, final CountDownLatch
201208
testCompleteLatch.await(10, TimeUnit.SECONDS);
202209
}
203210
catch (Exception e1) {
204-
e1.printStackTrace();
211+
logger.error(e1);
205212
}
206213
finally {
207214
if (socket != null) {
208215
try {
209216
socket.close();
210217
}
211-
catch (IOException e2) { }
218+
catch (IOException e2) {
219+
220+
}
212221
}
213222
}
214223
});
@@ -241,7 +250,9 @@ public static CountDownLatch testSendStxEtxOverflow(final int port) {
241250
try {
242251
socket.close();
243252
}
244-
catch (IOException e2) { }
253+
catch (IOException e2) {
254+
255+
}
245256
}
246257
}
247258
});
@@ -277,14 +288,16 @@ public static CountDownLatch testSendCrLf(final int port, final CountDownLatch l
277288
testCompleteLatch.await(10, TimeUnit.SECONDS);
278289
}
279290
catch (Exception e1) {
280-
e1.printStackTrace();
291+
logger.error(e1);
281292
}
282293
finally {
283294
if (socket != null) {
284295
try {
285296
socket.close();
286297
}
287-
catch (IOException e2) { }
298+
catch (IOException e2) {
299+
300+
}
288301
}
289302
}
290303
});
@@ -311,8 +324,8 @@ public static void testSendCrLfSingle(final int port, final CountDownLatch latch
311324
}
312325
socket.close();
313326
}
314-
catch (Exception e) {
315-
e.printStackTrace();
327+
catch (Exception ex) {
328+
logger.error(ex);
316329
}
317330
});
318331
thread.setDaemon(true);
@@ -331,8 +344,8 @@ public static void testSendRaw(final int port) {
331344
outputStream.write(TEST_STRING.getBytes());
332345
socket.close();
333346
}
334-
catch (Exception e) {
335-
e.printStackTrace();
347+
catch (Exception ex) {
348+
logger.error(ex);
336349
}
337350
});
338351
thread.setDaemon(true);
@@ -358,14 +371,16 @@ public static CountDownLatch testSendSerialized(final int port) {
358371
testCompleteLatch.await(10, TimeUnit.SECONDS);
359372
}
360373
catch (Exception e1) {
361-
e1.printStackTrace();
374+
logger.error(e1);
362375
}
363376
finally {
364377
if (socket != null) {
365378
try {
366379
socket.close();
367380
}
368-
catch (IOException e2) { }
381+
catch (IOException e2) {
382+
383+
}
369384
}
370385
}
371386
});
@@ -389,7 +404,9 @@ public static CountDownLatch testSendCrLfOverflow(final int port) {
389404
testCompleteLatch.await(10, TimeUnit.SECONDS);
390405
socket.close();
391406
}
392-
catch (Exception e) { }
407+
catch (Exception e) {
408+
409+
}
393410
});
394411
thread.setDaemon(true);
395412
thread.start();

‎spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,9 @@ private static boolean waitUntilRegisteredWithDestination(SubscribableJmsChannel
368368
try {
369369
Thread.sleep(100);
370370
}
371-
catch (InterruptedException e) { }
371+
catch (InterruptedException e) {
372+
373+
}
372374
timeout -= 100;
373375
}
374376
return false;

‎spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,9 @@ public void messageCorrelationBasedOnRequestCorrelationIdTimedOutFirstReplyOptim
207207
try {
208208
gateway.exchange(gateway.exchange(new GenericMessage<String>("foo")));
209209
}
210-
catch (Exception e) { /*ignore*/ }
210+
catch (Exception e) {
211+
/*ignore*/
212+
}
211213

212214
}
213215

‎spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ public void messageCorrelationBasedOnRequestCorrelationIdTimedOutFirstReply() th
134134
try {
135135
Thread.sleep(6000);
136136
}
137-
catch (Exception e2) { /*ignore*/ }
137+
catch (Exception e2) {
138+
/*ignore*/
139+
}
138140
}
139141
try {
140142
TextMessage replyMessage = session.createTextMessage();

0 commit comments

Comments
 (0)