From 4665267289dadd4107a6b8aa761aaf353366427e Mon Sep 17 00:00:00 2001
From: "AO Industries, Inc" <support@aoindustries.com>
Date: Mon, 8 Jan 2024 01:09:58 +0000
Subject: [PATCH] Added support for Java 21.

---
 Jenkinsfile                                   | 20 +++++++++----------
 book/Jenkinsfile                              | 20 +++++++++----------
 book/pom.xml                                  |  4 ++--
 .../META-INF/resources/parent/changelog.jspx  | 11 ++++++++--
 4 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e399331..89b8acf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 #!/usr/bin/env groovy
 /*
  * semanticcms-parent - Parent POM for all SemanticCMS packages.
- * Copyright (C) 2021, 2022, 2023  AO Industries, Inc.
+ * Copyright (C) 2021, 2022, 2023, 2024  AO Industries, Inc.
  *     support@aoindustries.com
  *     7262 Bull Pen Cir
  *     Mobile, AL 36695
@@ -47,14 +47,14 @@ def upstreamProjects = [
  * Variables that may be defined above this block:                                        *
  *                                                                                        *
  * deployJdk            The version of JDK that will be used for the deploy stage.        *
- *                      Defaults to '20'                                                  *
+ *                      Defaults to '21'                                                  *
  *                                                                                        *
  * buildJdks            The array of JDK versions that will build.                        *
- *                      Defaults to ['11', '17', '20']                                    *
+ *                      Defaults to ['11', '17', '21']                                    *
  *                      Changes must be copied to matrix axes!                            *
  *                                                                                        *
  * testJdks             The array of JDK versions that will test against every build JDK. *
- *                      Defaults to ['11', '17', '20']                                    *
+ *                      Defaults to ['11', '17', '21']                                    *
  *                      Changes must be copied to matrix axes!                            *
  *                                                                                        *
  * upstreamProjects     The array of relative paths to upstream projects.                 *
@@ -140,18 +140,18 @@ def upstreamProjects = [
 
 // JDK versions
 if (!binding.hasVariable('deployJdk')) {
-  binding.setVariable('deployJdk', '20')
+  binding.setVariable('deployJdk', '21')
 }
 if (!binding.hasVariable('buildJdks')) {
   binding.setVariable(
     'buildJdks',
-    ['11', '17', '20'] // Changes must be copied to matrix axes!
+    ['11', '17', '21'] // Changes must be copied to matrix axes!
   )
 }
 if (!binding.hasVariable('testJdks')) {
   binding.setVariable(
     'testJdks',
-    ['11', '17', '20'] // Changes must be copied to matrix axes!
+    ['11', '17', '21'] // Changes must be copied to matrix axes!
   )
 }
 if (!binding.hasVariable('upstreamProjects')) {
@@ -781,7 +781,7 @@ or any build that adds or removes build artifacts."""
         axes {
           axis {
             name 'jdk'
-            values '11', '17', '20' // buildJdks
+            values '11', '17', '21' // buildJdks
           }
         }
         stages {
@@ -827,11 +827,11 @@ or any build that adds or removes build artifacts."""
         axes {
           axis {
             name 'jdk'
-            values '11', '17', '20' // buildJdks
+            values '11', '17', '21' // buildJdks
           }
           axis {
             name 'testJdk'
-            values '11', '17', '20' // testJdks
+            values '11', '17', '21' // testJdks
           }
         }
         stages {
diff --git a/book/Jenkinsfile b/book/Jenkinsfile
index 00c18d0..aa40384 100644
--- a/book/Jenkinsfile
+++ b/book/Jenkinsfile
@@ -1,7 +1,7 @@
 #!/usr/bin/env groovy
 /*
  * semanticcms-parent - Parent POM for all SemanticCMS packages.
- * Copyright (C) 2021, 2022, 2023  AO Industries, Inc.
+ * Copyright (C) 2021, 2022, 2023, 2024  AO Industries, Inc.
  *     support@aoindustries.com
  *     7262 Bull Pen Cir
  *     Mobile, AL 36695
@@ -55,14 +55,14 @@ def upstreamProjects = [
  * Variables that may be defined above this block:                                        *
  *                                                                                        *
  * deployJdk            The version of JDK that will be used for the deploy stage.        *
- *                      Defaults to '20'                                                  *
+ *                      Defaults to '21'                                                  *
  *                                                                                        *
  * buildJdks            The array of JDK versions that will build.                        *
- *                      Defaults to ['11', '17', '20']                                    *
+ *                      Defaults to ['11', '17', '21']                                    *
  *                      Changes must be copied to matrix axes!                            *
  *                                                                                        *
  * testJdks             The array of JDK versions that will test against every build JDK. *
- *                      Defaults to ['11', '17', '20']                                    *
+ *                      Defaults to ['11', '17', '21']                                    *
  *                      Changes must be copied to matrix axes!                            *
  *                                                                                        *
  * upstreamProjects     The array of relative paths to upstream projects.                 *
@@ -148,18 +148,18 @@ def upstreamProjects = [
 
 // JDK versions
 if (!binding.hasVariable('deployJdk')) {
-  binding.setVariable('deployJdk', '20')
+  binding.setVariable('deployJdk', '21')
 }
 if (!binding.hasVariable('buildJdks')) {
   binding.setVariable(
     'buildJdks',
-    ['11', '17', '20'] // Changes must be copied to matrix axes!
+    ['11', '17', '21'] // Changes must be copied to matrix axes!
   )
 }
 if (!binding.hasVariable('testJdks')) {
   binding.setVariable(
     'testJdks',
-    ['11', '17', '20'] // Changes must be copied to matrix axes!
+    ['11', '17', '21'] // Changes must be copied to matrix axes!
   )
 }
 if (!binding.hasVariable('upstreamProjects')) {
@@ -789,7 +789,7 @@ or any build that adds or removes build artifacts."""
         axes {
           axis {
             name 'jdk'
-            values '11', '17', '20' // buildJdks
+            values '11', '17', '21' // buildJdks
           }
         }
         stages {
@@ -835,11 +835,11 @@ or any build that adds or removes build artifacts."""
         axes {
           axis {
             name 'jdk'
-            values '11', '17', '20' // buildJdks
+            values '11', '17', '21' // buildJdks
           }
           axis {
             name 'testJdk'
-            values '11', '17', '20' // testJdks
+            values '11', '17', '21' // testJdks
           }
         }
         stages {
diff --git a/book/pom.xml b/book/pom.xml
index 03c7045..2eaca0a 100644
--- a/book/pom.xml
+++ b/book/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 semanticcms-parent - Parent POM for all SemanticCMS packages.
-Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023  AO Industries, Inc.
+Copyright (C) 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024  AO Industries, Inc.
     support@aoindustries.com
     7262 Bull Pen Cir
     Mobile, AL 36695
@@ -170,7 +170,7 @@ along with semanticcms-parent.  If not, see <https://www.gnu.org/licenses/>.
     <dependencies>
       <!-- Direct -->
       <dependency>
-        <groupId>com.aoapps</groupId><artifactId>ao-badges</artifactId><version>1.10.1${POST-SNAPSHOT}</version>
+        <groupId>com.aoapps</groupId><artifactId>ao-badges</artifactId><version>1.11.0-SNAPSHOT<!-- ${POST-SNAPSHOT} --></version>
       </dependency>
       <dependency>
         <groupId>com.aoapps</groupId><artifactId>ao-taglib</artifactId><version>8.0.0-SNAPSHOT<!-- ${POST-SNAPSHOT} --></version>
diff --git a/book/src/main/resources-filtered/META-INF/resources/parent/changelog.jspx b/book/src/main/resources-filtered/META-INF/resources/parent/changelog.jspx
index 14c4625..f67bea4 100644
--- a/book/src/main/resources-filtered/META-INF/resources/parent/changelog.jspx
+++ b/book/src/main/resources-filtered/META-INF/resources/parent/changelog.jspx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 semanticcms-parent - Parent POM for all SemanticCMS packages.
-Copyright (C) 2016, 2017, 2019, 2020, 2021, 2022, 2023  AO Industries, Inc.
+Copyright (C) 2016, 2017, 2019, 2020, 2021, 2022, 2023, 2024  AO Industries, Inc.
     support@aoindustries.com
     7262 Bull Pen Cir
     Mobile, AL 36695
@@ -37,7 +37,7 @@ along with semanticcms-parent.  If not, see <https://www.gnu.org/licenses/>.
     shortTitle="Changelog"
     tocLevels="1"
     datePublished="2016-11-13T18:03:31-06:00"
-    dateModified="2023-12-05T00:59:05Z"
+    dateModified="2024-01-08T00:08:41Z"
     allowRobots="false"
   >
     <c:set var="latestRelease" value="1.20.1" />
@@ -62,6 +62,13 @@ along with semanticcms-parent.  If not, see <https://www.gnu.org/licenses/>.
             to 3.6.3.  <ao:a href="https://issues.apache.org/jira/projects/MJAVADOC/issues/MJAVADOC-682">MJAVADOC-682</ao:a>
             is resolved so removed the "reactor" profile.
           </li>
+          <li>Java updates:
+            <ol>
+              <li>Java 20 is now end-of-life</li>
+              <li>Java 21 is now current stable</li>
+              <li>Java 22 is new beta</li>
+            </ol>
+          </li>
         </ul>
       </changelog:release>
     </c:if>