Skip to content

Commit 085faec

Browse files
committed
Update versions for 3.2.0-M2 release
1 parent 179987e commit 085faec

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,25 @@ ext {
5151
}
5252
modifiedFiles.finalizeValueOnRead()
5353

54-
assertjVersion = '3.24.2'
54+
assertjVersion = '3.25.3'
5555
awaitilityVersion = '4.2.1'
5656
hamcrestVersion = '2.2'
5757
hibernateValidationVersion = '8.0.1.Final'
58-
jacksonBomVersion = '2.15.4'
59-
jaywayJsonPathVersion = '2.8.0'
58+
jacksonBomVersion = '2.17.0'
59+
jaywayJsonPathVersion = '2.9.0'
6060
junit4Version = '4.13.2'
6161
junitJupiterVersion = '5.10.2'
6262
kafkaVersion = '3.7.0'
63-
kotlinCoroutinesVersion = '1.7.3'
64-
log4jVersion = '2.22.1'
63+
kotlinCoroutinesVersion = '1.8.0'
64+
log4jVersion = '2.23.0'
6565
micrometerDocsVersion = '1.0.2'
66-
micrometerVersion = '1.13.0-SNAPSHOT'
67-
micrometerTracingVersion = '1.3.0-SNAPSHOT'
68-
mockitoVersion = '5.8.0'
66+
micrometerVersion = '1.13.0-M2'
67+
micrometerTracingVersion = '1.3.0-M2'
68+
mockitoVersion = '5.10.0'
6969
reactorVersion = '2023.0.4'
7070
scalaVersion = '2.13'
7171
springBootVersion = '3.2.3' // docs module
72-
springDataVersion = '2024.0.0-SNAPSHOT'
72+
springDataVersion = '2024.0.0-M2'
7373
springRetryVersion = '2.0.5'
7474
springVersion = '6.1.5'
7575
zookeeperVersion = '3.8.4'

spring-kafka/src/main/java/org/springframework/kafka/support/JacksonUtils.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2022 the original author or authors.
2+
* Copyright 2019-2024 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.
@@ -105,9 +105,8 @@ private static final class JodaModuleProvider {
105105

106106
private static final class KotlinModuleProvider {
107107

108-
@SuppressWarnings("deprecation")
109108
static final com.fasterxml.jackson.databind.Module MODULE =
110-
new com.fasterxml.jackson.module.kotlin.KotlinModule();
109+
new com.fasterxml.jackson.module.kotlin.KotlinModule.Builder().build();
111110

112111
}
113112

spring-kafka/src/test/java/org/springframework/kafka/retrytopic/RetryTopicClassLevelExceptionRoutingIntegrationTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,24 +275,28 @@ static class CountDownLatchContainer {
275275

276276
}
277277

278+
@SuppressWarnings("serial")
278279
static class ShouldRetryOnlyByTopicException extends RuntimeException {
279280
ShouldRetryOnlyByTopicException(String msg) {
280281
super(msg);
281282
}
282283
}
283284

285+
@SuppressWarnings("serial")
284286
static class ShouldSkipBothRetriesException extends RuntimeException {
285287
ShouldSkipBothRetriesException(String msg) {
286288
super(msg);
287289
}
288290
}
289291

292+
@SuppressWarnings("serial")
290293
static class ShouldRetryOnlyBlockingException extends RuntimeException {
291294
ShouldRetryOnlyBlockingException(String msg) {
292295
super(msg);
293296
}
294297
}
295298

299+
@SuppressWarnings("serial")
296300
static class ShouldRetryViaBothException extends RuntimeException {
297301
ShouldRetryViaBothException(String msg) {
298302
super(msg);

spring-kafka/src/test/java/org/springframework/kafka/support/DefaultKafkaHeaderMapperTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.apache.kafka.common.header.Headers;
3333
import org.apache.kafka.common.header.internals.RecordHeader;
3434
import org.apache.kafka.common.header.internals.RecordHeaders;
35+
import org.assertj.core.api.InstanceOfAssertFactories;
3536
import org.junit.jupiter.api.Test;
3637

3738
import org.springframework.core.log.LogAccessor;
@@ -175,7 +176,8 @@ void testMimeTypeInHeaders() {
175176
mapper.toHeaders(recordHeaders, receivedHeaders);
176177
Object fooHeader = receivedHeaders.get("foo");
177178
assertThat(fooHeader).isInstanceOf(List.class);
178-
assertThat(fooHeader).asList().containsExactly("application/json", "text/plain");
179+
assertThat(fooHeader).asInstanceOf(InstanceOfAssertFactories.LIST)
180+
.containsExactly("application/json", "text/plain");
179181
}
180182

181183
@Test

0 commit comments

Comments
 (0)