From 0951738ab3ed62de7194d86feef2a0ededc3edfb Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 18 Oct 2022 12:30:44 -0400 Subject: [PATCH] Upgrade dependencies to be ready for release * Revert `getMethodValue()` for `CookieTests` since it is removed in the SF SNAPSHOT * Add `@Suppress("UNCHECKED_CAST")` to `FunctionsTests.kt` to suppress compilation warning --- build.gradle | 47 ++++++++++--------- gradle/docs.gradle | 2 +- .../integration/function/FunctionsTests.kt | 1 + .../http/outbound/CookieTests.java | 6 +++ 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index 530872dfe8..61f004d9fa 100644 --- a/build.gradle +++ b/build.gradle @@ -19,9 +19,9 @@ plugins { id 'org.sonarqube' version '2.8' id 'io.spring.nohttp' version '0.0.10' apply false id 'org.ajoberstar.grgit' version '4.1.1' - id 'io.spring.dependency-management' version '1.0.13.RELEASE' - id 'com.jfrog.artifactory' version '4.29.0' apply false - id 'org.jetbrains.dokka' version '1.7.10' + id 'io.spring.dependency-management' version '1.1.0' + id 'com.jfrog.artifactory' version '4.29.1' apply false + id 'org.jetbrains.dokka' version "$kotlinVersion" id 'org.asciidoctor.jvm.pdf' version '3.3.2' id 'org.asciidoctor.jvm.gems' version '3.3.2' id 'org.asciidoctor.jvm.convert' version '3.3.2' @@ -51,29 +51,29 @@ ext { files(grgit.status().unstaged.modified).filter { f -> f.name.endsWith('.java') || f.name.endsWith('.kt') } apacheSshdVersion = '2.9.1' - artemisVersion = '2.25.0' + artemisVersion = '2.26.0' aspectjVersion = '1.9.9.1' assertjVersion = '3.23.1' assertkVersion = '0.25' avroVersion = '1.11.1' awaitilityVersion = '4.2.0' - camelVersion = '3.18.2' + camelVersion = '3.19.0' commonsDbcp2Version = '2.9.0' commonsIoVersion = '2.11.0' commonsNetVersion = '3.8.0' curatorVersion = '5.3.0' - derbyVersion = '10.14.2.0' + derbyVersion = '10.16.1.1' findbugsVersion = '3.0.1' ftpServerVersion = '1.2.0' graalvmVersion = '22.2.0' greenmailVersion = '2.0.0-alpha-2' - groovyVersion = '4.0.5' + groovyVersion = '4.0.6' hamcrestVersion = '2.2' - hazelcastVersion = '5.1.3' - hibernateVersion = '6.1.3.Final' + hazelcastVersion = '5.1.4' + hibernateVersion = '6.1.4.Final' hsqldbVersion = '2.7.0' h2Version = '2.1.214' - jacksonVersion = '2.13.4' + jacksonVersion = '2.14.0-rc2' jaxbVersion = '3.0.2' jcifsVersion = '2.1.32' jeroMqVersion = '0.5.2' @@ -82,34 +82,34 @@ ext { jrubyVersion = '9.3.8.0' jsonpathVersion = '2.7.0' junit4Version = '4.13.2' - junitJupiterVersion = '5.9.0' + junitJupiterVersion = '5.9.1' jythonVersion = '2.7.3' kotlinCoroutinesVersion = '1.6.4' kryoVersion = '5.3.0' - lettuceVersion = '6.2.0.RELEASE' + lettuceVersion = '6.2.1.RELEASE' log4jVersion = '2.19.0' mailVersion = '2.0.1' - micrometerVersion = '1.10.0-SNAPSHOT' - micrometerTracingVersion = '1.0.0-SNAPSHOT' + micrometerVersion = '1.10.0-RC1' + micrometerTracingVersion = '1.0.0-RC1' mockitoVersion = '4.8.0' - mongoDriverVersion = '4.7.1' + mongoDriverVersion = '4.7.2' mysqlVersion = '8.0.30' pahoMqttClientVersion = '1.2.5' postgresVersion = '42.5.0' r2dbch2Version = '1.0.0.RC1' - reactorVersion = '2022.0.0-SNAPSHOT' + reactorVersion = '2022.0.0-RC1' resilience4jVersion = '1.7.1' romeToolsVersion = '1.18.0' rsocketVersion = '1.1.3' servletApiVersion = '5.0.0' smackVersion = '4.4.6' - springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT' - springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT' - springGraphqlVersion = '1.1.0-SNAPSHOT' - springKafkaVersion = '3.0.0-SNAPSHOT' - springRetryVersion = '2.0.0-SNAPSHOT' - springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-SNAPSHOT' - springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT' + springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-RC1' + springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-RC1' + springGraphqlVersion = '1.1.0-RC1' + springKafkaVersion = '3.0.0-RC1' + springRetryVersion = '2.0.0-RC2' + springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-RC1' + springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-RC1' springWsVersion = '4.0.0-SNAPSHOT' testcontainersVersion = '1.17.5' tomcatVersion = '10.0.23' @@ -715,6 +715,7 @@ project('spring-integration-jdbc') { testImplementation "com.h2database:h2:$h2Version" testImplementation "org.hsqldb:hsqldb:$hsqldbVersion" testImplementation "org.apache.derby:derby:$derbyVersion" + testImplementation "org.apache.derby:derbytools:$derbyVersion" testImplementation "org.apache.derby:derbyclient:$derbyVersion" testImplementation "org.postgresql:postgresql:$postgresVersion" testImplementation "mysql:mysql-connector-java:$mysqlVersion" diff --git a/gradle/docs.gradle b/gradle/docs.gradle index 46acd87715..10f94476e6 100644 --- a/gradle/docs.gradle +++ b/gradle/docs.gradle @@ -1,6 +1,6 @@ ext { backendVersion = '0.0.3' - micrometerDocsVersion='1.0.0-SNAPSHOT' + micrometerDocsVersion='1.0.0-RC1' } configurations { diff --git a/spring-integration-core/src/test/kotlin/org/springframework/integration/function/FunctionsTests.kt b/spring-integration-core/src/test/kotlin/org/springframework/integration/function/FunctionsTests.kt index 46b98f1b46..880e94ed0c 100644 --- a/spring-integration-core/src/test/kotlin/org/springframework/integration/function/FunctionsTests.kt +++ b/spring-integration-core/src/test/kotlin/org/springframework/integration/function/FunctionsTests.kt @@ -213,6 +213,7 @@ class FunctionsTests { .isInstanceOf(Flow::class) runBlocking { + @Suppress("UNCHECKED_CAST") val strings = (payload as Flow).toList() assertThat(strings).containsExactly("Sync $testPayload #1", "Sync $testPayload #2", "Sync $testPayload #3") } diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests.java index 1fe6dba5da..bd0e3c29b2 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests.java @@ -111,6 +111,12 @@ public class CookieTests { return null; } + @Override + @Deprecated + public String getMethodValue() { + return null; + } + public ClientHttpResponse execute() { allHeaders.add(headers); return new ClientHttpResponse() {