From 3b57713c1f34bac68c1be41f91a40c9cb867a729 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 13 May 2019 12:35:16 -0400 Subject: [PATCH] Upgrade dependencies, Gradle; prepare for release * Fix Checkstyle violations according the latest update --- build.gradle | 16 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- .../integration/util/SimplePoolTests.java | 4 +- .../integration/ip/util/SocketTestUtils.java | 53 ++++++++++++------- .../jms/SubscribableJmsChannelTests.java | 4 +- ...eplyScenariosWithCachedConsumersTests.java | 4 +- ...eplyScenariosWithTempReplyQueuesTests.java | 4 +- 7 files changed, 56 insertions(+), 31 deletions(-) diff --git a/build.gradle b/build.gradle index 8e4f8f70ea..cdee360649 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlinVersion = '1.3.30' + ext.kotlinVersion = '1.3.31' repositories { maven { url 'https://repo.spring.io/plugins-release' } } @@ -90,9 +90,9 @@ subprojects { subproject -> ext { activeMqVersion = '5.15.9' apacheSshdVersion = '2.2.0' - aspectjVersion = '1.9.3' + aspectjVersion = '1.9.4' assertjVersion = '3.12.2' - assertkVersion = '0.13' + assertkVersion = '0.14' awaitilityVersion = '3.1.6' boonVersion = '0.34' commonsDbcp2Version = '2.6.0' @@ -102,12 +102,12 @@ subprojects { subproject -> derbyVersion = '10.14.2.0' ftpServerVersion = '1.1.1' googleJsr305Version = '3.0.2' - groovyVersion = '2.5.6' + groovyVersion = '2.5.7' hamcrestVersion = '2.1' hazelcastVersion = '3.12' hibernateVersion = '5.4.2.Final' hsqldbVersion = '2.4.1' - h2Version = '1.4.197' + h2Version = '1.4.199' jackson2Version = '2.9.8' javaxActivationVersion = '1.2.0' javaxMailVersion = '1.6.2' @@ -126,7 +126,7 @@ subprojects { subproject -> log4jVersion = '2.11.2' micrometerVersion = '1.1.4' mockitoVersion = '2.26.0' - mysqlVersion = '8.0.15' + mysqlVersion = '8.0.16' pahoMqttClientVersion = '1.2.0' postgresVersion = '42.2.5' reactorNettyVersion = '0.9.0.M1' @@ -145,7 +145,7 @@ subprojects { subproject -> springRetryVersion = '1.2.4.RELEASE' springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.M2' springWsVersion = '3.0.7.RELEASE' - tomcatVersion = "9.0.17" + tomcatVersion = "9.0.19" xstreamVersion = '1.4.11.1' } @@ -303,7 +303,7 @@ subprojects { subproject -> checkstyle { configFile = file("$rootDir/src/checkstyle/checkstyle.xml") - toolVersion = "8.19" + toolVersion = "8.20" } artifacts { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ea13fdfd19..f4d7b2bf61 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/spring-integration-core/src/test/java/org/springframework/integration/util/SimplePoolTests.java b/spring-integration-core/src/test/java/org/springframework/integration/util/SimplePoolTests.java index 7767ffd2f2..3f6945bbe6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/util/SimplePoolTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/util/SimplePoolTests.java @@ -81,7 +81,9 @@ public class SimplePoolTests { pool.getItem(); fail("Expected exception"); } - catch (PoolItemNotAvailableException e) { } + catch (PoolItemNotAvailableException e) { + + } // resize up pool.setPoolSize(4); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketTestUtils.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketTestUtils.java index ec80e25c9f..58babb9fde 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketTestUtils.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketTestUtils.java @@ -39,6 +39,7 @@ import org.springframework.integration.ip.AbstractInternetProtocolReceivingChann * * @author Gary Russell * @author Gunnar Hillert + * @author Artem Bilan * */ public class SocketTestUtils { @@ -78,14 +79,16 @@ public class SocketTestUtils { testCompleteLatch.await(10, TimeUnit.SECONDS); } catch (Exception e1) { - e1.printStackTrace(); + logger.error(e1); } finally { if (socket != null) { try { socket.close(); } - catch (IOException e2) { } + catch (IOException e2) { + + } } } }); @@ -110,14 +113,16 @@ public class SocketTestUtils { testCompleteLatch.await(10, TimeUnit.SECONDS); } catch (Exception e1) { - e1.printStackTrace(); + logger.error(e1); } finally { if (socket != null) { try { socket.close(); } - catch (IOException e2) { } + catch (IOException e2) { + + } } } }); @@ -149,14 +154,16 @@ public class SocketTestUtils { testCompleteLatch.await(10, TimeUnit.SECONDS); } catch (Exception e1) { - e1.printStackTrace(); + logger.error(e1); } finally { if (socket != null) { try { socket.close(); } - catch (IOException e2) { } + catch (IOException e2) { + + } } } }); @@ -201,14 +208,16 @@ public class SocketTestUtils { testCompleteLatch.await(10, TimeUnit.SECONDS); } catch (Exception e1) { - e1.printStackTrace(); + logger.error(e1); } finally { if (socket != null) { try { socket.close(); } - catch (IOException e2) { } + catch (IOException e2) { + + } } } }); @@ -241,7 +250,9 @@ public class SocketTestUtils { try { socket.close(); } - catch (IOException e2) { } + catch (IOException e2) { + + } } } }); @@ -277,14 +288,16 @@ public class SocketTestUtils { testCompleteLatch.await(10, TimeUnit.SECONDS); } catch (Exception e1) { - e1.printStackTrace(); + logger.error(e1); } finally { if (socket != null) { try { socket.close(); } - catch (IOException e2) { } + catch (IOException e2) { + + } } } }); @@ -311,8 +324,8 @@ public class SocketTestUtils { } socket.close(); } - catch (Exception e) { - e.printStackTrace(); + catch (Exception ex) { + logger.error(ex); } }); thread.setDaemon(true); @@ -331,8 +344,8 @@ public class SocketTestUtils { outputStream.write(TEST_STRING.getBytes()); socket.close(); } - catch (Exception e) { - e.printStackTrace(); + catch (Exception ex) { + logger.error(ex); } }); thread.setDaemon(true); @@ -358,14 +371,16 @@ public class SocketTestUtils { testCompleteLatch.await(10, TimeUnit.SECONDS); } catch (Exception e1) { - e1.printStackTrace(); + logger.error(e1); } finally { if (socket != null) { try { socket.close(); } - catch (IOException e2) { } + catch (IOException e2) { + + } } } }); @@ -389,7 +404,9 @@ public class SocketTestUtils { testCompleteLatch.await(10, TimeUnit.SECONDS); socket.close(); } - catch (Exception e) { } + catch (Exception e) { + + } }); thread.setDaemon(true); thread.start(); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java index e17e1b907e..23de45a729 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java @@ -368,7 +368,9 @@ public class SubscribableJmsChannelTests extends ActiveMQMultiContextTests { try { Thread.sleep(100); } - catch (InterruptedException e) { } + catch (InterruptedException e) { + + } timeout -= 100; } return false; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java index cbb3130587..37ac03ffd8 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java @@ -207,7 +207,9 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti try { gateway.exchange(gateway.exchange(new GenericMessage("foo"))); } - catch (Exception e) { /*ignore*/ } + catch (Exception e) { + /*ignore*/ + } } diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java index 6a0cf01675..bda9294fce 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java @@ -134,7 +134,9 @@ public class RequestReplyScenariosWithTempReplyQueuesTests extends ActiveMQMulti try { Thread.sleep(6000); } - catch (Exception e2) { /*ignore*/ } + catch (Exception e2) { + /*ignore*/ + } } try { TextMessage replyMessage = session.createTextMessage();