Skip to content

Commit 790b8f9

Browse files
committed
Upgrade to the latest deps
* Fix `CamelMessageHandlerTests` for a new Apache Camel API
1 parent 1526661 commit 790b8f9

File tree

2 files changed

+24
-26
lines changed

2 files changed

+24
-26
lines changed

build.gradle

+23-25
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlinVersion = '1.8.20'
2+
ext.kotlinVersion = '1.9.0'
33
ext.isCI = System.getenv('GITHUB_ACTION') || System.getenv('bamboo_buildKey')
44
repositories {
55
gradlePluginPortal()
@@ -15,12 +15,12 @@ buildscript {
1515
}
1616

1717
plugins {
18-
id 'org.sonarqube' version '4.2.1.3168'
18+
id 'org.sonarqube' version '4.3.0.3225'
1919
id 'io.spring.nohttp' version '0.0.11' apply false
2020
id 'org.ajoberstar.grgit' version '4.1.1'
21-
id 'io.spring.dependency-management' version '1.1.1'
22-
id 'com.jfrog.artifactory' version '4.32.0' apply false
23-
id 'org.jetbrains.dokka' version "$kotlinVersion"
21+
id 'io.spring.dependency-management' version '1.1.2'
22+
id 'com.jfrog.artifactory' version '4.33.1' apply false
23+
id 'org.jetbrains.dokka' version "1.8.20"
2424
id 'org.asciidoctor.jvm.pdf' version '3.3.2'
2525
id 'org.asciidoctor.jvm.convert' version '3.3.2'
2626
}
@@ -52,9 +52,9 @@ ext {
5252
aspectjVersion = '1.9.19'
5353
assertjVersion = '3.24.2'
5454
assertkVersion = '0.26.1'
55-
avroVersion = '1.11.1'
55+
avroVersion = '1.11.2'
5656
awaitilityVersion = '4.2.0'
57-
camelVersion = '3.20.6'
57+
camelVersion = '4.0.0-RC1'
5858
commonsDbcp2Version = '2.9.0'
5959
commonsIoVersion = '2.13.0'
6060
commonsNetVersion = '3.9.0'
@@ -65,53 +65,53 @@ ext {
6565
ftpServerVersion = '1.2.0'
6666
graalvmVersion = '23.0.0'
6767
greenmailVersion = '2.1.0-alpha-1'
68-
groovyVersion = '4.0.12'
68+
groovyVersion = '4.0.13'
6969
hamcrestVersion = '2.2'
7070
hazelcastVersion = '5.3.1'
71-
hibernateVersion = '6.2.5.Final'
71+
hibernateVersion = '6.2.6.Final'
7272
hsqldbVersion = '2.7.2'
7373
h2Version = '2.2.220'
7474
jacksonVersion = '2.15.2'
7575
jaxbVersion = '4.0.3'
76-
jcifsVersion = '2.1.34'
76+
jcifsVersion = '2.1.35'
7777
jeroMqVersion = '0.5.3'
7878
jmsApiVersion = '3.1.0'
7979
jpaApiVersion = '3.1.0'
80-
jrubyVersion = '9.4.1.0'
80+
jrubyVersion = '9.4.3.0'
8181
jsonpathVersion = '2.8.0'
8282
junit4Version = '4.13.2'
83-
junitJupiterVersion = '5.9.3'
83+
junitJupiterVersion = '5.10.0-RC1'
8484
jythonVersion = '2.7.3'
85-
kotlinCoroutinesVersion = '1.7.1'
85+
kotlinCoroutinesVersion = '1.7.2'
8686
kryoVersion = '5.5.0'
8787
lettuceVersion = '6.2.4.RELEASE'
8888
log4jVersion = '2.20.0'
8989
mailVersion = '2.0.2'
9090
micrometerTracingVersion = '1.2.0-M1'
9191
micrometerVersion = '1.12.0-M1'
9292
mockitoVersion = '5.4.0'
93-
mongoDriverVersion = '4.9.1'
93+
mongoDriverVersion = '4.10.2'
9494
mysqlVersion = '8.0.33'
9595
pahoMqttClientVersion = '1.2.5'
9696
postgresVersion = '42.6.0'
97-
protobufVersion = '3.23.3'
97+
protobufVersion = '3.24.0-RC1'
9898
r2dbch2Version = '1.0.0.RELEASE'
9999
reactorVersion = '2023.0.0-M1'
100-
resilience4jVersion = '2.0.2'
100+
resilience4jVersion = '2.1.0'
101101
romeToolsVersion = '2.1.0'
102102
rsocketVersion = '1.1.4'
103103
servletApiVersion = '6.0.0'
104104
smackVersion = '4.4.6'
105-
springAmqpVersion = '3.0.5'
106-
springDataVersion = '2023.0.1'
105+
springAmqpVersion = '3.0.6'
106+
springDataVersion = '2023.1.0-M1'
107107
springGraphqlVersion = '1.2.1'
108-
springKafkaVersion = '3.0.8'
108+
springKafkaVersion = '3.0.9'
109109
springRetryVersion = '2.0.2'
110110
springSecurityVersion = '6.1.1'
111-
springVersion = '6.1.0-SNAPSHOT'
111+
springVersion = '6.1.0-M2'
112112
springWsVersion = '4.0.4'
113113
testcontainersVersion = '1.18.3'
114-
tomcatVersion = '10.1.10'
114+
tomcatVersion = '10.1.11'
115115
xmlUnitVersion = '2.9.1'
116116
xstreamVersion = '1.4.20'
117117
ztZipVersion = '1.15'
@@ -221,9 +221,7 @@ configure(javaProjects) { subproject ->
221221
}
222222

223223
compileKotlin {
224-
kotlinOptions {
225-
languageVersion = '1.7'
226-
apiVersion = '1.7'
224+
compilerOptions {
227225
allWarningsAsErrors = true
228226
}
229227
}
@@ -364,7 +362,7 @@ configure(javaProjects) { subproject ->
364362

365363
checkstyle {
366364
configDirectory.set(rootProject.file('src/checkstyle'))
367-
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.12.0'
365+
toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.12.1'
368366
}
369367

370368
jar {

spring-integration-camel/src/test/java/org/springframework/integration/camel/outbound/CamelMessageHandlerTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void inOutPatternSyncMessageHandlerWithNoRequestHeadersButReplyHeaders() throws
7575
QueueChannel replyChannel = new QueueChannel();
7676
Message<String> messageUnderTest =
7777
MessageBuilder.withPayload("test data")
78-
.setHeader("exchangePattern", "InOptionalOut")
78+
.setHeader("exchangePattern", "InOut")
7979
.setHeader(MessageHeaders.REPLY_CHANNEL, replyChannel)
8080
.build();
8181

0 commit comments

Comments
 (0)