Relocate @EnabledIf & @DisabledIf to condition package

Author: sbrannen

documentation/src/docs/asciidoc/link-attributes.adoc

@@ -35,12 +35,12 @@
 :BeforeEachCallback:                {javadoc-root}/org/junit/jupiter/api/extension/BeforeEachCallback.html[BeforeEachCallback]
 :BeforeTestExecutionCallback:       {javadoc-root}/org/junit/jupiter/api/extension/BeforeTestExecutionCallback.html[BeforeTestExecutionCallback]
 :Disabled:                          {javadoc-root}/org/junit/jupiter/api/Disabled.html[@Disabled]
-:DisabledIf:                        {javadoc-root}/org/junit/jupiter/api/DisabledIf.html[@DisabledIf]
+:DisabledIf:                        {javadoc-root}/org/junit/jupiter/api/condition/DisabledIf.html[@DisabledIf]
 :DisabledIfEnvironmentVariable:     {javadoc-root}/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.html[@DisabledIfEnvironmentVariable]
 :DisabledIfSystemProperty:          {javadoc-root}/org/junit/jupiter/api/condition/DisabledIfSystemProperty.html[@DisabledIfSystemProperty]
 :DisabledOnJre:                     {javadoc-root}/org/junit/jupiter/api/condition/DisabledOnJre.html[@DisabledOnJre]
 :DisabledOnOs:                      {javadoc-root}/org/junit/jupiter/api/condition/DisabledOnOs.html[@DisabledOnOs]
-:EnabledIf:                         {javadoc-root}/org/junit/jupiter/api/EnabledIf.html[@EnabledIf]
+:EnabledIf:                         {javadoc-root}/org/junit/jupiter/api/condition/EnabledIf.html[@EnabledIf]
 :EnabledIfEnvironmentVariable:      {javadoc-root}/org/junit/jupiter/api/condition/EnabledIfEnvironmentVariable.html[@EnabledIfEnvironmentVariable]
 :EnabledIfSystemProperty:           {javadoc-root}/org/junit/jupiter/api/condition/EnabledIfSystemProperty.html[@EnabledIfSystemProperty]
 :EnabledOnJre:                      {javadoc-root}/org/junit/jupiter/api/condition/EnabledOnJre.html[@EnabledOnJre]

documentation/src/docs/asciidoc/release-notes/release-notes-5.1.0-RC1.adoc

@@ -35,7 +35,8 @@ on GitHub.
 
 ==== Deprecations and Breaking Changes
 
-* ❓
+* The `@EnabledIf` annotation introduced in 5.1 M2 has been moved to the
+  `org.junit.jupiter.api.condition` package.
 
 ==== New Features and Improvements
 

documentation/src/docs/asciidoc/user-guide/api-evolution.adoc

@@ -47,12 +47,13 @@ The following table lists which APIs are currently designated as _experimental_
 | Package Name                               | Class Name                    | Type
 
 | `org.junit.jupiter.api`                    | `AssertionsKt`                | `class`
-| `org.junit.jupiter.api`                    | `DisabledIf`                  | `annotation`
 | `org.junit.jupiter.api`                    | `DynamicContainer`            | `class`
 | `org.junit.jupiter.api`                    | `DynamicNode`                 | `class`
 | `org.junit.jupiter.api`                    | `DynamicTest`                 | `class`
-| `org.junit.jupiter.api`                    | `EnabledIf`                   | `annotation`
 | `org.junit.jupiter.api`                    | `TestFactory`                 | `annotation`
+| `org.junit.jupiter.api.condition`          | `DisabledIf`                  | `annotation`
+| `org.junit.jupiter.api.condition`          | `EnabledIf`                   | `annotation`
+| `org.junit.jupiter.api.extension`          | `ScriptEvaluationException`   | `class`
 | `org.junit.jupiter.migrationsupport.rules` | `EnableRuleMigrationSupport`  | `annotation`
 | `org.junit.jupiter.migrationsupport.rules` | `ExpectedExceptionSupport`    | `class`
 | `org.junit.jupiter.migrationsupport.rules` | `ExternalResourceSupport`     | `class`

documentation/src/test/java/example/ConditionalTestExecutionDemo.java

@@ -25,14 +25,14 @@
 import java.lang.annotation.Target;
 import java.time.LocalDate;
 
-import org.junit.jupiter.api.DisabledIf;
-import org.junit.jupiter.api.EnabledIf;
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 import org.junit.jupiter.api.condition.DisabledOnJre;
 import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.EnabledIf;
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.junit.jupiter.api.condition.EnabledOnJre;

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

@@ -28,7 +28,8 @@
  * are automatically disabled as well.
  *
  * @since 5.0
- * @see EnabledIf
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)

…va/org/junit/jupiter/api/DisabledIf.java …it/jupiter/api/condition/DisabledIf.javajunit-jupiter-api/src/main/java/org/junit/jupiter/api/DisabledIf.java renamed to junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java junit-jupiter-api/src/main/java/org/junit/jupiter/api/DisabledIf.java renamed to junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIf.java

@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.jupiter.api;
+package org.junit.jupiter.api.condition;
 
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 
@@ -96,8 +96,8 @@
  * They might clash with new bindings introduced in the future.
  *
  * @since 5.1
- * @see Disabled
- * @see EnabledIf
+ * @see org.junit.jupiter.api.Disabled
+ * @see org.junit.jupiter.api.condition.EnabledIf
  * @see javax.script.ScriptEngine
  * @see org.junit.jupiter.api.extension.ExecutionCondition
  * @see org.junit.jupiter.api.extension.ConditionEvaluationResult#enabled(String)

junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfEnvironmentVariable.java

@@ -37,8 +37,8 @@
  * @since 5.1
  * @see EnabledIfEnvironmentVariable
  * @see org.junit.jupiter.api.Disabled
- * @see org.junit.jupiter.api.EnabledIf
- * @see org.junit.jupiter.api.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)

junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledIfSystemProperty.java

@@ -37,8 +37,8 @@
  * @since 5.1
  * @see EnabledIfSystemProperty
  * @see org.junit.jupiter.api.Disabled
- * @see org.junit.jupiter.api.EnabledIf
- * @see org.junit.jupiter.api.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)

junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnJre.java

@@ -32,8 +32,8 @@
  * @since 5.1
  * @see EnabledOnJre
  * @see org.junit.jupiter.api.Disabled
- * @see org.junit.jupiter.api.EnabledIf
- * @see org.junit.jupiter.api.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)

junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledOnOs.java

@@ -32,8 +32,8 @@
  * @since 5.1
  * @see EnabledOnOs
  * @see org.junit.jupiter.api.Disabled
- * @see org.junit.jupiter.api.EnabledIf
- * @see org.junit.jupiter.api.DisabledIf
+ * @see org.junit.jupiter.api.condition.EnabledIf
+ * @see org.junit.jupiter.api.condition.DisabledIf
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)