Added support for Java 21.

ao-apps · Jan 8, 2024 · 08fa181 · 08fa181
1 parent a59d68f
commit 08fa181
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,7 +1,7 @@
 #!/usr/bin/env groovy
 /*
  * semanticcms-file-taglib - Files nested within SemanticCMS pages and elements in a JSP environment.
- * 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
@@ -60,14 +60,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.                 *
@@ -153,18 +153,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')) {
@@ -794,7 +794,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 {
@@ -840,11 +840,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
@@ -1,7 +1,7 @@
 #!/usr/bin/env groovy
 /*
  * semanticcms-file-taglib - Files nested within SemanticCMS pages and elements in a JSP environment.
- * 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
@@ -65,14 +65,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.                 *
@@ -158,18 +158,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')) {
@@ -799,7 +799,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 {
@@ -845,11 +845,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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 semanticcms-file-taglib - Files nested within SemanticCMS pages and elements in a JSP environment.
-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
@@ -219,7 +219,7 @@ along with semanticcms-file-taglib.  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-lang</artifactId><version>5.6.0-SNAPSHOT<!-- ${POST-SNAPSHOT} --></version>
@@ -341,7 +341,7 @@ along with semanticcms-file-taglib.  If not, see <https://www.gnu.org/licenses/>
       <!-- javaee-web-api-bom: <groupId>org.apache.taglibs</groupId><artifactId>taglibs-standard-impl</artifactId> -->
       <!-- Runtime Transitive -->
       <dependency>
-        <groupId>com.aoapps</groupId><artifactId>ao-javadoc-offline</artifactId><version>3.4.1${POST-SNAPSHOT}</version>
+        <groupId>com.aoapps</groupId><artifactId>ao-javadoc-offline</artifactId><version>3.5.0-SNAPSHOT<!-- ${POST-SNAPSHOT} --></version>
       </dependency>
       <!-- Imports -->
       <dependency>