From 4c0fa630c72255adf6a800dbbaf76e2bb762cc8e Mon Sep 17 00:00:00 2001
From: Marc Philipp <mail@marcphilipp.de>
Date: Wed, 12 Jun 2024 08:59:07 +0200
Subject: [PATCH] Generate JRE enum and dependent tests and add JAVA_24 (#3855)

* Generate code based on YaML file
* Use Java Template Engine (JTE)
* Add JRE.JAVA_24
---
 .idea/codeStyles/Project.xml                  |   5 +
 .../release-notes-5.11.0-M3.adoc              |   1 +
 .../code-generator-model/build.gradle.kts     |   9 +
 .../kotlin/junitbuild/generator/model/JRE.kt  |   3 +
 .../src/main/resources/jre.yaml               |  30 +++
 gradle/base/settings.gradle.kts               |   3 +
 gradle/config/checkstyle/suppressions.xml     |   2 +
 gradle/libs.versions.toml                     |   4 +
 .../plugins/code-generator/build.gradle.kts   |  15 ++
 .../junitbuild.code-generator.gradle.kts      |  35 +++
 .../generator/GenerateJreRelatedSourceCode.kt |  75 ++++++
 .../java/PatchModuleArgumentProvider.kt       |   9 +-
 gradle/plugins/settings.gradle.kts            |   3 +
 .../junit-jupiter-api.gradle.kts              |   1 +
 .../junit/jupiter/api/condition/JRE.java.jte} | 219 +++------------
 .../condition/JavaVersionPredicates.java.jte  |  22 ++
 .../junit-jupiter-engine.gradle.kts           |   1 +
 .../DisabledOnJreConditionTests.java.jte      |  99 +++++++
 .../DisabledOnJreIntegrationTests.java.jte    |  66 +++++
 .../EnabledOnJreConditionTests.java.jte       |  99 +++++++
 .../EnabledOnJreIntegrationTests.java.jte     |  64 +++++
 .../DisabledForJreRangeConditionTests.java    |  35 ++-
 .../DisabledForJreRangeIntegrationTests.java  |  33 +--
 .../DisabledOnJreConditionTests.java          | 251 ------------------
 .../DisabledOnJreIntegrationTests.java        | 182 -------------
 .../EnabledForJreRangeConditionTests.java     |  33 +--
 .../EnabledForJreRangeIntegrationTests.java   |  37 ++-
 .../condition/EnabledOnJreConditionTests.java | 251 ------------------
 .../EnabledOnJreIntegrationTests.java         | 233 ----------------
 settings.gradle.kts                           |   2 +
 30 files changed, 644 insertions(+), 1178 deletions(-)
 create mode 100644 gradle/base/code-generator-model/build.gradle.kts
 create mode 100644 gradle/base/code-generator-model/src/main/kotlin/junitbuild/generator/model/JRE.kt
 create mode 100644 gradle/base/code-generator-model/src/main/resources/jre.yaml
 create mode 100644 gradle/base/settings.gradle.kts
 create mode 100644 gradle/plugins/code-generator/build.gradle.kts
 create mode 100644 gradle/plugins/code-generator/src/main/kotlin/junitbuild.code-generator.gradle.kts
 create mode 100644 gradle/plugins/code-generator/src/main/kotlin/junitbuild/generator/GenerateJreRelatedSourceCode.kt
 rename junit-jupiter-api/src/{main/java/org/junit/jupiter/api/condition/JRE.java => templates/resources/main/org/junit/jupiter/api/condition/JRE.java.jte} (51%)
 create mode 100644 junit-jupiter-api/src/templates/resources/testFixtures/org/junit/jupiter/api/condition/JavaVersionPredicates.java.jte
 create mode 100644 junit-jupiter-engine/src/templates/resources/test/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java.jte
 create mode 100644 junit-jupiter-engine/src/templates/resources/test/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java.jte
 create mode 100644 junit-jupiter-engine/src/templates/resources/test/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java.jte
 create mode 100644 junit-jupiter-engine/src/templates/resources/test/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java.jte
 delete mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
 delete mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
 delete mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
 delete mode 100644 junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 5ec02b4ce298..e6094d409c45 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -83,6 +83,11 @@
         <option name="USE_TAB_CHARACTER" value="true" />
       </indentOptions>
     </codeStyleSettings>
+    <codeStyleSettings language="JavaTemplateEngine">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </codeStyleSettings>
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.0-M3.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.0-M3.adoc
index 0f19a6985a68..11f17150547e 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.0-M3.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.11.0-M3.adoc
@@ -51,6 +51,7 @@ repository on GitHub.
   arguments for a `@ParameterizedTest`. See the
   <<../user-guide/index.adoc#writing-tests-parameterized-tests-display-names, User Guide>>
   for details.
+* `JAVA_24` has been added to the `JRE` enum for use with JRE-based execution conditions.
 
 
 [[release-notes-5.11.0-M3-junit-vintage]]
diff --git a/gradle/base/code-generator-model/build.gradle.kts b/gradle/base/code-generator-model/build.gradle.kts
new file mode 100644
index 000000000000..aa3ba93c438a
--- /dev/null
+++ b/gradle/base/code-generator-model/build.gradle.kts
@@ -0,0 +1,9 @@
+plugins {
+    `kotlin-dsl`
+}
+
+group = "junitbuild.base"
+
+repositories {
+    gradlePluginPortal()
+}
diff --git a/gradle/base/code-generator-model/src/main/kotlin/junitbuild/generator/model/JRE.kt b/gradle/base/code-generator-model/src/main/kotlin/junitbuild/generator/model/JRE.kt
new file mode 100644
index 000000000000..a4bc8b4c4606
--- /dev/null
+++ b/gradle/base/code-generator-model/src/main/kotlin/junitbuild/generator/model/JRE.kt
@@ -0,0 +1,3 @@
+package junitbuild.generator.model
+
+data class JRE(val version: Int, val since: String?)
diff --git a/gradle/base/code-generator-model/src/main/resources/jre.yaml b/gradle/base/code-generator-model/src/main/resources/jre.yaml
new file mode 100644
index 000000000000..ed1bdd3d59fc
--- /dev/null
+++ b/gradle/base/code-generator-model/src/main/resources/jre.yaml
@@ -0,0 +1,30 @@
+- version: 8
+- version: 9
+- version: 10
+- version: 11
+- version: 12
+  since: '5.4'
+- version: 13
+  since: '5.4'
+- version: 14
+  since: '5.5'
+- version: 15
+  since: '5.6'
+- version: 16
+  since: '5.7'
+- version: 17
+  since: '5.7.1'
+- version: 18
+  since: '5.8.1'
+- version: 19
+  since: '5.9'
+- version: 20
+  since: '5.9'
+- version: 21
+  since: '5.9.2'
+- version: 22
+  since: '5.10'
+- version: 23
+  since: '5.11'
+- version: 24
+  since: '5.11'
diff --git a/gradle/base/settings.gradle.kts b/gradle/base/settings.gradle.kts
new file mode 100644
index 000000000000..66f6697452eb
--- /dev/null
+++ b/gradle/base/settings.gradle.kts
@@ -0,0 +1,3 @@
+rootProject.name = "base"
+
+include("code-generator-model")
diff --git a/gradle/config/checkstyle/suppressions.xml b/gradle/config/checkstyle/suppressions.xml
index 05801fccce21..e858ede7e5b1 100644
--- a/gradle/config/checkstyle/suppressions.xml
+++ b/gradle/config/checkstyle/suppressions.xml
@@ -4,4 +4,6 @@
 		files="junit-platform-commons[\\/]src[\\/]main[\\/]java.+?[\\/]org[\\/]junit[\\/]platform[\\/]commons[\\/]util[\\/]*"/>
 	<suppress checks="JavadocPackage"
 		files="junit-platform-console[\\/]src[\\/]main[\\/]java.+?[\\/]org[\\/]junit[\\/]platform[\\/]console[\\/]*"/>
+	<suppress checks="JavadocPackage"
+		files="junit-jupiter-api[\\/]build[\\/]generated[\\/]sources[\\/]jte[\\/]main[\\/]org[\\/]junit[\\/]jupiter[\\/]api[\\/]condition[\\/]*"/>
 </suppressions>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 7dc4705e1a33..459556e2cce8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,6 +8,7 @@ bnd = "7.0.0"
 checkstyle = "10.17.0"
 eclipse = "4.31.100"
 gradleVersionsPlugin = "0.51.0"
+jackson = "2.17.1"
 jacoco = "0.8.7"
 jmh = "1.37"
 junit4 = "4.13.2"
@@ -42,12 +43,15 @@ gradle-versions = { module = "com.github.ben-manes:gradle-versions-plugin", vers
 groovy4 = { module = "org.apache.groovy:groovy", version = "4.0.21" }
 groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.21" }
 hamcrest = { module = "org.hamcrest:hamcrest", version = "2.2" }
+jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version.ref = "jackson" }
+jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
 jfrPolyfill = { module = "org.gradle.jfr.polyfill:jfr-polyfill", version = "1.0.2" }
 jfrunit = { module = "org.moditect.jfrunit:jfrunit-core", version = "1.0.0.Alpha2" }
 jimfs = { module = "com.google.jimfs:jimfs", version = "1.3.0" }
 jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
 joox = { module = "org.jooq:joox", version = "2.0.1" }
+jte = { module = "gg.jte:jte", version = "3.1.12" }
 junit4 = { module = "junit:junit", version = { require = "[4.12,)", prefer = "4.13.2" } }
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.8.1" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
diff --git a/gradle/plugins/code-generator/build.gradle.kts b/gradle/plugins/code-generator/build.gradle.kts
new file mode 100644
index 000000000000..69f88347f7d6
--- /dev/null
+++ b/gradle/plugins/code-generator/build.gradle.kts
@@ -0,0 +1,15 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation("junitbuild.base:code-generator-model")
+    implementation(projects.common)
+    implementation(libs.jackson.dataformat.yaml)
+    implementation(libs.jackson.module.kotlin)
+    implementation(libs.jte)
+}
diff --git a/gradle/plugins/code-generator/src/main/kotlin/junitbuild.code-generator.gradle.kts b/gradle/plugins/code-generator/src/main/kotlin/junitbuild.code-generator.gradle.kts
new file mode 100644
index 000000000000..7b61c9609e78
--- /dev/null
+++ b/gradle/plugins/code-generator/src/main/kotlin/junitbuild.code-generator.gradle.kts
@@ -0,0 +1,35 @@
+import junitbuild.generator.GenerateJreRelatedSourceCode
+
+plugins {
+    java
+}
+
+val templates by sourceSets.registering
+dependencies {
+    add(templates.get().compileOnlyConfigurationName, dependencyFromLibs("jte"))
+    add(templates.get().compileOnlyConfigurationName, "junitbuild.base:code-generator-model")
+}
+
+val license: License by rootProject.extra
+val rootTargetDir = layout.buildDirectory.dir("generated/sources/jte")
+val generateCode by tasks.registering
+
+sourceSets.named { it != templates.name }.configureEach {
+
+    val sourceSetName = name
+    val sourceSetTargetDir = rootTargetDir.map { it.dir(sourceSetName) }
+
+    val task = tasks.register(getTaskName("generateJreRelated", "SourceCode"), GenerateJreRelatedSourceCode::class) {
+        templateDir.convention(layout.dir(templates.map {
+            it.resources.srcDirs.single().resolve(sourceSetName)
+        }))
+        targetDir.convention(sourceSetTargetDir)
+        licenseHeaderFile.convention(license.headerFile)
+    }
+
+    java.srcDir(files(sourceSetTargetDir).builtBy(task))
+
+    generateCode {
+        dependsOn(task)
+    }
+}
diff --git a/gradle/plugins/code-generator/src/main/kotlin/junitbuild/generator/GenerateJreRelatedSourceCode.kt b/gradle/plugins/code-generator/src/main/kotlin/junitbuild/generator/GenerateJreRelatedSourceCode.kt
new file mode 100644
index 000000000000..a961a8247869
--- /dev/null
+++ b/gradle/plugins/code-generator/src/main/kotlin/junitbuild/generator/GenerateJreRelatedSourceCode.kt
@@ -0,0 +1,75 @@
+package junitbuild.generator
+
+import com.fasterxml.jackson.core.type.TypeReference
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
+import com.fasterxml.jackson.module.kotlin.KotlinModule
+import gg.jte.ContentType
+import gg.jte.TemplateEngine
+import gg.jte.output.FileOutput
+import gg.jte.resolve.DirectoryCodeResolver
+import junitbuild.generator.model.JRE
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.SkipWhenEmpty
+import org.gradle.api.tasks.TaskAction
+
+@CacheableTask
+abstract class GenerateJreRelatedSourceCode : DefaultTask() {
+
+    @get:InputDirectory
+    @get:SkipWhenEmpty
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    abstract val templateDir: DirectoryProperty
+
+    @get:OutputDirectory
+    abstract val targetDir: DirectoryProperty
+
+    @get:InputFile
+    @get:PathSensitive(PathSensitivity.NONE)
+    abstract val licenseHeaderFile: RegularFileProperty
+
+    @TaskAction
+    fun generateSourceCode() {
+        val mainTargetDir = targetDir.get().asFile
+        mainTargetDir.deleteRecursively()
+
+        val templateDir = templateDir.get().asFile
+        val codeResolver = DirectoryCodeResolver(templateDir.toPath())
+        val templateEngine =
+            TemplateEngine.create(codeResolver, temporaryDir.toPath(), ContentType.Plain, javaClass.classLoader)
+
+        val templates = templateDir.walkTopDown()
+            .filter { it.extension == "jte" }
+            .map { it.relativeTo(templateDir) }
+            .toList()
+
+        if (templates.isNotEmpty()) {
+            val jres = javaClass.getResourceAsStream("/jre.yaml").use { input ->
+                val mapper = ObjectMapper(YAMLFactory())
+                mapper.registerModule(KotlinModule.Builder().build())
+                mapper.readValue(input, object : TypeReference<List<JRE>>() {})
+            }
+            val params = mapOf(
+                "jres" to jres,
+                "jresSortedByStringValue" to jres.sortedBy { it.version.toString() },
+                "licenseHeader" to licenseHeaderFile.asFile.get().readText()
+            )
+            templates.forEach {
+                val targetFile = mainTargetDir.toPath().resolve(it.resolveSibling(it.nameWithoutExtension).path)
+
+                FileOutput(targetFile).use { output ->
+                    templateEngine.render(it.path, params, output)
+                }
+            }
+        }
+    }
+
+}
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt b/gradle/plugins/common/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt
index 0c7f330f8adf..8149094e6128 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild/java/PatchModuleArgumentProvider.kt
@@ -5,7 +5,12 @@ import org.gradle.api.Named
 import org.gradle.api.Project
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.provider.Property
-import org.gradle.api.tasks.*
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.SourceSetContainer
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.the
 import org.gradle.process.CommandLineArgumentProvider
@@ -28,7 +33,7 @@ abstract class PatchModuleArgumentProvider @Inject constructor(compiledProject:
                 compiledProject.files(compiledProject.the<SourceSetContainer>().matching { it.name.startsWith("main") }
                     .map { it.output })
             else
-                patchModuleProject.files(patchModuleProject.the<SourceSetContainer>()["main"].java.srcDirs)
+                patchModuleProject.files(patchModuleProject.the<SourceSetContainer>()["main"].java.sourceDirectories)
         })
     }
 
diff --git a/gradle/plugins/settings.gradle.kts b/gradle/plugins/settings.gradle.kts
index 411d60f787dc..728290a2cad6 100644
--- a/gradle/plugins/settings.gradle.kts
+++ b/gradle/plugins/settings.gradle.kts
@@ -8,7 +8,10 @@ dependencyResolutionManagement {
 
 rootProject.name = "plugins"
 
+includeBuild("../base")
+
 include("build-parameters")
 include("common")
+include("code-generator")
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
diff --git a/junit-jupiter-api/junit-jupiter-api.gradle.kts b/junit-jupiter-api/junit-jupiter-api.gradle.kts
index 7dd03a78f4e9..bdf4c359550f 100644
--- a/junit-jupiter-api/junit-jupiter-api.gradle.kts
+++ b/junit-jupiter-api/junit-jupiter-api.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
 	id("junitbuild.kotlin-library-conventions")
+	id("junitbuild.code-generator")
 	`java-test-fixtures`
 }
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java b/junit-jupiter-api/src/templates/resources/main/org/junit/jupiter/api/condition/JRE.java.jte
similarity index 51%
rename from junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
rename to junit-jupiter-api/src/templates/resources/main/org/junit/jupiter/api/condition/JRE.java.jte
index bce242eb3796..1a8598d9e980 100644
--- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/JRE.java
+++ b/junit-jupiter-api/src/templates/resources/main/org/junit/jupiter/api/condition/JRE.java.jte
@@ -1,13 +1,10 @@
-/*
- * Copyright 2015-2024 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
+@import java.util.List
+@import gg.jte.support.ForSupport
+@import junitbuild.generator.model.JRE
 
+@param List<JRE> jres
+@param String licenseHeader
+${licenseHeader}
 package org.junit.jupiter.api.condition;
 
 import static org.apiguardian.api.API.Status.STABLE;
@@ -30,22 +27,10 @@
  * {@linkplain #isCurrentVersion current JRE version}.
  *
  * @since 5.1
- * @see #JAVA_8
- * @see #JAVA_9
- * @see #JAVA_10
- * @see #JAVA_11
- * @see #JAVA_12
- * @see #JAVA_13
- * @see #JAVA_14
- * @see #JAVA_15
- * @see #JAVA_16
- * @see #JAVA_17
- * @see #JAVA_18
- * @see #JAVA_19
- * @see #JAVA_20
- * @see #JAVA_21
- * @see #JAVA_22
- * @see #OTHER
+@for(JRE jre : jres)<%--
+--%> * @see #JAVA_${jre.getVersion()}
+@endfor<%--
+--%> * @see #OTHER
  * @see EnabledOnJre
  * @see DisabledOnJre
  * @see EnabledForJreRange
@@ -53,130 +38,28 @@
  */
 @API(status = STABLE, since = "5.1")
 public enum JRE {
-
-	/**
-	 * Java 8.
-	 */
-	JAVA_8,
-
-	/**
-	 * Java 9.
-	 */
-	JAVA_9,
-
-	/**
-	 * Java 10.
-	 */
-	JAVA_10,
-
-	/**
-	 * Java 11.
-	 */
-	JAVA_11,
-
-	/**
-	 * Java 12.
-	 *
-	 * @since 5.4
-	 */
-	@API(status = STABLE, since = "5.4")
-	JAVA_12,
-
-	/**
-	 * Java 13.
-	 *
-	 * @since 5.4
-	 */
-	@API(status = STABLE, since = "5.4")
-	JAVA_13,
-
-	/**
-	 * Java 14.
-	 *
-	 * @since 5.5
-	 */
-	@API(status = STABLE, since = "5.5")
-	JAVA_14,
-
-	/**
-	 * Java 15.
-	 *
-	 * @since 5.6
-	 */
-	@API(status = STABLE, since = "5.6")
-	JAVA_15,
-
-	/**
-	 * Java 16.
-	 *
-	 * @since 5.7
-	 */
-	@API(status = STABLE, since = "5.7")
-	JAVA_16,
-
-	/**
-	 * Java 17.
-	 *
-	 * @since 5.7.1
-	 */
-	@API(status = STABLE, since = "5.7.1")
-	JAVA_17,
-
-	/**
-	 * Java 18.
-	 *
-	 * @since 5.8.1
-	 */
-	@API(status = STABLE, since = "5.8.1")
-	JAVA_18,
-
-	/**
-	 * Java 19.
-	 *
-	 * @since 5.9
-	 */
-	@API(status = STABLE, since = "5.9")
-	JAVA_19,
-
-	/**
-	 * Java 20.
-	 *
-	 * @since 5.9
-	 */
-	@API(status = STABLE, since = "5.9")
-	JAVA_20,
-
-	/**
-	 * Java 21.
-	 *
-	 * @since 5.9.2
-	 */
-	@API(status = STABLE, since = "5.9.2")
-	JAVA_21,
-
-	/**
-	 * Java 22.
-	 *
-	 * @since 5.10
-	 */
-	@API(status = STABLE, since = "5.10")
-	JAVA_22,
-
-	/**
-	 * Java 23.
-	 *
-	 * @since 5.11
-	 */
-	@API(status = STABLE, since = "5.11")
-	JAVA_23,
-
-	/**
-	 * A JRE version other than {@link #JAVA_8}, {@link #JAVA_9},
-	 * {@link #JAVA_10}, {@link #JAVA_11}, {@link #JAVA_12},
-	 * {@link #JAVA_13}, {@link #JAVA_14}, {@link #JAVA_15},
-	 * {@link #JAVA_16}, {@link #JAVA_17}, {@link #JAVA_18},
-	 * {@link #JAVA_19}, {@link #JAVA_20}, {@link #JAVA_21},
-	 * {@link #JAVA_22}, or {@link #JAVA_23}.
+@for(var jre : jres)
+	/**
+	 * Java ${jre.getVersion()}.
+	@if(jre.getSince() != null)<%--
+--%> *
+	 * @since ${jre.getSince()}
+	@endif<%--
+--%> */
+	@if(jre.getSince() != null)<%--
+--%>@API(status = STABLE, since = "${jre.getSince()}")
+	@endif<%--
+--%>JAVA_${jre.getVersion()},
+@endfor
+	/**
+	 * A JRE version other than <%--
+--%>@for(var jre : ForSupport.of(jres))<%--
+	--%>@if(jre.isLast())or @endif<%--
+	--%>{@link #JAVA_${jre.get().getVersion()}}<%--
+	--%>@if(jre.isLast()).@else,@endif<%--
+	--%>@if(jre.getIndex() % 3 == 1 && !jre.isLast())
+	 * @elseif(!jre.isLast()) @endif<%--
+--%>@endfor
 	 */
 	OTHER;
 
@@ -205,37 +88,13 @@ private static JRE determineCurrentVersion() {
 			Object version = ReflectionUtils.invokeMethod(versionMethod, null);
 			Method majorMethod = version.getClass().getMethod("major");
 			int major = (int) ReflectionUtils.invokeMethod(majorMethod, version);
-			switch (major) {
-				case 9:
-					return JAVA_9;
-				case 10:
-					return JAVA_10;
-				case 11:
-					return JAVA_11;
-				case 12:
-					return JAVA_12;
-				case 13:
-					return JAVA_13;
-				case 14:
-					return JAVA_14;
-				case 15:
-					return JAVA_15;
-				case 16:
-					return JAVA_16;
-				case 17:
-					return JAVA_17;
-				case 18:
-					return JAVA_18;
-				case 19:
-					return JAVA_19;
-				case 20:
-					return JAVA_20;
-				case 21:
-					return JAVA_21;
-				case 22:
-					return JAVA_22;
-				case 23:
-					return JAVA_23;
+			switch (major) {<%--
+				--%>@for(var jre : jres)<%--
+					--%>@if(jre.getVersion() != 8)
+				case ${jre.getVersion()}:
+					return JAVA_${jre.getVersion()};<%--
+					--%>@endif<%--
+				--%>@endfor
 				default:
 					return OTHER;
 			}
diff --git a/junit-jupiter-api/src/templates/resources/testFixtures/org/junit/jupiter/api/condition/JavaVersionPredicates.java.jte b/junit-jupiter-api/src/templates/resources/testFixtures/org/junit/jupiter/api/condition/JavaVersionPredicates.java.jte
new file mode 100644
index 000000000000..de731bb4cd8f
--- /dev/null
+++ b/junit-jupiter-api/src/templates/resources/testFixtures/org/junit/jupiter/api/condition/JavaVersionPredicates.java.jte
@@ -0,0 +1,22 @@
+@import java.util.List
+@import gg.jte.support.ForSupport
+@import junitbuild.generator.model.JRE
+
+@param List<JRE> jres
+@param String licenseHeader
+${licenseHeader}
+package org.junit.jupiter.api.condition;
+
+public class JavaVersionPredicates {
+
+	private static final String JAVA_VERSION = System.getProperty("java.version");
+@for(JRE jre : jres)
+	static boolean onJava${jre.getVersion()}() {
+		return JAVA_VERSION.startsWith("@if(jre.getVersion() == 8)1.@endif${jre.getVersion()}");
+	}
+@endfor
+	static boolean onKnownVersion() {
+		return @for(var jre : ForSupport.of(jres))onJava${jre.get().getVersion()}()@if(!jre.isLast()) //
+				|| @endif@endfor;
+	}
+}
diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
index 26b4b2664e20..917565e77351 100644
--- a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
+++ b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -3,6 +3,7 @@ import org.gradle.api.tasks.PathSensitivity.RELATIVE
 plugins {
 	id("junitbuild.kotlin-library-conventions")
 	id("junitbuild.testing-conventions")
+	id("junitbuild.code-generator")
 	groovy
 	`java-test-fixtures`
 }
diff --git a/junit-jupiter-engine/src/templates/resources/test/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java.jte b/junit-jupiter-engine/src/templates/resources/test/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java.jte
new file mode 100644
index 000000000000..fc4d8884be75
--- /dev/null
+++ b/junit-jupiter-engine/src/templates/resources/test/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java.jte
@@ -0,0 +1,99 @@
+@import java.util.List
+@import junitbuild.generator.model.JRE
+
+@param List<JRE> jres
+@param List<JRE> jresSortedByStringValue
+@param String licenseHeader
+${licenseHeader}
+package org.junit.jupiter.api.condition;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+@for(var jre : jresSortedByStringValue)<%--
+--%>import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava${jre.getVersion()};
+@endfor<%--
+--%>import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.platform.commons.PreconditionViolationException;
+
+/**
+ * Unit tests for {@link DisabledOnJreCondition}.
+ *
+ * <p>Note that test method names MUST match the test method names in
+ * {@link DisabledOnJreIntegrationTests}.
+ *
+ * @since 5.1
+ */
+class DisabledOnJreConditionTests extends AbstractExecutionConditionTests {
+
+	@Override
+	protected ExecutionCondition getExecutionCondition() {
+		return new DisabledOnJreCondition();
+	}
+
+	@Override
+	protected Class<?> getTestClass() {
+		return DisabledOnJreIntegrationTests.class;
+	}
+
+	/**
+	 * @see DisabledOnJreIntegrationTests#enabledBecauseAnnotationIsNotPresent()
+	 */
+	@Test
+	void enabledBecauseAnnotationIsNotPresent() {
+		evaluateCondition();
+		assertEnabled();
+		assertReasonContains("@DisabledOnJre is not present");
+	}
+
+	/**
+	 * @see DisabledOnJreIntegrationTests#missingJreDeclaration()
+	 */
+	@Test
+	void missingJreDeclaration() {
+		Exception exception = assertThrows(PreconditionViolationException.class, this::evaluateCondition);
+		assertThat(exception).hasMessageContaining("You must declare at least one JRE");
+	}
+
+	/**
+	 * @see DisabledOnJreIntegrationTests#disabledOnAllJavaVersions()
+	 */
+	@Test
+	void disabledOnAllJavaVersions() {
+		evaluateCondition();
+		assertDisabledOnCurrentJreIf(true);
+		assertCustomDisabledReasonIs("Disabled on every JRE");
+	}
+@for(var jre : jres)
+	/**
+	 * @see DisabledOnJreIntegrationTests#java${jre.getVersion()}()
+	 */
+	@Test
+	void java${jre.getVersion()}() {
+		evaluateCondition();
+		assertDisabledOnCurrentJreIf(onJava${jre.getVersion()}());
+	}
+@endfor
+	/**
+	 * @see DisabledOnJreIntegrationTests#other()
+	 */
+	@Test
+	void other() {
+		evaluateCondition();
+		assertDisabledOnCurrentJreIf(!onKnownVersion());
+	}
+
+	private void assertDisabledOnCurrentJreIf(boolean condition) {
+		if (condition) {
+			assertDisabled();
+			assertReasonContains("Disabled on JRE version: " + System.getProperty("java.version"));
+		}
+		else {
+			assertEnabled();
+			assertReasonContains("Enabled on JRE version: " + System.getProperty("java.version"));
+		}
+	}
+
+}
diff --git a/junit-jupiter-engine/src/templates/resources/test/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java.jte b/junit-jupiter-engine/src/templates/resources/test/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java.jte
new file mode 100644
index 000000000000..6d86cd5c670b
--- /dev/null
+++ b/junit-jupiter-engine/src/templates/resources/test/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java.jte
@@ -0,0 +1,66 @@
+@import java.util.List
+@import junitbuild.generator.model.JRE
+
+@param List<JRE> jres
+@param List<JRE> jresSortedByStringValue
+@param String licenseHeader
+${licenseHeader}
+package org.junit.jupiter.api.condition;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+@for(var jre : jresSortedByStringValue)<%--
+--%>import static org.junit.jupiter.api.condition.JRE.JAVA_${jre.getVersion()};
+@endfor<%--
+--%>import static org.junit.jupiter.api.condition.JRE.OTHER;
+@for(var jre : jresSortedByStringValue)<%--
+--%>import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava${jre.getVersion()};
+@endfor<%--
+--%>import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Integration tests for {@link DisabledOnJre}.
+ *
+ * @since 5.1
+ */
+class DisabledOnJreIntegrationTests {
+
+	@Test
+	@Disabled("Only used in a unit test via reflection")
+	void enabledBecauseAnnotationIsNotPresent() {
+	}
+
+	@Test
+	@Disabled("Only used in a unit test via reflection")
+	@DisabledOnJre({})
+	void missingJreDeclaration() {
+	}
+
+	@Test
+	@DisabledOnJre(disabledReason = "Disabled on every JRE", value = { //
+@for(var jre : jres)<%--
+--%>			JAVA_${jre.getVersion()}, //
+@endfor<%--
+--%>			OTHER //
+	})
+	void disabledOnAllJavaVersions() {
+		fail("should be disabled");
+	}
+@for(var jre : jres)
+	@Test
+	@DisabledOnJre(JAVA_${jre.getVersion()})
+	void java${jre.getVersion()}() {
+		assertFalse(onJava${jre.getVersion()}());
+	}
+@endfor
+	@Test
+	@DisabledOnJre(OTHER)
+	void other() {
+		assertTrue(onKnownVersion());
+	}
+
+}
diff --git a/junit-jupiter-engine/src/templates/resources/test/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java.jte b/junit-jupiter-engine/src/templates/resources/test/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java.jte
new file mode 100644
index 000000000000..81c9e1cc4dfd
--- /dev/null
+++ b/junit-jupiter-engine/src/templates/resources/test/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java.jte
@@ -0,0 +1,99 @@
+@import java.util.List
+@import junitbuild.generator.model.JRE
+
+@param List<JRE> jres
+@param List<JRE> jresSortedByStringValue
+@param String licenseHeader
+${licenseHeader}
+package org.junit.jupiter.api.condition;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+@for(var jre : jresSortedByStringValue)<%--
+--%>import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava${jre.getVersion()};
+@endfor<%--
+--%>import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.platform.commons.PreconditionViolationException;
+
+/**
+ * Unit tests for {@link EnabledOnJreCondition}.
+ *
+ * <p>Note that test method names MUST match the test method names in
+ * {@link EnabledOnJreIntegrationTests}.
+ *
+ * @since 5.1
+ */
+class EnabledOnJreConditionTests extends AbstractExecutionConditionTests {
+
+	@Override
+	protected ExecutionCondition getExecutionCondition() {
+		return new EnabledOnJreCondition();
+	}
+
+	@Override
+	protected Class<?> getTestClass() {
+		return EnabledOnJreIntegrationTests.class;
+	}
+
+	/**
+	 * @see EnabledOnJreIntegrationTests#enabledBecauseAnnotationIsNotPresent()
+	 */
+	@Test
+	void enabledBecauseAnnotationIsNotPresent() {
+		evaluateCondition();
+		assertEnabled();
+		assertReasonContains("@EnabledOnJre is not present");
+	}
+
+	/**
+	 * @see EnabledOnJreIntegrationTests#missingJreDeclaration()
+	 */
+	@Test
+	void missingJreDeclaration() {
+		Exception exception = assertThrows(PreconditionViolationException.class, this::evaluateCondition);
+		assertThat(exception).hasMessageContaining("You must declare at least one JRE");
+	}
+
+	/**
+	 * @see EnabledOnJreIntegrationTests#enabledOnAllJavaVersions()
+	 */
+	@Test
+	void enabledOnAllJavaVersions() {
+		evaluateCondition();
+		assertEnabledOnCurrentJreIf(true);
+	}
+@for(var jre : jres)
+	/**
+	 * @see EnabledOnJreIntegrationTests#java${jre.getVersion()}()
+	 */
+	@Test
+	void java${jre.getVersion()}() {
+		evaluateCondition();
+		assertEnabledOnCurrentJreIf(onJava${jre.getVersion()}());
+	}
+@endfor
+	/**
+	 * @see EnabledOnJreIntegrationTests#other()
+	 */
+	@Test
+	void other() {
+		evaluateCondition();
+		assertEnabledOnCurrentJreIf(!onKnownVersion());
+		assertCustomDisabledReasonIs("Disabled on almost every JRE");
+	}
+
+	private void assertEnabledOnCurrentJreIf(boolean condition) {
+		if (condition) {
+			assertEnabled();
+			assertReasonContains("Enabled on JRE version: " + System.getProperty("java.version"));
+		}
+		else {
+			assertDisabled();
+			assertReasonContains("Disabled on JRE version: " + System.getProperty("java.version"));
+		}
+	}
+
+}
diff --git a/junit-jupiter-engine/src/templates/resources/test/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java.jte b/junit-jupiter-engine/src/templates/resources/test/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java.jte
new file mode 100644
index 000000000000..7aee1f374c73
--- /dev/null
+++ b/junit-jupiter-engine/src/templates/resources/test/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java.jte
@@ -0,0 +1,64 @@
+@import java.util.List
+@import junitbuild.generator.model.JRE
+
+@param List<JRE> jres
+@param List<JRE> jresSortedByStringValue
+@param String licenseHeader
+${licenseHeader}
+package org.junit.jupiter.api.condition;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+@for(var jre : jresSortedByStringValue)<%--
+--%>import static org.junit.jupiter.api.condition.JRE.JAVA_${jre.getVersion()};
+@endfor<%--
+--%>import static org.junit.jupiter.api.condition.JRE.OTHER;
+@for(var jre : jresSortedByStringValue)<%--
+--%>import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava${jre.getVersion()};
+@endfor<%--
+--%>import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Integration tests for {@link EnabledOnJre}.
+ *
+ * @since 5.1
+ */
+class EnabledOnJreIntegrationTests {
+
+	@Test
+	@Disabled("Only used in a unit test via reflection")
+	void enabledBecauseAnnotationIsNotPresent() {
+	}
+
+	@Test
+	@Disabled("Only used in a unit test via reflection")
+	@EnabledOnJre({})
+	void missingJreDeclaration() {
+	}
+
+	@Test
+	@EnabledOnJre({ //
+@for(var jre : jres)<%--
+--%>			JAVA_${jre.getVersion()}, //
+@endfor<%--
+--%>			OTHER //
+	})
+	void enabledOnAllJavaVersions() {
+	}
+@for(var jre : jres)
+	@Test
+	@EnabledOnJre(JAVA_${jre.getVersion()})
+	void java${jre.getVersion()}() {
+		assertTrue(onJava${jre.getVersion()}());
+	}
+@endfor
+	@Test
+	@EnabledOnJre(value = OTHER, disabledReason = "Disabled on almost every JRE")
+	void other() {
+		assertFalse(onKnownVersion());
+	}
+
+}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
index eacff791df05..01036e36a5a7 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
@@ -11,22 +11,19 @@
 package org.junit.jupiter.api.condition;
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava10;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava11;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava12;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava13;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava14;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava22;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava23;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava10;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava11;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava12;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava13;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava14;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava15;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava16;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava17;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava18;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava19;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava8;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava9;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExecutionCondition;
@@ -107,7 +104,7 @@ void javaMax18() {
 	@Test
 	void javaMin18() {
 		evaluateCondition();
-		assertDisabledOnCurrentJreIf(!(onJava17()));
+		assertDisabledOnCurrentJreIf(!onJava17());
 	}
 
 	/**
@@ -116,9 +113,7 @@ void javaMin18() {
 	@Test
 	void other() {
 		evaluateCondition();
-		assertDisabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20()
-				|| onJava21() || onJava22() || onJava23()));
+		assertDisabledOnCurrentJreIf(!onKnownVersion());
 	}
 
 	private void assertDisabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
index 0b9d254cc20f..ff6ef050306b 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
@@ -13,26 +13,23 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava10;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava11;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava12;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava13;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava14;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava22;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava23;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_17;
 import static org.junit.jupiter.api.condition.JRE.JAVA_18;
 import static org.junit.jupiter.api.condition.JRE.JAVA_19;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava10;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava11;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava12;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava13;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava14;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava15;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava16;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava17;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava18;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava19;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava8;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava9;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -84,9 +81,7 @@ void javaMin18() {
 	@Test
 	@DisabledForJreRange(min = OTHER, max = OTHER)
 	void other() {
-		assertTrue(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21()
-				|| onJava22() || onJava23());
+		assertTrue(onKnownVersion());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
deleted file mode 100644
index 60a7866204f6..000000000000
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright 2015-2024 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.jupiter.api.condition;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava10;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava11;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava12;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava13;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava14;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava22;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava23;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExecutionCondition;
-import org.junit.platform.commons.PreconditionViolationException;
-
-/**
- * Unit tests for {@link DisabledOnJreCondition}.
- *
- * <p>Note that test method names MUST match the test method names in
- * {@link DisabledOnJreIntegrationTests}.
- *
- * @since 5.1
- */
-class DisabledOnJreConditionTests extends AbstractExecutionConditionTests {
-
-	@Override
-	protected ExecutionCondition getExecutionCondition() {
-		return new DisabledOnJreCondition();
-	}
-
-	@Override
-	protected Class<?> getTestClass() {
-		return DisabledOnJreIntegrationTests.class;
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#enabledBecauseAnnotationIsNotPresent()
-	 */
-	@Test
-	void enabledBecauseAnnotationIsNotPresent() {
-		evaluateCondition();
-		assertEnabled();
-		assertReasonContains("@DisabledOnJre is not present");
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#missingJreDeclaration()
-	 */
-	@Test
-	void missingJreDeclaration() {
-		Exception exception = assertThrows(PreconditionViolationException.class, this::evaluateCondition);
-		assertThat(exception).hasMessageContaining("You must declare at least one JRE");
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#disabledOnAllJavaVersions()
-	 */
-	@Test
-	void disabledOnAllJavaVersions() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(true);
-		assertCustomDisabledReasonIs("Disabled on every JRE");
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#java8()
-	 */
-	@Test
-	void java8() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava8());
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#java9()
-	 */
-	@Test
-	void java9() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava9());
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#java10()
-	 */
-	@Test
-	void java10() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava10());
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#java11()
-	 */
-	@Test
-	void java11() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava11());
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#java12()
-	 */
-	@Test
-	void java12() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava12());
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#java13()
-	 */
-	@Test
-	void java13() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava13());
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#java14()
-	 */
-	@Test
-	void java14() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava14());
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#java15()
-	 */
-	@Test
-	void java15() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava15());
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#java16()
-	 */
-	@Test
-	void java16() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava16());
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#java17()
-	 */
-	@Test
-	void java17() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava17());
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#java18()
-	 */
-	@Test
-	void java18() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava18());
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#java19()
-	 */
-	@Test
-	void java19() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava19());
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#java20()
-	 */
-	@Test
-	void java20() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava20());
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#java21()
-	 */
-	@Test
-	void java21() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava21());
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#java22()
-	 */
-	@Test
-	void java22() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava22());
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#java23()
-	 */
-	@Test
-	void java23() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(onJava23());
-	}
-
-	/**
-	 * @see DisabledOnJreIntegrationTests#other()
-	 */
-	@Test
-	void other() {
-		evaluateCondition();
-		assertDisabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20()
-				|| onJava21() || onJava22() || onJava23()));
-	}
-
-	private void assertDisabledOnCurrentJreIf(boolean condition) {
-		if (condition) {
-			assertDisabled();
-			assertReasonContains("Disabled on JRE version: " + System.getProperty("java.version"));
-		}
-		else {
-			assertEnabled();
-			assertReasonContains("Enabled on JRE version: " + System.getProperty("java.version"));
-		}
-	}
-
-}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
deleted file mode 100644
index f0e6078aadce..000000000000
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright 2015-2024 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.jupiter.api.condition;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava10;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava11;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava12;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava13;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava14;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava22;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava23;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
-import static org.junit.jupiter.api.condition.JRE.JAVA_10;
-import static org.junit.jupiter.api.condition.JRE.JAVA_11;
-import static org.junit.jupiter.api.condition.JRE.JAVA_12;
-import static org.junit.jupiter.api.condition.JRE.JAVA_13;
-import static org.junit.jupiter.api.condition.JRE.JAVA_14;
-import static org.junit.jupiter.api.condition.JRE.JAVA_15;
-import static org.junit.jupiter.api.condition.JRE.JAVA_16;
-import static org.junit.jupiter.api.condition.JRE.JAVA_17;
-import static org.junit.jupiter.api.condition.JRE.JAVA_18;
-import static org.junit.jupiter.api.condition.JRE.JAVA_19;
-import static org.junit.jupiter.api.condition.JRE.JAVA_20;
-import static org.junit.jupiter.api.condition.JRE.JAVA_21;
-import static org.junit.jupiter.api.condition.JRE.JAVA_22;
-import static org.junit.jupiter.api.condition.JRE.JAVA_23;
-import static org.junit.jupiter.api.condition.JRE.JAVA_8;
-import static org.junit.jupiter.api.condition.JRE.JAVA_9;
-import static org.junit.jupiter.api.condition.JRE.OTHER;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-/**
- * Integration tests for {@link DisabledOnJre}.
- *
- * @since 5.1
- */
-class DisabledOnJreIntegrationTests {
-
-	@Test
-	@Disabled("Only used in a unit test via reflection")
-	void enabledBecauseAnnotationIsNotPresent() {
-	}
-
-	@Test
-	@Disabled("Only used in a unit test via reflection")
-	@DisabledOnJre({})
-	void missingJreDeclaration() {
-	}
-
-	@Test
-	@DisabledOnJre(value = { JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16, JAVA_17,
-			JAVA_18, JAVA_19, JAVA_20, JAVA_21, JAVA_22, JAVA_23, OTHER }, disabledReason = "Disabled on every JRE")
-	void disabledOnAllJavaVersions() {
-		fail("should be disabled");
-	}
-
-	@Test
-	@DisabledOnJre(JAVA_8)
-	void java8() {
-		assertFalse(onJava8());
-	}
-
-	@Test
-	@DisabledOnJre(JAVA_9)
-	void java9() {
-		assertFalse(onJava9());
-	}
-
-	@Test
-	@DisabledOnJre(JAVA_10)
-	void java10() {
-		assertFalse(onJava10());
-	}
-
-	@Test
-	@DisabledOnJre(JAVA_11)
-	void java11() {
-		assertFalse(onJava11());
-	}
-
-	@Test
-	@DisabledOnJre(JAVA_12)
-	void java12() {
-		assertFalse(onJava12());
-	}
-
-	@Test
-	@DisabledOnJre(JAVA_13)
-	void java13() {
-		assertFalse(onJava13());
-	}
-
-	@Test
-	@DisabledOnJre(JAVA_14)
-	void java14() {
-		assertFalse(onJava14());
-	}
-
-	@Test
-	@DisabledOnJre(JAVA_15)
-	void java15() {
-		assertFalse(onJava15());
-	}
-
-	@Test
-	@DisabledOnJre(JAVA_16)
-	void java16() {
-		assertFalse(onJava16());
-	}
-
-	@Test
-	@DisabledOnJre(JAVA_17)
-	void java17() {
-		assertFalse(onJava17());
-	}
-
-	@Test
-	@DisabledOnJre(JAVA_18)
-	void java18() {
-		assertFalse(onJava18());
-	}
-
-	@Test
-	@DisabledOnJre(JAVA_19)
-	void java19() {
-		assertFalse(onJava19());
-	}
-
-	@Test
-	@DisabledOnJre(JAVA_20)
-	void java20() {
-		assertFalse(onJava20());
-	}
-
-	@Test
-	@DisabledOnJre(JAVA_21)
-	void java21() {
-		assertFalse(onJava21());
-	}
-
-	@Test
-	@DisabledOnJre(JAVA_22)
-	void java22() {
-		assertFalse(onJava22());
-	}
-
-	@Test
-	@DisabledOnJre(JAVA_23)
-	void java23() {
-		assertFalse(onJava23());
-	}
-
-	@Test
-	@DisabledOnJre(OTHER)
-	void other() {
-		assertTrue(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21()
-				|| onJava22() || onJava23());
-	}
-
-}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
index 181d7d270947..03b870b462ea 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
@@ -11,22 +11,19 @@
 package org.junit.jupiter.api.condition;
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava10;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava11;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava12;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava13;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava14;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava22;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava23;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava10;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava11;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava12;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava13;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava14;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava15;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava16;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava17;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava18;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava19;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava8;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava9;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExecutionCondition;
@@ -115,9 +112,7 @@ void javaMin18() {
 	@Test
 	void other() {
 		evaluateCondition();
-		assertEnabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20()
-				|| onJava21() || onJava22() || onJava23()));
+		assertEnabledOnCurrentJreIf(!onKnownVersion());
 	}
 
 	private void assertEnabledOnCurrentJreIf(boolean condition) {
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
index 78f6ca919b2b..074b26f01da5 100644
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
+++ b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
@@ -13,27 +13,23 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava10;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava11;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava12;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava13;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava14;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava22;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava23;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava24;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
 import static org.junit.jupiter.api.condition.JRE.JAVA_17;
 import static org.junit.jupiter.api.condition.JRE.JAVA_18;
 import static org.junit.jupiter.api.condition.JRE.JAVA_19;
 import static org.junit.jupiter.api.condition.JRE.OTHER;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava10;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava11;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava12;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava13;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava14;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava15;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava16;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava17;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava18;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava19;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava8;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava9;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -81,16 +77,15 @@ void javaMax18() {
 	@Test
 	@EnabledForJreRange(min = JAVA_18)
 	void javaMin18() {
-		assertTrue(onJava18() || onJava19() || onJava20() || onJava21() || onJava22() || onJava23() || onJava24());
+		assertTrue(onKnownVersion());
+		assertTrue(JRE.currentVersion().compareTo(JAVA_18) >= 0);
 		assertFalse(onJava17());
 	}
 
 	@Test
 	@EnabledForJreRange(min = OTHER, max = OTHER)
 	void other() {
-		assertFalse(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14()
-				|| onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21()
-				|| onJava22() || onJava23());
+		assertFalse(onKnownVersion());
 	}
 
 }
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
deleted file mode 100644
index 591e8c25b7b9..000000000000
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright 2015-2024 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.jupiter.api.condition;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava10;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava11;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava12;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava13;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava14;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava15;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava16;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava17;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava18;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava19;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava20;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava21;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava22;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava23;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava8;
-import static org.junit.jupiter.api.condition.EnabledOnJreIntegrationTests.onJava9;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExecutionCondition;
-import org.junit.platform.commons.PreconditionViolationException;
-
-/**
- * Unit tests for {@link EnabledOnJreCondition}.
- *
- * <p>Note that test method names MUST match the test method names in
- * {@link EnabledOnJreIntegrationTests}.
- *
- * @since 5.1
- */
-class EnabledOnJreConditionTests extends AbstractExecutionConditionTests {
-
-	@Override
-	protected ExecutionCondition getExecutionCondition() {
-		return new EnabledOnJreCondition();
-	}
-
-	@Override
-	protected Class<?> getTestClass() {
-		return EnabledOnJreIntegrationTests.class;
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#enabledBecauseAnnotationIsNotPresent()
-	 */
-	@Test
-	void enabledBecauseAnnotationIsNotPresent() {
-		evaluateCondition();
-		assertEnabled();
-		assertReasonContains("@EnabledOnJre is not present");
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#missingJreDeclaration()
-	 */
-	@Test
-	void missingJreDeclaration() {
-		Exception exception = assertThrows(PreconditionViolationException.class, this::evaluateCondition);
-		assertThat(exception).hasMessageContaining("You must declare at least one JRE");
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#enabledOnAllJavaVersions()
-	 */
-	@Test
-	void enabledOnAllJavaVersions() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(true);
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#java8()
-	 */
-	@Test
-	void java8() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava8());
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#java9()
-	 */
-	@Test
-	void java9() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava9());
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#java10()
-	 */
-	@Test
-	void java10() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava10());
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#java11()
-	 */
-	@Test
-	void java11() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava11());
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#java12()
-	 */
-	@Test
-	void java12() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava12());
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#java13()
-	 */
-	@Test
-	void java13() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava13());
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#java14()
-	 */
-	@Test
-	void java14() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava14());
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#java15()
-	 */
-	@Test
-	void java15() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava15());
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#java16()
-	 */
-	@Test
-	void java16() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava16());
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#java17()
-	 */
-	@Test
-	void java17() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava17());
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#java18()
-	 */
-	@Test
-	void java18() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava18());
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#java19()
-	 */
-	@Test
-	void java19() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava19());
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#java20()
-	 */
-	@Test
-	void java20() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava20());
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#java21()
-	 */
-	@Test
-	void java21() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava21());
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#java22()
-	 */
-	@Test
-	void java22() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava22());
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#java23()
-	 */
-	@Test
-	void java23() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava23());
-	}
-
-	/**
-	 * @see EnabledOnJreIntegrationTests#other()
-	 */
-	@Test
-	void other() {
-		evaluateCondition();
-		assertEnabledOnCurrentJreIf(!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13()
-				|| onJava14() || onJava15() || onJava16() || onJava17() || onJava18() || onJava19() || onJava20()
-				|| onJava21() || onJava22() || onJava23()));
-		assertCustomDisabledReasonIs("Disabled on almost every JRE");
-	}
-
-	private void assertEnabledOnCurrentJreIf(boolean condition) {
-		if (condition) {
-			assertEnabled();
-			assertReasonContains("Enabled on JRE version: " + System.getProperty("java.version"));
-		}
-		else {
-			assertDisabled();
-			assertReasonContains("Disabled on JRE version: " + System.getProperty("java.version"));
-		}
-	}
-
-}
diff --git a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java b/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
deleted file mode 100644
index c146681e881c..000000000000
--- a/junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright 2015-2024 the original author or authors.
- *
- * All rights reserved. This program and the accompanying materials are
- * made available under the terms of the Eclipse Public License v2.0 which
- * accompanies this distribution and is available at
- *
- * https://www.eclipse.org/legal/epl-v20.html
- */
-
-package org.junit.jupiter.api.condition;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.condition.JRE.JAVA_10;
-import static org.junit.jupiter.api.condition.JRE.JAVA_11;
-import static org.junit.jupiter.api.condition.JRE.JAVA_12;
-import static org.junit.jupiter.api.condition.JRE.JAVA_13;
-import static org.junit.jupiter.api.condition.JRE.JAVA_14;
-import static org.junit.jupiter.api.condition.JRE.JAVA_15;
-import static org.junit.jupiter.api.condition.JRE.JAVA_16;
-import static org.junit.jupiter.api.condition.JRE.JAVA_17;
-import static org.junit.jupiter.api.condition.JRE.JAVA_18;
-import static org.junit.jupiter.api.condition.JRE.JAVA_19;
-import static org.junit.jupiter.api.condition.JRE.JAVA_20;
-import static org.junit.jupiter.api.condition.JRE.JAVA_21;
-import static org.junit.jupiter.api.condition.JRE.JAVA_22;
-import static org.junit.jupiter.api.condition.JRE.JAVA_23;
-import static org.junit.jupiter.api.condition.JRE.JAVA_8;
-import static org.junit.jupiter.api.condition.JRE.JAVA_9;
-import static org.junit.jupiter.api.condition.JRE.OTHER;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-/**
- * Integration tests for {@link EnabledOnJre}.
- *
- * @since 5.1
- */
-class EnabledOnJreIntegrationTests {
-
-	private static final String JAVA_VERSION = System.getProperty("java.version");
-
-	@Test
-	@Disabled("Only used in a unit test via reflection")
-	void enabledBecauseAnnotationIsNotPresent() {
-	}
-
-	@Test
-	@Disabled("Only used in a unit test via reflection")
-	@EnabledOnJre({})
-	void missingJreDeclaration() {
-	}
-
-	@Test
-	@EnabledOnJre({ JAVA_8, JAVA_9, JAVA_10, JAVA_11, JAVA_12, JAVA_13, JAVA_14, JAVA_15, JAVA_16, JAVA_17, JAVA_18,
-			JAVA_19, JAVA_20, JAVA_21, JAVA_22, JAVA_23, OTHER })
-	void enabledOnAllJavaVersions() {
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_8)
-	void java8() {
-		assertTrue(onJava8());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_9)
-	void java9() {
-		assertTrue(onJava9());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_10)
-	void java10() {
-		assertTrue(onJava10());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_11)
-	void java11() {
-		assertTrue(onJava11());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_12)
-	void java12() {
-		assertTrue(onJava12());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_13)
-	void java13() {
-		assertTrue(onJava13());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_14)
-	void java14() {
-		assertTrue(onJava14());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_15)
-	void java15() {
-		assertTrue(onJava15());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_16)
-	void java16() {
-		assertTrue(onJava16());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_17)
-	void java17() {
-		assertTrue(onJava17());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_18)
-	void java18() {
-		assertTrue(onJava18());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_19)
-	void java19() {
-		assertTrue(onJava19());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_20)
-	void java20() {
-		assertTrue(onJava20());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_21)
-	void java21() {
-		assertTrue(onJava21());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_22)
-	void java22() {
-		assertTrue(onJava22());
-	}
-
-	@Test
-	@EnabledOnJre(JAVA_23)
-	void java23() {
-		assertTrue(onJava23());
-	}
-
-	@Test
-	@EnabledOnJre(value = OTHER, disabledReason = "Disabled on almost every JRE")
-	void other() {
-		assertFalse(
-			onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
-					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22());
-	}
-
-	static boolean onJava8() {
-		return JAVA_VERSION.startsWith("1.8");
-	}
-
-	static boolean onJava9() {
-		return JAVA_VERSION.startsWith("9");
-	}
-
-	static boolean onJava10() {
-		return JAVA_VERSION.startsWith("10");
-	}
-
-	static boolean onJava11() {
-		return JAVA_VERSION.startsWith("11");
-	}
-
-	static boolean onJava12() {
-		return JAVA_VERSION.startsWith("12");
-	}
-
-	static boolean onJava13() {
-		return JAVA_VERSION.startsWith("13");
-	}
-
-	static boolean onJava14() {
-		return JAVA_VERSION.startsWith("14");
-	}
-
-	static boolean onJava15() {
-		return JAVA_VERSION.startsWith("15");
-	}
-
-	static boolean onJava16() {
-		return JAVA_VERSION.startsWith("16");
-	}
-
-	static boolean onJava17() {
-		return JAVA_VERSION.startsWith("17");
-	}
-
-	static boolean onJava18() {
-		return JAVA_VERSION.startsWith("18");
-	}
-
-	static boolean onJava19() {
-		return JAVA_VERSION.startsWith("19");
-	}
-
-	static boolean onJava20() {
-		return JAVA_VERSION.startsWith("20");
-	}
-
-	static boolean onJava21() {
-		return JAVA_VERSION.startsWith("21");
-	}
-
-	static boolean onJava22() {
-		return JAVA_VERSION.startsWith("22");
-	}
-
-	static boolean onJava23() {
-		return JAVA_VERSION.startsWith("23");
-	}
-
-	static boolean onJava24() {
-		return JAVA_VERSION.startsWith("24");
-	}
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d740bfb9e8d9..9971e3ec5301 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -72,6 +72,8 @@ buildCache {
 	}
 }
 
+includeBuild("gradle/base")
+
 rootProject.name = "junit5"
 
 include("documentation")