From bc53d0255098bec36de60ae28519292321c1569a Mon Sep 17 00:00:00 2001
From: Abel Salgado Romero <abelromero@gmail.com>
Date: Thu, 21 Sep 2023 21:10:50 +0200
Subject: [PATCH] Replace Java 19 by 21 (LTS) in CI

* Bump Spring Boot test to v3.1.3
---
 .github/workflows/continuous-integration.yaml               | 4 ++--
 CHANGELOG.adoc                                              | 1 +
 .../springboot-app/build.gradle                             | 6 +++---
 build.gradle                                                | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
index 48e0b15a..f95bad9e 100644
--- a/.github/workflows/continuous-integration.yaml
+++ b/.github/workflows/continuous-integration.yaml
@@ -23,7 +23,7 @@ jobs:
         java:
           - '11'
           - '17'
-          - '19'
+          - '21'
         os:
           - ubuntu-latest
           - macos-latest
@@ -50,7 +50,7 @@ jobs:
         java:
           - '11'
           - '17'
-          - '19'
+          - '21'
         os:
           - windows-latest
     runs-on: ${{ matrix.os }}
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index 5a1c0a2d..9b7ef6ae 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -64,6 +64,7 @@ Build Improvement::
 * Set JUnit5 as default test engine (#1186) (@abelsromero)
 * Removed pollutedTest Gradle task using junit-pioneer (#1193) (@abelsromero)
 * Ignore 'docs/**' changes in CI (#1225) (@abelsromero)
+* Run tests on Java 21 (#1236) (@abelsromero)
 
 Documentation::
 
diff --git a/asciidoctorj-springboot-integration-test/springboot-app/build.gradle b/asciidoctorj-springboot-integration-test/springboot-app/build.gradle
index 7cffbc5c..a43cc5f6 100644
--- a/asciidoctorj-springboot-integration-test/springboot-app/build.gradle
+++ b/asciidoctorj-springboot-integration-test/springboot-app/build.gradle
@@ -2,7 +2,7 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
 plugins {
-	id 'org.springframework.boot' version '3.1.0'
+	id 'org.springframework.boot' version '3.1.3'
 	id 'java'
 }
 
@@ -31,8 +31,8 @@ java {
 
 def getToolchainVersion() {
 	if (DefaultNativePlatform.getCurrentOperatingSystem().isWindows()) {
-		if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_19))
-			return 19
+		if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21))
+			return 21
 	}
 	return 17
 }
diff --git a/build.gradle b/build.gradle
index b2c52b06..3bd48536 100644
--- a/build.gradle
+++ b/build.gradle
@@ -239,8 +239,8 @@ configure(subprojects.findAll { !it.name.endsWith('-distribution') && ! it.name.
 // Windows workaround to fix invalid toolchain detection
 def getToolchainVersion() {
   if (DefaultNativePlatform.getCurrentOperatingSystem().isWindows()) {
-    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_19))
-      return 19
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21))
+      return 21
     if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17))
       return 17
   }