Upgrade to the latest deps

* Fix `CamelMessageHandlerTests` for a new Apache Camel API
spring-projects · Jul 17, 2023 · 790b8f9 · 790b8f9
1 parent 1526661
commit 790b8f9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 26 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlinVersion = '1.8.20'
+    ext.kotlinVersion = '1.9.0'
     ext.isCI = System.getenv('GITHUB_ACTION') || System.getenv('bamboo_buildKey')
     repositories {
         gradlePluginPortal()
@@ -15,12 +15,12 @@ buildscript {
 }
 
 plugins {
-    id 'org.sonarqube' version '4.2.1.3168'
+    id 'org.sonarqube' version '4.3.0.3225'
     id 'io.spring.nohttp' version '0.0.11' apply false
     id 'org.ajoberstar.grgit' version '4.1.1'
-    id 'io.spring.dependency-management' version '1.1.1'
-    id 'com.jfrog.artifactory' version '4.32.0' apply false
-    id 'org.jetbrains.dokka' version "$kotlinVersion"
+    id 'io.spring.dependency-management' version '1.1.2'
+    id 'com.jfrog.artifactory' version '4.33.1' apply false
+    id 'org.jetbrains.dokka' version "1.8.20"
     id 'org.asciidoctor.jvm.pdf' version '3.3.2'
     id 'org.asciidoctor.jvm.convert' version '3.3.2'
 }
@@ -52,9 +52,9 @@ ext {
     aspectjVersion = '1.9.19'
     assertjVersion = '3.24.2'
     assertkVersion = '0.26.1'
-    avroVersion = '1.11.1'
+    avroVersion = '1.11.2'
     awaitilityVersion = '4.2.0'
-    camelVersion = '3.20.6'
+    camelVersion = '4.0.0-RC1'
     commonsDbcp2Version = '2.9.0'
     commonsIoVersion = '2.13.0'
     commonsNetVersion = '3.9.0'
@@ -65,53 +65,53 @@ ext {
     ftpServerVersion = '1.2.0'
     graalvmVersion = '23.0.0'
     greenmailVersion = '2.1.0-alpha-1'
-    groovyVersion = '4.0.12'
+    groovyVersion = '4.0.13'
     hamcrestVersion = '2.2'
     hazelcastVersion = '5.3.1'
-    hibernateVersion = '6.2.5.Final'
+    hibernateVersion = '6.2.6.Final'
     hsqldbVersion = '2.7.2'
     h2Version = '2.2.220'
     jacksonVersion = '2.15.2'
     jaxbVersion = '4.0.3'
-    jcifsVersion = '2.1.34'
+    jcifsVersion = '2.1.35'
     jeroMqVersion = '0.5.3'
     jmsApiVersion = '3.1.0'
     jpaApiVersion = '3.1.0'
-    jrubyVersion = '9.4.1.0'
+    jrubyVersion = '9.4.3.0'
     jsonpathVersion = '2.8.0'
     junit4Version = '4.13.2'
-    junitJupiterVersion = '5.9.3'
+    junitJupiterVersion = '5.10.0-RC1'
     jythonVersion = '2.7.3'
-    kotlinCoroutinesVersion = '1.7.1'
+    kotlinCoroutinesVersion = '1.7.2'
     kryoVersion = '5.5.0'
     lettuceVersion = '6.2.4.RELEASE'
     log4jVersion = '2.20.0'
     mailVersion = '2.0.2'
     micrometerTracingVersion = '1.2.0-M1'
     micrometerVersion = '1.12.0-M1'
     mockitoVersion = '5.4.0'
-    mongoDriverVersion = '4.9.1'
+    mongoDriverVersion = '4.10.2'
     mysqlVersion = '8.0.33'
     pahoMqttClientVersion = '1.2.5'
     postgresVersion = '42.6.0'
-    protobufVersion = '3.23.3'
+    protobufVersion = '3.24.0-RC1'
     r2dbch2Version = '1.0.0.RELEASE'
     reactorVersion = '2023.0.0-M1'
-    resilience4jVersion = '2.0.2'
+    resilience4jVersion = '2.1.0'
     romeToolsVersion = '2.1.0'
     rsocketVersion = '1.1.4'
     servletApiVersion = '6.0.0'
     smackVersion = '4.4.6'
-    springAmqpVersion = '3.0.5'
-    springDataVersion = '2023.0.1'
+    springAmqpVersion = '3.0.6'
+    springDataVersion = '2023.1.0-M1'
     springGraphqlVersion = '1.2.1'
-    springKafkaVersion = '3.0.8'
+    springKafkaVersion = '3.0.9'
     springRetryVersion = '2.0.2'
     springSecurityVersion = '6.1.1'
-    springVersion = '6.1.0-SNAPSHOT'
+    springVersion = '6.1.0-M2'
     springWsVersion = '4.0.4'
     testcontainersVersion = '1.18.3'
-    tomcatVersion = '10.1.10'
+    tomcatVersion = '10.1.11'
     xmlUnitVersion = '2.9.1'
     xstreamVersion = '1.4.20'
     ztZipVersion = '1.15'
@@ -221,9 +221,7 @@ configure(javaProjects) { subproject ->
     }
 
     compileKotlin {
-        kotlinOptions {
-            languageVersion = '1.7'
-            apiVersion = '1.7'
+        compilerOptions {
             allWarningsAsErrors = true
         }
     }
@@ -364,7 +362,7 @@ configure(javaProjects) { subproject ->
 
     checkstyle {
         configDirectory.set(rootProject.file('src/checkstyle'))
-        toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.12.0'
+        toolVersion = project.hasProperty('checkstyleVersion') ? project.checkstyleVersion : '10.12.1'
     }
 
     jar {

diff --git a/...rc/test/java/org/springframework/integration/camel/outbound/CamelMessageHandlerTests.java b/...rc/test/java/org/springframework/integration/camel/outbound/CamelMessageHandlerTests.java
@@ -75,7 +75,7 @@ void inOutPatternSyncMessageHandlerWithNoRequestHeadersButReplyHeaders() throws
 		QueueChannel replyChannel = new QueueChannel();
 		Message<String> messageUnderTest =
 				MessageBuilder.withPayload("test data")
-						.setHeader("exchangePattern", "InOptionalOut")
+						.setHeader("exchangePattern", "InOut")
 						.setHeader(MessageHeaders.REPLY_CHANNEL, replyChannel)
 						.build();