Upgrade dependencies, including Kotlin

Author: artembilan

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-	ext.kotlinVersion = '1.2.71'
+	ext.kotlinVersion = '1.3.21'
 	repositories {
 		maven { url 'https://repo.spring.io/plugins-release' }
 	}
@@ -91,21 +91,21 @@ subprojects { subproject ->
 		apacheSshdVersion = '2.1.0'
 		aspectjVersion = '1.9.2'
 		assertjVersion = '3.11.1'
-		assertkVersion = '0.12'
+		assertkVersion = '0.13'
 		boonVersion = '0.34'
-		commonsDbcp2Version = '2.2.0'
+		commonsDbcp2Version = '2.5.0'
 		commonsIoVersion = '2.6'
 		commonsNetVersion = '3.6'
 		curatorVersion = '4.0.1'
 		derbyVersion = '10.14.2.0'
 		eclipseLinkVersion = '2.7.3'
 		ftpServerVersion = '1.1.1'
 		googleJsr305Version = '3.0.2'
-		groovyVersion = '2.5.5'
+		groovyVersion = '2.5.6'
 		guavaVersion = '26.0-jre'
 		hamcrestVersion = '1.3'
-		hazelcastVersion = '3.11'
-		hibernateVersion = '5.3.7.Final'
+		hazelcastVersion = '3.11.1'
+		hibernateVersion = '5.4.1.Final'
 		hsqldbVersion = '2.4.1'
 		h2Version = '1.4.197'
 		jackson2Version = '2.9.8'
@@ -114,36 +114,36 @@ subprojects { subproject ->
 		jmsApiVersion = '2.0.1'
 		jpa21ApiVersion = '1.0.0.Final'
 		jpaApiVersion = '2.2.1'
-		jrubyVersion = '9.2.4.0'
+		jrubyVersion = '9.2.6.0'
 		jschVersion = '0.1.55'
 		jsonpathVersion = '2.4.0'
 		junit4Version = '4.12'
-		junitJupiterVersion = '5.3.2'
-		junitPlatformVersion = '1.3.2'
+		junitJupiterVersion = '5.4.0'
+		junitPlatformVersion = '1.4.0'
 		jythonVersion = '2.7.0'
-		kryoShadedVersion = '3.0.3'
-		lettuceVersion = '5.1.3.RELEASE'
-		log4jVersion = '2.11.1'
-		micrometerVersion = '1.1.1'
-		mockitoVersion = '2.23.4'
-		mysqlVersion = '8.0.13'
+		kryoShadedVersion = '4.0.2'
+		lettuceVersion = '5.1.4.RELEASE'
+		log4jVersion = '2.11.2'
+		micrometerVersion = '1.1.3'
+		mockitoVersion = '2.24.0'
+		mysqlVersion = '8.0.15'
 		pahoMqttClientVersion = '1.2.0'
 		postgresVersion = '42.2.5'
-		reactorNettyVersion = '0.8.4.RELEASE'
-		reactorVersion = '3.2.5.RELEASE'
+		reactorNettyVersion = '0.8.5.RELEASE'
+		reactorVersion = '3.2.6.RELEASE'
 		romeToolsVersion = '1.9.0'
 		servletApiVersion = '4.0.0'
 		smackVersion = '4.3.1'
-		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.1.3.RELEASE'
-		springDataJpaVersion = '2.1.3.RELEASE'
-		springDataMongoVersion = '2.1.3.RELEASE'
-		springDataRedisVersion = '2.1.3.RELEASE'
-		springGemfireVersion = '2.1.3.RELEASE'
+		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.1.4.RELEASE'
+		springDataJpaVersion = '2.1.4.RELEASE'
+		springDataMongoVersion = '2.1.4.RELEASE'
+		springDataRedisVersion = '2.1.4.RELEASE'
+		springGemfireVersion = '2.1.4.RELEASE'
 		springSecurityVersion = '5.1.3.RELEASE'
-		springRetryVersion = '1.2.3.RELEASE'
-		springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.1.4.RELEASE'
+		springRetryVersion = '1.2.4.RELEASE'
+		springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.1.5.RELEASE'
 		springWsVersion = '3.0.6.RELEASE'
-		tomcatVersion = "9.0.12"
+		tomcatVersion = "9.0.16"
 		xstreamVersion = '1.4.11.1'
 	}
 
@@ -182,8 +182,8 @@ subprojects { subproject ->
 
 		testCompile("com.willowtreeapps.assertk:assertk-jvm:$assertkVersion")
 
-		testCompile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
-		testRuntime "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
+		testCompile "org.jetbrains.kotlin:kotlin-reflect"
+		testCompile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 
 	}
 

spring-integration-core/src/test/kotlin/org/springframework/integration/dsl/routers/RouterDslTests.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 package org.springframework.integration.dsl.routers
 
-import assertk.assert
+import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isInstanceOf
 import assertk.assertions.isNotNull
@@ -62,11 +62,10 @@ class RouterDslTests {
 
 		val payload = receive?.payload
 
-		assert(payload).isNotNull {
-			it.isInstanceOf(List::class.java)
-		}
-
-		assert(payload).isEqualTo(listOf(3, 4, 9, 8, 15, 12))
+		assertThat(payload)
+				.isNotNull()
+				.isInstanceOf(List::class.java)
+				.isEqualTo(listOf(3, 4, 9, 8, 15, 12))
 	}
 
 
@@ -88,10 +87,10 @@ class RouterDslTests {
 
 		val payload = receive?.payload
 
-		assert(payload).isNotNull {
-			it.isInstanceOf(List::class.java)
-			it.isEqualTo(listOf("even", "odd", "even"))
-		}
+		assertThat(payload)
+				.isNotNull()
+				.isInstanceOf(List::class.java)
+				.isEqualTo(listOf("even", "odd", "even"))
 	}
 
 	@Configuration

spring-integration-core/src/test/kotlin/org/springframework/integration/function/FunctionsTests.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
 
 package org.springframework.integration.function
 
-import assertk.assert
+import assertk.all
+import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isNotNull
 import assertk.assertions.isTrue
@@ -85,20 +86,20 @@ class FunctionsTests {
 
 		val payload = receive?.payload
 
-		assertk.assert(payload).isNotNull {
-			it.isEqualTo("FOO")
-		}
+		assertThat(payload)
+				.isNotNull()
+				.isEqualTo("FOO")
 	}
 
 	@Test
 	fun `invoke consumer via service activator`() {
 		this.messageConsumerServiceChannel.send(GenericMessage("bar"))
 
-		assert(this.messageCollector).size().isEqualTo(1)
+		assertThat(this.messageCollector).size().isEqualTo(1)
 
 		val message = this.messageCollector[0]
 
-		assert(message.payload).isEqualTo("bar")
+		assertThat(message.payload).isEqualTo("bar")
 	}
 
 	@Test
@@ -107,7 +108,7 @@ class FunctionsTests {
 		this.counterChannel.subscribe { countDownLatch.countDown() }
 		this.kotlinSupplierInboundChannelAdapter.start()
 
-		assert(countDownLatch.await(10, TimeUnit.SECONDS)).isTrue()
+		assertThat(countDownLatch.await(10, TimeUnit.SECONDS)).isTrue()
 	}
 
 	@Configuration

spring-integration-jms/src/test/kotlin/org/springframework/integration/jms/dsl/JmsDslKotlinTests.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
 
 package org.springframework.integration.jms.dsl
 
-import assertk.assert
+import assertk.all
+import assertk.assertThat
 import assertk.assertions.contains
 import assertk.assertions.isEqualTo
 import assertk.assertions.isGreaterThan
@@ -71,17 +72,17 @@ class JmsDslKotlinTests {
 
 		val payload = receive?.payload
 
-		assert(payload).isNotNull {
-			it.isEqualTo("foo")
-		}
+		assertThat(payload).isNotNull().isEqualTo("foo")
 
-		assert(receive?.headers).isNotNull {
-			it.contains(IntegrationMessageHeaderAccessor.PRIORITY, 9)
-			it.contains(JmsHeaders.DELIVERY_MODE, 1)
-		}
+		assertThat(receive?.headers)
+				.isNotNull()
+				.all {
+					contains(IntegrationMessageHeaderAccessor.PRIORITY, 9)
+					contains(JmsHeaders.DELIVERY_MODE, 1)
+				}
 
 		val expiration = receive!!.headers[JmsHeaders.EXPIRATION] as Long
-		assert(expiration).isGreaterThan(System.currentTimeMillis())
+		assertThat(expiration).isGreaterThan(System.currentTimeMillis())
 	}
 
 	@Configuration