Simplify Nested lifecycle method docs due to JDK 17 requirement

Author: marcphilipp

documentation/src/docs/asciidoc/user-guide/writing-tests.adoc

@@ -79,14 +79,14 @@ overridden.
 
 `*@BeforeAll*`:: Denotes that the annotated method should be executed _before_ *all*
 `@Test`, `@RepeatedTest`, `@ParameterizedTest`, and `@TestFactory` methods in the current
-class; analogous to JUnit 4's `@BeforeClass`. Such methods are inherited unless they are
-overridden and must be `static` unless the "per-class"
+top-level or `@Nested` test class; analogous to JUnit 4's `@BeforeClass`. Such methods are
+inherited unless they are overridden and must be `static` unless the "per-class"
 <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used.
 
 `*@AfterAll*`:: Denotes that the annotated method should be executed _after_ *all*
 `@Test`, `@RepeatedTest`, `@ParameterizedTest`, and `@TestFactory` methods in the current
-class; analogous to JUnit 4's `@AfterClass`. Such methods are inherited unless they are
-overridden and must be `static` unless the "per-class"
+top-level or `@Nested` test class; analogous to JUnit 4's `@AfterClass`. Such methods are
+inherited unless they are overridden and must be `static` unless the "per-class"
 <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used.
 
 `*@ParameterizedClass*`:: Denotes that the annotated class is a
@@ -109,12 +109,7 @@ multiple times depending on the number of invocation contexts returned by the re
 <<extensions-class-templates, providers>>. Such annotations are inherited.
 
 `*@Nested*`:: Denotes that the annotated class is a non-static
-<<writing-tests-nested, nested test class>>. On Java 8 through Java 15, `@BeforeAll` and
-`@AfterAll` methods cannot be used directly in a `@Nested` test class unless the
-"per-class" <<writing-tests-test-instance-lifecycle, test instance lifecycle>> is used.
-Beginning with Java 16, `@BeforeAll` and `@AfterAll` methods can be declared as `static`
-in a `@Nested` test class with either test instance lifecycle mode. Such annotations are
-not inherited.
+<<writing-tests-nested, nested test class>>. Such annotations are not inherited.
 
 `*@Tag*`:: Used to declare
 <<writing-tests-tagging-and-filtering, tags for filtering tests>>, either at the class or
@@ -1137,12 +1132,7 @@ methods rely on state stored in instance variables, you may need to reset that s
 
 The "per-class" mode has some additional benefits over the default "per-method" mode.
 Specifically, with the "per-class" mode it becomes possible to declare `@BeforeAll` and
-`@AfterAll` on non-static methods as well as on interface `default` methods. The
-"per-class" mode therefore also makes it possible to use `@BeforeAll` and `@AfterAll`
-methods in `@Nested` test classes.
-
-NOTE: Beginning with Java 16, `@BeforeAll` and `@AfterAll` methods can be declared as
-`static` in `@Nested` test classes.
+`@AfterAll` on non-static methods as well as on interface `default` methods.
 
 If you are authoring tests using the Kotlin programming language, you may also find it
 easier to implement non-static `@BeforeAll` and `@AfterAll` lifecycle methods as well as
@@ -1215,13 +1205,7 @@ running the outer tests, because the setup code from the outer tests is always e
 
 NOTE: _Only non-static nested classes_ (i.e. _inner classes_) can serve as `@Nested` test
 classes. Nesting can be arbitrarily deep, and those inner classes are subject to full
-lifecycle support with one exception: `@BeforeAll` and `@AfterAll` methods do not work _by
-default_. The reason is that Java does not allow `static` members in inner classes prior
-to Java 16. However, this restriction can be circumvented by annotating a `@Nested` test
-class with `@TestInstance(Lifecycle.PER_CLASS)` (see
-<<writing-tests-test-instance-lifecycle>>). If you are using Java 16 or higher,
-`@BeforeAll` and `@AfterAll` methods can be declared as `static` in `@Nested` test
-classes, and this restriction no longer applies.
+lifecycle support, including `@BeforeAll` and `@AfterAll` methods on each level.
 
 [[writing-tests-nested-interoperability]]
 ==== Interoperability

junit-jupiter-api/src/main/java/org/junit/jupiter/api/AfterAll.java

@@ -36,14 +36,9 @@
  * <h2>Method Signatures</h2>
  *
  * <p>{@code @AfterAll} methods must have a {@code void} return type and must
- * be {@code static} by default. Consequently, {@code @AfterAll} methods are
- * not supported in {@link Nested @Nested} test classes or as <em>interface
- * default methods</em> unless the test class is annotated with
- * {@link TestInstance @TestInstance(Lifecycle.PER_CLASS)}. However, beginning
- * with Java 16 {@code @AfterAll} methods may be declared as {@code static} in
- * {@link Nested @Nested} test classes, in which case the {@code Lifecycle.PER_CLASS}
- * restriction no longer applies. In addition, {@code @AfterAll} methods may
- * optionally declare parameters to be resolved by
+ * be {@code static} unless the test class is annotated with
+ * {@link TestInstance @TestInstance(Lifecycle.PER_CLASS)}. In addition,
+ * {@code @AfterAll} methods may optionally declare parameters to be resolved by
  * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolvers}.
  *
  * <p>Using {@code private} visibility for {@code @AfterAll} methods is strongly

junit-jupiter-api/src/main/java/org/junit/jupiter/api/BeforeAll.java

@@ -36,14 +36,9 @@
  * <h2>Method Signatures</h2>
  *
  * <p>{@code @BeforeAll} methods must have a {@code void} return type and must
- * be {@code static} by default. Consequently, {@code @BeforeAll} methods are
- * not supported in {@link Nested @Nested} test classes or as <em>interface
- * default methods</em> unless the test class is annotated with
- * {@link TestInstance @TestInstance(Lifecycle.PER_CLASS)}. However, beginning
- * with Java 16 {@code @BeforeAll} methods may be declared as {@code static} in
- * {@link Nested @Nested} test classes, in which case the {@code Lifecycle.PER_CLASS}
- * restriction no longer applies. In addition, {@code @BeforeAll} methods may
- * optionally declare parameters to be resolved by
+ * be {@code static} unless the test class is annotated with
+ * {@link TestInstance @TestInstance(Lifecycle.PER_CLASS)}. In addition,
+ * {@code @BeforeAll} methods may optionally declare parameters to be resolved by
  * {@link org.junit.jupiter.api.extension.ParameterResolver ParameterResolvers}.
  *
  * <p>Using {@code private} visibility for {@code @BeforeAll} methods is strongly

junit-jupiter-api/src/main/java/org/junit/jupiter/api/TestInstance.java

@@ -46,9 +46,7 @@
  * as well as between non-static {@link BeforeAll @BeforeAll} and
  * {@link AfterAll @AfterAll} methods in the test class.</li>
  * <li>Declaration of non-static {@code @BeforeAll} and {@code @AfterAll} methods
- * in {@link Nested @Nested} test classes. Beginning with Java 16, {@code @BeforeAll}
- * and {@code @AfterAll} methods may be declared as {@code static} in
- * {@link Nested @Nested} test classes with either lifecycle mode.</li>
+ * in top-level or {@link Nested @Nested} test classes.</li>
  * <li>Declaration of {@code @BeforeAll} and {@code @AfterAll} on interface
  * {@code default} methods.</li>
  * <li>Simplified declaration of non-static {@code @BeforeAll} and {@code @AfterAll}

junit-jupiter-params/src/main/java/org/junit/jupiter/params/AfterParameterizedClassInvocation.java

@@ -34,15 +34,9 @@
  * <h2>Method Signatures</h2>
  *
  * <p>{@code @AfterParameterizedClassInvocation} methods must have a
- * {@code void} return type, must not be private, and must be {@code static} by
- * default. Consequently, {@code @AfterParameterizedClassInvocation} methods are
- * not supported in {@link org.junit.jupiter.api.Nested @Nested} test classes or
- * as <em>interface default methods</em> unless the test class is annotated with
+ * {@code void} return type, must not be private, and must be {@code static}
+ * unless the test class is annotated with
  * {@link org.junit.jupiter.api.TestInstance @TestInstance(Lifecycle.PER_CLASS)}.
- * However, beginning with Java 16 {@code @AfterParameterizedClassInvocation}
- * methods may be declared as {@code static} in
- * {@link org.junit.jupiter.api.Nested @Nested} test classes, in which case the
- * {@code Lifecycle.PER_CLASS} restriction no longer applies.
  *
  * <h2>Method Arguments</h2>
  *

junit-jupiter-params/src/main/java/org/junit/jupiter/params/BeforeParameterizedClassInvocation.java

@@ -34,16 +34,9 @@
  * <h2>Method Signatures</h2>
  *
  * <p>{@code @BeforeParameterizedClassInvocation} methods must have a
- * {@code void} return type, must not be private, and must be {@code static} by
- * default. Consequently, {@code @BeforeParameterizedClassInvocation} methods
- * are not supported in {@link org.junit.jupiter.api.Nested @Nested} test
- * classes or as <em>interface default methods</em> unless the test class is
- * annotated with
+ * {@code void} return type, must not be private, and must be {@code static}
+ * unless the test class is annotated with
  * {@link org.junit.jupiter.api.TestInstance @TestInstance(Lifecycle.PER_CLASS)}.
- * However, beginning with Java 16 {@code @BeforeParameterizedClassInvocation}
- * methods may be declared as {@code static} in
- * {@link org.junit.jupiter.api.Nested @Nested} test classes, in which case the
- * {@code Lifecycle.PER_CLASS} restriction no longer applies.
  *
  * <h2>Method Arguments</h2>
  *

jupiter-tests/src/test/java/org/junit/jupiter/engine/StaticNestedBeforeAllAndAfterAllMethodsTests.java

@@ -25,7 +25,7 @@
 
 /**
  * Integration tests that verify support for {@code static} {@link BeforeAll} and
- * {@link AfterAll} methods in {@link Nested} tests on Java 16+.
+ * {@link AfterAll} methods in {@link Nested} tests.
  *
  * @since 5.9
  * @see BeforeAllAndAfterAllComposedAnnotationTests