Skip to content

Commit 0951738

Browse files
committed
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
1 parent 64f0e73 commit 0951738

File tree

4 files changed

+32
-24
lines changed

4 files changed

+32
-24
lines changed

build.gradle

+24-23
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ plugins {
1919
id 'org.sonarqube' version '2.8'
2020
id 'io.spring.nohttp' version '0.0.10' apply false
2121
id 'org.ajoberstar.grgit' version '4.1.1'
22-
id 'io.spring.dependency-management' version '1.0.13.RELEASE'
23-
id 'com.jfrog.artifactory' version '4.29.0' apply false
24-
id 'org.jetbrains.dokka' version '1.7.10'
22+
id 'io.spring.dependency-management' version '1.1.0'
23+
id 'com.jfrog.artifactory' version '4.29.1' apply false
24+
id 'org.jetbrains.dokka' version "$kotlinVersion"
2525
id 'org.asciidoctor.jvm.pdf' version '3.3.2'
2626
id 'org.asciidoctor.jvm.gems' version '3.3.2'
2727
id 'org.asciidoctor.jvm.convert' version '3.3.2'
@@ -51,29 +51,29 @@ ext {
5151
files(grgit.status().unstaged.modified).filter { f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
5252

5353
apacheSshdVersion = '2.9.1'
54-
artemisVersion = '2.25.0'
54+
artemisVersion = '2.26.0'
5555
aspectjVersion = '1.9.9.1'
5656
assertjVersion = '3.23.1'
5757
assertkVersion = '0.25'
5858
avroVersion = '1.11.1'
5959
awaitilityVersion = '4.2.0'
60-
camelVersion = '3.18.2'
60+
camelVersion = '3.19.0'
6161
commonsDbcp2Version = '2.9.0'
6262
commonsIoVersion = '2.11.0'
6363
commonsNetVersion = '3.8.0'
6464
curatorVersion = '5.3.0'
65-
derbyVersion = '10.14.2.0'
65+
derbyVersion = '10.16.1.1'
6666
findbugsVersion = '3.0.1'
6767
ftpServerVersion = '1.2.0'
6868
graalvmVersion = '22.2.0'
6969
greenmailVersion = '2.0.0-alpha-2'
70-
groovyVersion = '4.0.5'
70+
groovyVersion = '4.0.6'
7171
hamcrestVersion = '2.2'
72-
hazelcastVersion = '5.1.3'
73-
hibernateVersion = '6.1.3.Final'
72+
hazelcastVersion = '5.1.4'
73+
hibernateVersion = '6.1.4.Final'
7474
hsqldbVersion = '2.7.0'
7575
h2Version = '2.1.214'
76-
jacksonVersion = '2.13.4'
76+
jacksonVersion = '2.14.0-rc2'
7777
jaxbVersion = '3.0.2'
7878
jcifsVersion = '2.1.32'
7979
jeroMqVersion = '0.5.2'
@@ -82,34 +82,34 @@ ext {
8282
jrubyVersion = '9.3.8.0'
8383
jsonpathVersion = '2.7.0'
8484
junit4Version = '4.13.2'
85-
junitJupiterVersion = '5.9.0'
85+
junitJupiterVersion = '5.9.1'
8686
jythonVersion = '2.7.3'
8787
kotlinCoroutinesVersion = '1.6.4'
8888
kryoVersion = '5.3.0'
89-
lettuceVersion = '6.2.0.RELEASE'
89+
lettuceVersion = '6.2.1.RELEASE'
9090
log4jVersion = '2.19.0'
9191
mailVersion = '2.0.1'
92-
micrometerVersion = '1.10.0-SNAPSHOT'
93-
micrometerTracingVersion = '1.0.0-SNAPSHOT'
92+
micrometerVersion = '1.10.0-RC1'
93+
micrometerTracingVersion = '1.0.0-RC1'
9494
mockitoVersion = '4.8.0'
95-
mongoDriverVersion = '4.7.1'
95+
mongoDriverVersion = '4.7.2'
9696
mysqlVersion = '8.0.30'
9797
pahoMqttClientVersion = '1.2.5'
9898
postgresVersion = '42.5.0'
9999
r2dbch2Version = '1.0.0.RC1'
100-
reactorVersion = '2022.0.0-SNAPSHOT'
100+
reactorVersion = '2022.0.0-RC1'
101101
resilience4jVersion = '1.7.1'
102102
romeToolsVersion = '1.18.0'
103103
rsocketVersion = '1.1.3'
104104
servletApiVersion = '5.0.0'
105105
smackVersion = '4.4.6'
106-
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT'
107-
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT'
108-
springGraphqlVersion = '1.1.0-SNAPSHOT'
109-
springKafkaVersion = '3.0.0-SNAPSHOT'
110-
springRetryVersion = '2.0.0-SNAPSHOT'
111-
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-SNAPSHOT'
112-
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
106+
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-RC1'
107+
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-RC1'
108+
springGraphqlVersion = '1.1.0-RC1'
109+
springKafkaVersion = '3.0.0-RC1'
110+
springRetryVersion = '2.0.0-RC2'
111+
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-RC1'
112+
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-RC1'
113113
springWsVersion = '4.0.0-SNAPSHOT'
114114
testcontainersVersion = '1.17.5'
115115
tomcatVersion = '10.0.23'
@@ -715,6 +715,7 @@ project('spring-integration-jdbc') {
715715
testImplementation "com.h2database:h2:$h2Version"
716716
testImplementation "org.hsqldb:hsqldb:$hsqldbVersion"
717717
testImplementation "org.apache.derby:derby:$derbyVersion"
718+
testImplementation "org.apache.derby:derbytools:$derbyVersion"
718719
testImplementation "org.apache.derby:derbyclient:$derbyVersion"
719720
testImplementation "org.postgresql:postgresql:$postgresVersion"
720721
testImplementation "mysql:mysql-connector-java:$mysqlVersion"

gradle/docs.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ext {
22
backendVersion = '0.0.3'
3-
micrometerDocsVersion='1.0.0-SNAPSHOT'
3+
micrometerDocsVersion='1.0.0-RC1'
44
}
55

66
configurations {

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

+1
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ class FunctionsTests {
213213
.isInstanceOf(Flow::class)
214214

215215
runBlocking {
216+
@Suppress("UNCHECKED_CAST")
216217
val strings = (payload as Flow<String>).toList()
217218
assertThat(strings).containsExactly("Sync $testPayload #1", "Sync $testPayload #2", "Sync $testPayload #3")
218219
}

spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests.java

+6
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,12 @@ public HttpMethod getMethod() {
111111
return null;
112112
}
113113

114+
@Override
115+
@Deprecated
116+
public String getMethodValue() {
117+
return null;
118+
}
119+
114120
public ClientHttpResponse execute() {
115121
allHeaders.add(headers);
116122
return new ClientHttpResponse() {

0 commit comments

Comments
 (0)