Skip to content

Commit 9879c74

Browse files
artembilangaryrussell
artembilan
authored and
garyrussell
committed
Upgrade dependencies, including Kotlin
1 parent daf0015 commit 9879c74

File tree

4 files changed

+57
-56
lines changed

4 files changed

+57
-56
lines changed

‎build.gradle‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlinVersion = '1.2.71'
2+
ext.kotlinVersion = '1.3.21'
33
repositories {
44
maven { url 'https://repo.spring.io/plugins-release' }
55
}
@@ -91,21 +91,21 @@ subprojects { subproject ->
9191
apacheSshdVersion = '2.1.0'
9292
aspectjVersion = '1.9.2'
9393
assertjVersion = '3.11.1'
94-
assertkVersion = '0.12'
94+
assertkVersion = '0.13'
9595
boonVersion = '0.34'
96-
commonsDbcp2Version = '2.2.0'
96+
commonsDbcp2Version = '2.5.0'
9797
commonsIoVersion = '2.6'
9898
commonsNetVersion = '3.6'
9999
curatorVersion = '4.0.1'
100100
derbyVersion = '10.14.2.0'
101101
eclipseLinkVersion = '2.7.3'
102102
ftpServerVersion = '1.1.1'
103103
googleJsr305Version = '3.0.2'
104-
groovyVersion = '2.5.5'
104+
groovyVersion = '2.5.6'
105105
guavaVersion = '26.0-jre'
106106
hamcrestVersion = '1.3'
107-
hazelcastVersion = '3.11'
108-
hibernateVersion = '5.3.7.Final'
107+
hazelcastVersion = '3.11.1'
108+
hibernateVersion = '5.4.1.Final'
109109
hsqldbVersion = '2.4.1'
110110
h2Version = '1.4.197'
111111
jackson2Version = '2.9.8'
@@ -114,36 +114,36 @@ subprojects { subproject ->
114114
jmsApiVersion = '2.0.1'
115115
jpa21ApiVersion = '1.0.0.Final'
116116
jpaApiVersion = '2.2.1'
117-
jrubyVersion = '9.2.4.0'
117+
jrubyVersion = '9.2.6.0'
118118
jschVersion = '0.1.55'
119119
jsonpathVersion = '2.4.0'
120120
junit4Version = '4.12'
121-
junitJupiterVersion = '5.3.2'
122-
junitPlatformVersion = '1.3.2'
121+
junitJupiterVersion = '5.4.0'
122+
junitPlatformVersion = '1.4.0'
123123
jythonVersion = '2.7.0'
124-
kryoShadedVersion = '3.0.3'
125-
lettuceVersion = '5.1.3.RELEASE'
126-
log4jVersion = '2.11.1'
127-
micrometerVersion = '1.1.1'
128-
mockitoVersion = '2.23.4'
129-
mysqlVersion = '8.0.13'
124+
kryoShadedVersion = '4.0.2'
125+
lettuceVersion = '5.1.4.RELEASE'
126+
log4jVersion = '2.11.2'
127+
micrometerVersion = '1.1.3'
128+
mockitoVersion = '2.24.0'
129+
mysqlVersion = '8.0.15'
130130
pahoMqttClientVersion = '1.2.0'
131131
postgresVersion = '42.2.5'
132-
reactorNettyVersion = '0.8.4.RELEASE'
133-
reactorVersion = '3.2.5.RELEASE'
132+
reactorNettyVersion = '0.8.5.RELEASE'
133+
reactorVersion = '3.2.6.RELEASE'
134134
romeToolsVersion = '1.9.0'
135135
servletApiVersion = '4.0.0'
136136
smackVersion = '4.3.1'
137-
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.1.3.RELEASE'
138-
springDataJpaVersion = '2.1.3.RELEASE'
139-
springDataMongoVersion = '2.1.3.RELEASE'
140-
springDataRedisVersion = '2.1.3.RELEASE'
141-
springGemfireVersion = '2.1.3.RELEASE'
137+
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.1.4.RELEASE'
138+
springDataJpaVersion = '2.1.4.RELEASE'
139+
springDataMongoVersion = '2.1.4.RELEASE'
140+
springDataRedisVersion = '2.1.4.RELEASE'
141+
springGemfireVersion = '2.1.4.RELEASE'
142142
springSecurityVersion = '5.1.3.RELEASE'
143-
springRetryVersion = '1.2.3.RELEASE'
144-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.1.4.RELEASE'
143+
springRetryVersion = '1.2.4.RELEASE'
144+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.1.5.RELEASE'
145145
springWsVersion = '3.0.6.RELEASE'
146-
tomcatVersion = "9.0.12"
146+
tomcatVersion = "9.0.16"
147147
xstreamVersion = '1.4.11.1'
148148
}
149149

@@ -182,8 +182,8 @@ subprojects { subproject ->
182182

183183
testCompile("com.willowtreeapps.assertk:assertk-jvm:$assertkVersion")
184184

185-
testCompile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
186-
testRuntime "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
185+
testCompile "org.jetbrains.kotlin:kotlin-reflect"
186+
testCompile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
187187

188188
}
189189

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018 the original author or authors.
2+
* Copyright 2018-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.integration.dsl.routers
1818

19-
import assertk.assert
19+
import assertk.assertThat
2020
import assertk.assertions.isEqualTo
2121
import assertk.assertions.isInstanceOf
2222
import assertk.assertions.isNotNull
@@ -62,11 +62,10 @@ class RouterDslTests {
6262

6363
val payload = receive?.payload
6464

65-
assert(payload).isNotNull {
66-
it.isInstanceOf(List::class.java)
67-
}
68-
69-
assert(payload).isEqualTo(listOf(3, 4, 9, 8, 15, 12))
65+
assertThat(payload)
66+
.isNotNull()
67+
.isInstanceOf(List::class.java)
68+
.isEqualTo(listOf(3, 4, 9, 8, 15, 12))
7069
}
7170

7271

@@ -88,10 +87,10 @@ class RouterDslTests {
8887

8988
val payload = receive?.payload
9089

91-
assert(payload).isNotNull {
92-
it.isInstanceOf(List::class.java)
93-
it.isEqualTo(listOf("even", "odd", "even"))
94-
}
90+
assertThat(payload)
91+
.isNotNull()
92+
.isInstanceOf(List::class.java)
93+
.isEqualTo(listOf("even", "odd", "even"))
9594
}
9695

9796
@Configuration

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018 the original author or authors.
2+
* Copyright 2018-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
1616

1717
package org.springframework.integration.function
1818

19-
import assertk.assert
19+
import assertk.all
20+
import assertk.assertThat
2021
import assertk.assertions.isEqualTo
2122
import assertk.assertions.isNotNull
2223
import assertk.assertions.isTrue
@@ -85,20 +86,20 @@ class FunctionsTests {
8586

8687
val payload = receive?.payload
8788

88-
assertk.assert(payload).isNotNull {
89-
it.isEqualTo("FOO")
90-
}
89+
assertThat(payload)
90+
.isNotNull()
91+
.isEqualTo("FOO")
9192
}
9293

9394
@Test
9495
fun `invoke consumer via service activator`() {
9596
this.messageConsumerServiceChannel.send(GenericMessage("bar"))
9697

97-
assert(this.messageCollector).size().isEqualTo(1)
98+
assertThat(this.messageCollector).size().isEqualTo(1)
9899

99100
val message = this.messageCollector[0]
100101

101-
assert(message.payload).isEqualTo("bar")
102+
assertThat(message.payload).isEqualTo("bar")
102103
}
103104

104105
@Test
@@ -107,7 +108,7 @@ class FunctionsTests {
107108
this.counterChannel.subscribe { countDownLatch.countDown() }
108109
this.kotlinSupplierInboundChannelAdapter.start()
109110

110-
assert(countDownLatch.await(10, TimeUnit.SECONDS)).isTrue()
111+
assertThat(countDownLatch.await(10, TimeUnit.SECONDS)).isTrue()
111112
}
112113

113114
@Configuration

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2018 the original author or authors.
2+
* Copyright 2018-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
1616

1717
package org.springframework.integration.jms.dsl
1818

19-
import assertk.assert
19+
import assertk.all
20+
import assertk.assertThat
2021
import assertk.assertions.contains
2122
import assertk.assertions.isEqualTo
2223
import assertk.assertions.isGreaterThan
@@ -71,17 +72,17 @@ class JmsDslKotlinTests {
7172

7273
val payload = receive?.payload
7374

74-
assert(payload).isNotNull {
75-
it.isEqualTo("foo")
76-
}
75+
assertThat(payload).isNotNull().isEqualTo("foo")
7776

78-
assert(receive?.headers).isNotNull {
79-
it.contains(IntegrationMessageHeaderAccessor.PRIORITY, 9)
80-
it.contains(JmsHeaders.DELIVERY_MODE, 1)
81-
}
77+
assertThat(receive?.headers)
78+
.isNotNull()
79+
.all {
80+
contains(IntegrationMessageHeaderAccessor.PRIORITY, 9)
81+
contains(JmsHeaders.DELIVERY_MODE, 1)
82+
}
8283

8384
val expiration = receive!!.headers[JmsHeaders.EXPIRATION] as Long
84-
assert(expiration).isGreaterThan(System.currentTimeMillis())
85+
assertThat(expiration).isGreaterThan(System.currentTimeMillis())
8586
}
8687

8788
@Configuration

0 commit comments

Comments
 (0)