From 12a6a848290e338612f691331e28b3759c7db3fb Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Sat, 18 Jan 2025 14:01:55 +0100 Subject: [PATCH 1/2] Polishing --- .../AbstractSchedulingTaskExecutorTests.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-context/src/test/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java b/spring-context/src/test/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java index 42dddb5635b..897a0cf8777 100644 --- a/spring-context/src/test/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java +++ b/spring-context/src/test/java/org/springframework/scheduling/concurrent/AbstractSchedulingTaskExecutorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2024 the original author or authors. + * Copyright 2002-2025 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. @@ -125,7 +125,7 @@ abstract class AbstractSchedulingTaskExecutorTests { } @Test - @SuppressWarnings("removal") + @SuppressWarnings({ "removal", "deprecation" }) void submitListenableRunnable() { TestTask task = new TestTask(this.testName, 1); // Act @@ -156,7 +156,7 @@ abstract class AbstractSchedulingTaskExecutorTests { } @Test - @SuppressWarnings("removal") + @SuppressWarnings({ "removal", "deprecation" }) void submitFailingListenableRunnable() { TestTask task = new TestTask(this.testName, 0); org.springframework.util.concurrent.ListenableFuture future = executor.submitListenable(task); @@ -185,7 +185,7 @@ abstract class AbstractSchedulingTaskExecutorTests { } @Test - @SuppressWarnings("removal") + @SuppressWarnings({ "removal", "deprecation" }) void submitListenableRunnableWithGetAfterShutdown() throws Exception { org.springframework.util.concurrent.ListenableFuture future1 = executor.submitListenable(new TestTask(this.testName, -1)); org.springframework.util.concurrent.ListenableFuture future2 = executor.submitListenable(new TestTask(this.testName, -1)); @@ -252,7 +252,7 @@ abstract class AbstractSchedulingTaskExecutorTests { } @Test - @SuppressWarnings("removal") + @SuppressWarnings({ "removal", "deprecation" }) void submitListenableCallable() { TestCallable task = new TestCallable(this.testName, 1); // Act @@ -267,7 +267,7 @@ abstract class AbstractSchedulingTaskExecutorTests { } @Test - @SuppressWarnings("removal") + @SuppressWarnings({ "removal", "deprecation" }) void submitFailingListenableCallable() { TestCallable task = new TestCallable(this.testName, 0); // Act @@ -283,7 +283,7 @@ abstract class AbstractSchedulingTaskExecutorTests { } @Test - @SuppressWarnings("removal") + @SuppressWarnings({ "removal", "deprecation" }) void submitListenableCallableWithGetAfterShutdown() throws Exception { org.springframework.util.concurrent.ListenableFuture future1 = executor.submitListenable(new TestCallable(this.testName, -1)); org.springframework.util.concurrent.ListenableFuture future2 = executor.submitListenable(new TestCallable(this.testName, -1)); From 8c3d5621dba56c21ac909e17c731dc96be484c6b Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Sat, 18 Jan 2025 13:52:02 +0100 Subject: [PATCH 2/2] Upgrade to AssertJ 3.27.3 --- framework-platform/framework-platform.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 29b4115dde1..3ad1625f194 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -15,7 +15,7 @@ dependencies { api(platform("io.rsocket:rsocket-bom:1.1.4")) api(platform("org.apache.groovy:groovy-bom:4.0.24")) api(platform("org.apache.logging.log4j:log4j-bom:2.21.1")) - api(platform("org.assertj:assertj-bom:3.27.2")) + api(platform("org.assertj:assertj-bom:3.27.3")) api(platform("org.eclipse.jetty:jetty-bom:12.0.16")) api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.16")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1"))