Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade dependencies, Gradle; prepare for release

Browse Source 
* Fix Checkstyle violations according the latest update
This commit is contained in:
Artem Bilan
2019-05-13 12:35:16 -04:00
parent cea47f7904
commit 3b57713c1f
7 changed files with 56 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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' }
}
@@ -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 {

2
gradle/wrapper/gradle-wrapper.properties vendored
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
spring-integration-core/src/test/java/org/springframework/integration/util/SimplePoolTests.java
View File

@@ -81,7 +81,9 @@ public class SimplePoolTests {
pool.getItem();
fail("Expected exception");
}
catch (PoolItemNotAvailableException e) { }
catch (PoolItemNotAvailableException e) {
}
// resize up
pool.setPoolSize(4);

53
spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketTestUtils.java
View File

@@ -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();

4
spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java
View File

@@ -368,7 +368,9 @@ public class SubscribableJmsChannelTests extends ActiveMQMultiContextTests {
try {
Thread.sleep(100);
}
catch (InterruptedException e) { }
catch (InterruptedException e) {
}
timeout -= 100;
}
return false;

4
spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java
View File

@@ -207,7 +207,9 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti
try {
gateway.exchange(gateway.exchange(new GenericMessage<String>("foo")));
}
catch (Exception e) { /*ignore*/ }
catch (Exception e) {
/*ignore*/
}
}

4
spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java
View File

@@ -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();