Merge branch '2.2.x' into 2.3.x

Closes gh-23004
4 years ago · 9a374f7d67
parent f7452b9383 47e5db9e43
commit 9a374f7d67
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
@ -8135,7 +8135,7 @@ Note that some features (such as detecting the default value or deprecated items
 === Testing
 While it is possible to use JUnit 4 to test Kotlin code, JUnit 5 is provided by default and is recommended.
 JUnit 5 enables a test class to be instantiated once and reused for all of the class's tests.
-This makes it possible to use `@BeforeClass` and `@AfterClass` annotations on non-static methods, which is a good fit for Kotlin.
+This makes it possible to use `@BeforeAll` and `@AfterAll` annotations on non-static methods, which is a good fit for Kotlin.

 JUnit 5 is the default and the vintage engine is provided for backward compatibility with JUnit 4.
 If you don't use it, exclude `org.junit.vintage:junit-vintage-engine`.