From b7314115ee1d9315e601696fb4e7dbb026903ad6 Mon Sep 17 00:00:00 2001
From: New Media Works <oss@newmediaworks.com>
Date: Tue, 11 Jul 2023 00:43:44 +0000
Subject: [PATCH] Replaced JDK 19 with JDK 20 in Jenkins build matrices.

---
 Jenkinsfile      | 18 +++++++++---------
 book/Jenkinsfile | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 85a06b8b..b010e0fa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,8 +23,8 @@
  */
 
 // JDK versions
-def buildJdks = ['1.8', '11', '17', '19'] // Changes must be copied to matrix axes!
-def testJdks  = ['1.8', '11', '17', '19'] // Changes must be copied to matrix axes!
+def buildJdks = ['1.8', '11', '17', '20'] // Changes must be copied to matrix axes!
+def testJdks  = ['1.8', '11', '17', '20'] // Changes must be copied to matrix axes!
 
 // Parent, Extensions, Plugins, Direct and BOM Dependencies
 def upstreamProjects = [
@@ -100,11 +100,11 @@ def upstreamProjects = [
  *                      Defaults to '17'                                                  *
  *                                                                                        *
  * buildJdks            The array of JDK versions that will build.                        *
- *                      Defaults to ['11', '17', '19']                                    *
+ *                      Defaults to ['11', '17', '20']                                    *
  *                      Changes must be copied to matrix axes!                            *
  *                                                                                        *
  * testJdks             The array of JDK versions that will test against every build JDK. *
- *                      Defaults to ['11', '17', '19']                                    *
+ *                      Defaults to ['11', '17', '20']                                    *
  *                      Changes must be copied to matrix axes!                            *
  *                                                                                        *
  * upstreamProjects     The array of relative paths to upstream projects.                 *
@@ -199,13 +199,13 @@ if (!binding.hasVariable('deployJdk')) {
 if (!binding.hasVariable('buildJdks')) {
   binding.setVariable(
     'buildJdks',
-    ['11', '17', '19'] // Changes must be copied to matrix axes!
+    ['11', '17', '20'] // Changes must be copied to matrix axes!
   )
 }
 if (!binding.hasVariable('testJdks')) {
   binding.setVariable(
     'testJdks',
-    ['11', '17', '19'] // Changes must be copied to matrix axes!
+    ['11', '17', '20'] // Changes must be copied to matrix axes!
   )
 }
 if (!binding.hasVariable('upstreamProjects')) {
@@ -813,7 +813,7 @@ pipeline {
         axes {
           axis {
             name 'jdk'
-            values '1.8', '11', '17', '19' // buildJdks
+            values '1.8', '11', '17', '20' // buildJdks
           }
         }
         stages {
@@ -859,11 +859,11 @@ pipeline {
         axes {
           axis {
             name 'jdk'
-            values '1.8', '11', '17', '19' // buildJdks
+            values '1.8', '11', '17', '20' // buildJdks
           }
           axis {
             name 'testJdk'
-            values '1.8', '11', '17', '19' // testJdks
+            values '1.8', '11', '17', '20' // testJdks
           }
         }
         stages {
diff --git a/book/Jenkinsfile b/book/Jenkinsfile
index 1f868a7f..7a3b40cc 100644
--- a/book/Jenkinsfile
+++ b/book/Jenkinsfile
@@ -58,11 +58,11 @@ def upstreamProjects = [
  *                      Defaults to '17'                                                  *
  *                                                                                        *
  * buildJdks            The array of JDK versions that will build.                        *
- *                      Defaults to ['11', '17', '19']                                    *
+ *                      Defaults to ['11', '17', '20']                                    *
  *                      Changes must be copied to matrix axes!                            *
  *                                                                                        *
  * testJdks             The array of JDK versions that will test against every build JDK. *
- *                      Defaults to ['11', '17', '19']                                    *
+ *                      Defaults to ['11', '17', '20']                                    *
  *                      Changes must be copied to matrix axes!                            *
  *                                                                                        *
  * upstreamProjects     The array of relative paths to upstream projects.                 *
@@ -157,13 +157,13 @@ if (!binding.hasVariable('deployJdk')) {
 if (!binding.hasVariable('buildJdks')) {
   binding.setVariable(
     'buildJdks',
-    ['11', '17', '19'] // Changes must be copied to matrix axes!
+    ['11', '17', '20'] // Changes must be copied to matrix axes!
   )
 }
 if (!binding.hasVariable('testJdks')) {
   binding.setVariable(
     'testJdks',
-    ['11', '17', '19'] // Changes must be copied to matrix axes!
+    ['11', '17', '20'] // Changes must be copied to matrix axes!
   )
 }
 if (!binding.hasVariable('upstreamProjects')) {
@@ -771,7 +771,7 @@ pipeline {
         axes {
           axis {
             name 'jdk'
-            values '11', '17', '19' // buildJdks
+            values '11', '17', '20' // buildJdks
           }
         }
         stages {
@@ -817,11 +817,11 @@ pipeline {
         axes {
           axis {
             name 'jdk'
-            values '11', '17', '19' // buildJdks
+            values '11', '17', '20' // buildJdks
           }
           axis {
             name 'testJdk'
-            values '11', '17', '19' // testJdks
+            values '11', '17', '20' // testJdks
           }
         }
         stages {