Upgrade to Asciidoctor Gradle Plugin 4.0.2

Closes gh-40536

Author: wilkinsona

buildSrc/build.gradle

@@ -48,7 +48,7 @@ dependencies {
 	implementation("de.undercouch.download:de.undercouch.download.gradle.plugin:5.5.0")
 	implementation("io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}")
 	implementation("org.apache.maven:maven-embedder:${versions.maven}")
-	implementation("org.asciidoctor:asciidoctor-gradle-jvm:3.3.2")
+	implementation("org.asciidoctor:asciidoctor-gradle-jvm:4.0.2")
 	implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}")
 	implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${versions.kotlin}")
 	implementation("org.springframework:spring-context")

buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java

@@ -25,7 +25,6 @@
 import org.asciidoctor.gradle.jvm.AsciidoctorJExtension;
 import org.asciidoctor.gradle.jvm.AsciidoctorJPlugin;
 import org.asciidoctor.gradle.jvm.AsciidoctorTask;
-import org.gradle.api.JavaVersion;
 import org.gradle.api.Project;
 import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.api.tasks.Sync;
@@ -120,16 +119,14 @@ private void configureCommonAttributes(Project project, AbstractAsciidoctorTask
 		attributes.put("github-tag", determineGitHubTag(project));
 		attributes.put("artifact-release-type", artifacts.getType());
 		attributes.put("artifact-download-repo", artifacts.getDownloadRepo());
-		attributes.put("revnumber", null);
+		attributes.put("revnumber", project.getVersion());
 		asciidoctorTask.attributes(attributes);
 	}
 
 	// See https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/597
 	private void configureForkOptions(AbstractAsciidoctorTask asciidoctorTask) {
-		if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
-			asciidoctorTask.forkOptions((options) -> options.jvmArgs("--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED",
-					"--add-opens", "java.base/java.io=ALL-UNNAMED"));
-		}
+		asciidoctorTask.jvm((options) -> options.jvmArgs("--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED",
+				"--add-opens", "java.base/java.io=ALL-UNNAMED"));
 	}
 
 	private String determineGitHubTag(Project project) {