diff --git a/build.gradle b/build.gradle index 13f2537817..0f7861de79 100644 --- a/build.gradle +++ b/build.gradle @@ -51,25 +51,25 @@ ext { } modifiedFiles.finalizeValueOnRead() - assertjVersion = '3.24.2' + assertjVersion = '3.25.3' awaitilityVersion = '4.2.1' hamcrestVersion = '2.2' hibernateValidationVersion = '8.0.1.Final' - jacksonBomVersion = '2.15.4' - jaywayJsonPathVersion = '2.8.0' + jacksonBomVersion = '2.17.0' + jaywayJsonPathVersion = '2.9.0' junit4Version = '4.13.2' junitJupiterVersion = '5.10.2' kafkaVersion = '3.7.0' - kotlinCoroutinesVersion = '1.7.3' - log4jVersion = '2.22.1' + kotlinCoroutinesVersion = '1.8.0' + log4jVersion = '2.23.0' micrometerDocsVersion = '1.0.2' - micrometerVersion = '1.13.0-SNAPSHOT' - micrometerTracingVersion = '1.3.0-SNAPSHOT' - mockitoVersion = '5.8.0' + micrometerVersion = '1.13.0-M2' + micrometerTracingVersion = '1.3.0-M2' + mockitoVersion = '5.10.0' reactorVersion = '2023.0.4' scalaVersion = '2.13' springBootVersion = '3.2.3' // docs module - springDataVersion = '2024.0.0-SNAPSHOT' + springDataVersion = '2024.0.0-M2' springRetryVersion = '2.0.5' springVersion = '6.1.5' zookeeperVersion = '3.8.4' diff --git a/spring-kafka/src/main/java/org/springframework/kafka/support/JacksonUtils.java b/spring-kafka/src/main/java/org/springframework/kafka/support/JacksonUtils.java index 3121409286..f525166905 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/support/JacksonUtils.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/support/JacksonUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2019-2022 the original author or authors. + * Copyright 2019-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -105,9 +105,8 @@ private static final class JodaModuleProvider { private static final class KotlinModuleProvider { - @SuppressWarnings("deprecation") static final com.fasterxml.jackson.databind.Module MODULE = - new com.fasterxml.jackson.module.kotlin.KotlinModule(); + new com.fasterxml.jackson.module.kotlin.KotlinModule.Builder().build(); } diff --git a/spring-kafka/src/test/java/org/springframework/kafka/retrytopic/RetryTopicClassLevelExceptionRoutingIntegrationTests.java b/spring-kafka/src/test/java/org/springframework/kafka/retrytopic/RetryTopicClassLevelExceptionRoutingIntegrationTests.java index 74a6dd6985..ca89fbe47b 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/retrytopic/RetryTopicClassLevelExceptionRoutingIntegrationTests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/retrytopic/RetryTopicClassLevelExceptionRoutingIntegrationTests.java @@ -275,24 +275,28 @@ static class CountDownLatchContainer { } + @SuppressWarnings("serial") static class ShouldRetryOnlyByTopicException extends RuntimeException { ShouldRetryOnlyByTopicException(String msg) { super(msg); } } + @SuppressWarnings("serial") static class ShouldSkipBothRetriesException extends RuntimeException { ShouldSkipBothRetriesException(String msg) { super(msg); } } + @SuppressWarnings("serial") static class ShouldRetryOnlyBlockingException extends RuntimeException { ShouldRetryOnlyBlockingException(String msg) { super(msg); } } + @SuppressWarnings("serial") static class ShouldRetryViaBothException extends RuntimeException { ShouldRetryViaBothException(String msg) { super(msg); diff --git a/spring-kafka/src/test/java/org/springframework/kafka/support/DefaultKafkaHeaderMapperTests.java b/spring-kafka/src/test/java/org/springframework/kafka/support/DefaultKafkaHeaderMapperTests.java index afa7525d04..adb56002fe 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/support/DefaultKafkaHeaderMapperTests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/support/DefaultKafkaHeaderMapperTests.java @@ -32,6 +32,7 @@ import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.header.internals.RecordHeader; import org.apache.kafka.common.header.internals.RecordHeaders; +import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.Test; import org.springframework.core.log.LogAccessor; @@ -175,7 +176,8 @@ void testMimeTypeInHeaders() { mapper.toHeaders(recordHeaders, receivedHeaders); Object fooHeader = receivedHeaders.get("foo"); assertThat(fooHeader).isInstanceOf(List.class); - assertThat(fooHeader).asList().containsExactly("application/json", "text/plain"); + assertThat(fooHeader).asInstanceOf(InstanceOfAssertFactories.LIST) + .containsExactly("application/json", "text/plain"); } @Test