Skip to content

Commit 7d5874d

Browse files
committed
Upgrade to Spring Framework 7.0.0-SNAPSHOT and update dependencies
* Upgrade Spring Framework to 7.0.0-SNAPSHOT * Upgrade Spring Data to 2025.1.0-SNAPSHOT * Upgrade Micrometer to 1.15.0-SNAPSHOT and Micrometer Tracing to 1.5.0-SNAPSHOT Other dependency updates: * Kotlin 1.9.25 -> 2.1.10 * Kotlin Coroutines 1.8.1 -> 1.10.1 * AssertJ 3.25.3 -> 3.27.3 * SpotBugs 6.0.28 -> 6.1.2 * Freefair JavaDoc 8.10.2 -> 8.11 * Mockito 5.14.2 -> 5.15.2 * Checkstyle 10.18.2 -> 10.21.1 * Add Jakarta EE 11 API docs link * Remove unnecessary nullability in Kotlin request-reply example
1 parent 0175446 commit 7d5874d

File tree

2 files changed

+22
-21
lines changed

2 files changed

+22
-21
lines changed

build.gradle

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlinVersion = '1.9.25'
2+
ext.kotlinVersion = '2.1.10'
33
ext.isCI = System.getenv('GITHUB_ACTION')
44
repositories {
55
gradlePluginPortal()
@@ -20,8 +20,8 @@ plugins {
2020
id 'org.ajoberstar.grgit' version '5.3.0'
2121
id 'io.spring.nohttp' version '0.0.11'
2222
id 'io.spring.dependency-management' version '1.1.7' apply false
23-
id 'com.github.spotbugs' version '6.0.28'
24-
id 'io.freefair.aggregate-javadoc' version '8.10.2'
23+
id 'com.github.spotbugs' version '6.1.2'
24+
id 'io.freefair.aggregate-javadoc' version '8.11'
2525
}
2626

2727
apply plugin: 'io.spring.nohttp'
@@ -38,6 +38,7 @@ ext {
3838

3939
javadocLinks = [
4040
'https://docs.oracle.com/en/java/javase/17/docs/api/',
41+
'https://jakarta.ee/specifications/platform/11/apidocs/',
4142
'https://docs.spring.io/spring-framework/docs/current/javadoc-api/'
4243
] as String[]
4344

@@ -50,7 +51,7 @@ ext {
5051
}
5152
modifiedFiles.finalizeValueOnRead()
5253

53-
assertjVersion = '3.25.3'
54+
assertjVersion = '3.27.3'
5455
awaitilityVersion = '4.2.2'
5556
hamcrestVersion = '3.0'
5657
hibernateValidationVersion = '8.0.2.Final'
@@ -59,18 +60,18 @@ ext {
5960
junit4Version = '4.13.2'
6061
junitJupiterVersion = '5.11.4'
6162
kafkaVersion = '3.8.1'
62-
kotlinCoroutinesVersion = '1.8.1'
63+
kotlinCoroutinesVersion = '1.10.1'
6364
log4jVersion = '2.24.3'
6465
micrometerDocsVersion = '1.0.4'
65-
micrometerVersion = '1.14.3'
66-
micrometerTracingVersion = '1.4.2'
67-
mockitoVersion = '5.14.2'
66+
micrometerVersion = '1.15.0-SNAPSHOT'
67+
micrometerTracingVersion = '1.5.0-SNAPSHOT'
68+
mockitoVersion = '5.15.2'
6869
reactorVersion = '2024.0.2'
6970
scalaVersion = '2.13'
7071
springBootVersion = '3.3.8' // docs module
71-
springDataVersion = '2024.1.2'
72+
springDataVersion = '2025.1.0-SNAPSHOT'
7273
springRetryVersion = '2.0.11'
73-
springVersion = '6.2.2'
74+
springVersion = '7.0.0-SNAPSHOT'
7475
zookeeperVersion = '3.8.4'
7576

7677
idPrefix = 'kafka'
@@ -191,7 +192,7 @@ configure(javaProjects) { subproject ->
191192

192193
checkstyle {
193194
configDirectory.set(rootProject.file('src/checkstyle'))
194-
toolVersion = '10.18.2'
195+
toolVersion = '10.21.1'
195196
}
196197

197198
publishing {

spring-kafka-docs/src/main/kotlin/org/springframework/kafka/kdocs/requestreply/Application.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2024 the original author or authors.
2+
* Copyright 2021-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -84,19 +84,19 @@ class Application {
8484
fun runner(template: ReplyingKafkaTemplate<String?, String?, String?>): ApplicationRunner {
8585
return ApplicationRunner { _ ->
8686
// tag::sendReceive[]
87-
val future1: RequestReplyTypedMessageFuture<String?, String?, Thing?>? =
87+
val future1: RequestReplyTypedMessageFuture<String?, String?, Thing> =
8888
template.sendAndReceive(MessageBuilder.withPayload("getAThing").build(),
89-
object : ParameterizedTypeReference<Thing?>() {})
90-
log.info(future1?.sendFuture?.get(10, TimeUnit.SECONDS)?.recordMetadata?.toString())
91-
val thing = future1?.get(10, TimeUnit.SECONDS)?.payload
89+
object : ParameterizedTypeReference<Thing>() {})
90+
log.info(future1.sendFuture.get(10, TimeUnit.SECONDS).recordMetadata.toString())
91+
val thing = future1.get(10, TimeUnit.SECONDS).payload
9292
log.info(thing.toString())
9393

94-
val future2: RequestReplyTypedMessageFuture<String?, String?, List<Thing?>?>? =
94+
val future2: RequestReplyTypedMessageFuture<String?, String?, List<Thing>> =
9595
template.sendAndReceive(MessageBuilder.withPayload("getThings").build(),
96-
object : ParameterizedTypeReference<List<Thing?>?>() {})
97-
log.info(future2?.sendFuture?.get(10, TimeUnit.SECONDS)?.recordMetadata.toString())
98-
val things = future2?.get(10, TimeUnit.SECONDS)?.payload
99-
things?.forEach(Consumer { thing1: Thing? -> log.info(thing1.toString()) })
96+
object : ParameterizedTypeReference<List<Thing>>() {})
97+
log.info(future2.sendFuture.get(10, TimeUnit.SECONDS).recordMetadata.toString())
98+
val things = future2.get(10, TimeUnit.SECONDS).payload
99+
things.forEach { thing1 -> log.info(thing1.toString()) }
100100
// end::sendReceive[]
101101
}
102102
}

0 commit comments

Comments
 (0)