Skip to content

Commit 50ce728

Browse files
committed
Make Kotlin language as 1.3 for SF compatibility
* Fix Checkstyle violation * Bring back SNAPSHOT versions for Spring deps
1 parent f200927 commit 50ce728

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

build.gradle

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ ext {
9898
smackVersion = '4.3.5'
9999
soapVersion = '1.4.0'
100100
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.3.6'
101-
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2021.0.0-M5'
102-
springKafkaVersion = '2.7.0-RC1'
101+
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2021.0.0-SNAPSHOT'
102+
springKafkaVersion = '2.7.0-SNAPSHOT'
103103
springRetryVersion = '1.3.1'
104-
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.5.0-M3'
105-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.5'
106-
springWsVersion = '3.1.0-M2'
104+
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '5.5.0-SNAPSHOT'
105+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.6-SNAPSHOT'
106+
springWsVersion = '3.1.0-SNAPSHOT'
107107
tomcatVersion = '9.0.44'
108108
xmlUnitVersion = '2.8.2'
109109
xstreamVersion = '1.4.16'
@@ -203,7 +203,10 @@ configure(javaProjects) { subproject ->
203203

204204
compileKotlin {
205205
kotlinOptions {
206+
languageVersion = '1.3'
206207
jvmTarget = '1.8'
208+
freeCompilerArgs = ['-Xjsr305=strict']
209+
allWarningsAsErrors = true
207210
}
208211
}
209212
compileTestKotlin {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,8 @@ public void messageCorrelationBasedOnRequestCorrelationIdTimedOutFirstReply() th
111111
RequestReplyExchanger gateway = context.getBean(RequestReplyExchanger.class);
112112
ConnectionFactory connectionFactory = context.getBean(ConnectionFactory.class);
113113

114-
final Destination requestDestination = context.getBean("siOutQueue", Destination.class);
114+
Destination requestDestination = context.getBean("siOutQueue", Destination.class);
115115

116-
;
117116
dmlc.setConnectionFactory(connectionFactory);
118117
dmlc.setDestination(requestDestination);
119118
dmlc.setMessageListener((SessionAwareMessageListener<Message>) (message, session) -> {

0 commit comments

Comments
 (0)