Merge branch '7.0.x'

This commit is contained in:
Sam Brannen
2026-09-04 15:28:48 +02:00
2 changed files with 2 additions and 8 deletions
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.util;
package org.springframework.util.backoff;
import java.util.ArrayList;
import java.util.List;
@@ -22,9 +22,6 @@ import java.util.stream.IntStream;
import org.junit.jupiter.api.Test;
import org.springframework.util.backoff.BackOffExecution;
import org.springframework.util.backoff.ExponentialBackOff;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
import static org.assertj.core.api.Assertions.assertThatNoException;
@@ -14,13 +14,10 @@
* limitations under the License.
*/
package org.springframework.util;
package org.springframework.util.backoff;
import org.junit.jupiter.api.Test;
import org.springframework.util.backoff.BackOffExecution;
import org.springframework.util.backoff.FixedBackOff;
import static org.assertj.core.api.Assertions.assertThat;
/**