Skip to content

Commit 61a7fde

Browse files
committed
Upgrade dependencies; prepare for release
This includes moving to JUnit 6, with respective Nullability fix in the `LogLevelsCondition`
1 parent e7ab2e8 commit 61a7fde

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

build.gradle

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,20 @@ ext {
4242
jacksonBomVersion = '2.20.0'
4343
jackson3Version = '3.0.0-rc9'
4444
jaywayJsonPathVersion = '2.9.0'
45-
junitJupiterVersion = '5.13.4'
45+
junitJupiterVersion = '6.0.0-RC2'
4646
kotlinCoroutinesVersion = '1.10.2'
4747
log4jVersion = '2.25.1'
4848
logbackVersion = '1.5.18'
4949
micrometerDocsVersion = '1.0.4'
50-
micrometerVersion = '1.16.0-SNAPSHOT'
51-
micrometerTracingVersion = '1.6.0-M2'
50+
micrometerVersion = '1.16.0-M3'
51+
micrometerTracingVersion = '1.6.0-M3'
5252
mockitoVersion = '5.19.0'
5353
rabbitmqAmqpClientVersion = '0.7.0'
5454
rabbitmqStreamVersion = '1.2.0'
5555
rabbitmqVersion = '5.26.0'
56-
reactorVersion = '2025.0.0-M6'
57-
springDataVersion = '2025.1.0-SNAPSHOT'
58-
springVersion = '7.0.0-SNAPSHOT'
56+
reactorVersion = '2025.0.0-M7'
57+
springDataVersion = '2025.1.0-M6'
58+
springVersion = '7.0.0-M9'
5959
testcontainersVersion = '1.21.3'
6060

6161
javaProjects = subprojects - project(':spring-amqp-bom')
@@ -266,7 +266,7 @@ configure(javaProjects) { subproject ->
266266

267267
checkstyle {
268268
configDirectory.set(rootProject.file('src/checkstyle'))
269-
toolVersion = '10.25.0'
269+
toolVersion = '11.0.1'
270270
}
271271

272272
jar {
@@ -465,7 +465,6 @@ project('spring-rabbit-junit') {
465465
optionalApi 'org.testcontainers:junit-jupiter'
466466
optionalApi "ch.qos.logback:logback-classic:$logbackVersion"
467467
optionalApi 'org.apache.logging.log4j:log4j-core'
468-
compileOnly 'org.apiguardian:apiguardian-api:1.0.0'
469468
}
470469
}
471470

spring-rabbit-junit/src/main/java/org/springframework/amqp/rabbit/junit/LogLevelsCondition.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,9 @@ public void afterAll(ExtensionContext context) {
127127
LogLevels logLevels = store.remove(STORE_ANNOTATION_KEY, LogLevels.class);
128128
if (logLevels != null) {
129129
LevelsContainer container = store.get(STORE_CONTAINER_KEY, LevelsContainer.class);
130-
JUnitUtils.revertLevels(context.getDisplayName(), container);
130+
if (container != null) {
131+
JUnitUtils.revertLevels(context.getDisplayName(), container);
132+
}
131133
store.remove(STORE_CONTAINER_KEY);
132134
}
133135
this.loggedMethods.clear();

0 commit comments

Comments
 (0)