Skip to content

Commit

Permalink
Upgrade dependencies, Gradle; prepare for release
Browse files Browse the repository at this point in the history 
* Fix Checkstyle violations according the latest update
  • Loading branch information
@artembilan
artembilan committed May 13, 2019
1 parent cea47f7 commit 3b57713
Show file tree
Hide file tree
Showing 7 changed files with 56 additions and 31 deletions.
16 changes: 8 additions & 8 deletions build.gradle
View file
@@ -1,5 +1,5 @@
buildscript {
ext.kotlinVersion = '1.3.30'
ext.kotlinVersion = '1.3.31'
repositories {
maven { url 'https://repo.spring.io/plugins-release' }
}
Expand Down Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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'
}

Expand Down Expand Up @@ -303,7 +303,7 @@ subprojects { subproject ->

checkstyle {
configFile = file("$rootDir/src/checkstyle/checkstyle.xml")
toolVersion = "8.19"
toolVersion = "8.20"
}

artifacts {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
@@ -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
4 changes: 3 additions & 1 deletion ...-integration-core/src/test/java/org/springframework/integration/util/SimplePoolTests.java
View file
Expand Up @@ -81,7 +81,9 @@ public void testOverCommitAndResize() {
pool.getItem();
fail("Expected exception");
}
catch (PoolItemNotAvailableException e) { }
catch (PoolItemNotAvailableException e) {

}

// resize up
pool.setPoolSize(4);
Expand Down
53 changes: 35 additions & 18 deletions ...integration-ip/src/test/java/org/springframework/integration/ip/util/SocketTestUtils.java
View file
Expand Up @@ -39,6 +39,7 @@
*
* @author Gary Russell
* @author Gunnar Hillert
* @author Artem Bilan
*
*/
public class SocketTestUtils {
Expand Down Expand Up @@ -78,14 +79,16 @@ public static CountDownLatch testSendLength(final int port, final CountDownLatch
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) {

}
}
}
});
Expand All @@ -110,14 +113,16 @@ public static CountDownLatch testSendLengthOverflow(final int port) {
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) {

}
}
}
});
Expand Down Expand Up @@ -149,14 +154,16 @@ public static CountDownLatch testSendFragmented(final int port, final int howMan
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) {

}
}
}
});
Expand Down Expand Up @@ -201,14 +208,16 @@ public static CountDownLatch testSendStxEtx(final int port, final CountDownLatch
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) {

}
}
}
});
Expand Down Expand Up @@ -241,7 +250,9 @@ public static CountDownLatch testSendStxEtxOverflow(final int port) {
try {
socket.close();
}
catch (IOException e2) { }
catch (IOException e2) {

}
}
}
});
Expand Down Expand Up @@ -277,14 +288,16 @@ public static CountDownLatch testSendCrLf(final int port, final CountDownLatch l
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) {

}
}
}
});
Expand All @@ -311,8 +324,8 @@ public static void testSendCrLfSingle(final int port, final CountDownLatch latch
}
socket.close();
}
catch (Exception e) {
e.printStackTrace();
catch (Exception ex) {
logger.error(ex);
}
});
thread.setDaemon(true);
Expand All @@ -331,8 +344,8 @@ public static void testSendRaw(final int port) {
outputStream.write(TEST_STRING.getBytes());
socket.close();
}
catch (Exception e) {
e.printStackTrace();
catch (Exception ex) {
logger.error(ex);
}
});
thread.setDaemon(true);
Expand All @@ -358,14 +371,16 @@ public static CountDownLatch testSendSerialized(final int port) {
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) {

}
}
}
});
Expand All @@ -389,7 +404,9 @@ public static CountDownLatch testSendCrLfOverflow(final int port) {
testCompleteLatch.await(10, TimeUnit.SECONDS);
socket.close();
}
catch (Exception e) { }
catch (Exception e) {

}
});
thread.setDaemon(true);
thread.start();
Expand Down
4 changes: 3 additions & 1 deletion ...on-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java
View file
Expand Up @@ -368,7 +368,9 @@ private static boolean waitUntilRegisteredWithDestination(SubscribableJmsChannel
try {
Thread.sleep(100);
}
catch (InterruptedException e) { }
catch (InterruptedException e) {

}
timeout -= 100;
}
return false;
Expand Down
4 changes: 3 additions & 1 deletion ...ramework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java
View file
Expand Up @@ -207,7 +207,9 @@ public void messageCorrelationBasedOnRequestCorrelationIdTimedOutFirstReplyOptim
try {
gateway.exchange(gateway.exchange(new GenericMessage<String>("foo")));
}
catch (Exception e) { /*ignore*/ }
catch (Exception e) {
/*ignore*/
}

}

Expand Down
4 changes: 3 additions & 1 deletion ...ramework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java
View file
Expand Up @@ -134,7 +134,9 @@ public void messageCorrelationBasedOnRequestCorrelationIdTimedOutFirstReply() th
try {
Thread.sleep(6000);
}
catch (Exception e2) { /*ignore*/ }
catch (Exception e2) {
/*ignore*/
}
}
try {
TextMessage replyMessage = session.createTextMessage();
Expand Down

0 comments on commit 3b57713

Please sign in to comment.