Added support for Java 21.

ao-apps · Jan 8, 2024 · c6b64b7 · c6b64b7
1 parent 79c6541
commit c6b64b7
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 37 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,7 +1,7 @@
 #!/usr/bin/env groovy
 /*
  * ao-badges - Badges from shields.io bundled into a reusable JSP-based web component.
- * 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
@@ -62,14 +62,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.                 *
@@ -155,18 +155,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')) {
@@ -796,7 +796,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 {
@@ -842,11 +842,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
 /*
  * ao-badges - Badges from shields.io bundled into a reusable JSP-based web component.
- * 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
@@ -61,14 +61,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.                 *
@@ -154,18 +154,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')) {
@@ -795,7 +795,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 {
@@ -841,11 +841,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"?>
 <!--
 ao-badges - Badges from shields.io bundled into a reusable JSP-based web component.
-Copyright (C) 2017, 2018, 2019, 2020, 2021, 2022, 2023  AO Industries, Inc.
+Copyright (C) 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024  AO Industries, Inc.
     support@aoindustries.com
     7262 Bull Pen Cir
     Mobile, AL 36695
@@ -29,7 +29,7 @@ along with ao-badges.  If not, see <https://www.gnu.org/licenses/>.
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
-  <groupId>com.aoapps</groupId><artifactId>ao-badges-book</artifactId><version>1.10.1-POST-SNAPSHOT</version>
+  <groupId>com.aoapps</groupId><artifactId>ao-badges-book</artifactId><version>1.11.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -169,7 +169,7 @@ along with ao-badges.  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/badges/badge-reference.jspx b/book/src/main/resources-filtered/META-INF/resources/badges/badge-reference.jspx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 ao-badges - Badges from shields.io bundled into a reusable JSP-based web component.
-Copyright (C) 2017, 2019, 2020, 2021, 2022, 2023  AO Industries, Inc.
+Copyright (C) 2017, 2019, 2020, 2021, 2022, 2023, 2024  AO Industries, Inc.
     support@aoindustries.com
     7262 Bull Pen Cir
     Mobile, AL 36695
@@ -33,7 +33,7 @@ along with ao-badges.  If not, see <https://www.gnu.org/licenses/>.
   <core:page
     title="Badge Reference"
     datePublished="2017-07-17T17:00:17-05:00"
-    dateModified="2023-09-24T19:14:00Z"
+    dateModified="2024-01-08T00:08:41Z"
   >
     <!-- TODO: Links in section labels to /life-cycle.jspx -->
     <section:section label="Project Management">
@@ -348,12 +348,20 @@ along with ao-badges.  If not, see <https://www.gnu.org/licenses/>.
             </tr>
             <tr>
               <td>
-                <ao:a rel="nofollow" href="https://openjdk.org/projects/jdk/21/">
-                  <ao:img src="/ao-badges/java-21.svg" width="78" height="20" alt="java: >= 21" />
+                <ao:a rel="nofollow" href="https://docs.oracle.com/en/java/javase/21/">
+                  <ao:img src="/ao-badges/java-20.svg" width="78" height="20" alt="java: >= 21" />
                 </ao:a>
               </td>
               <td><code>arg.javaseVersion="21"</code></td>
             </tr>
+            <tr>
+              <td>
+                <ao:a rel="nofollow" href="https://openjdk.org/projects/jdk/22/">
+                  <ao:img src="/ao-badges/java-22.svg" width="78" height="20" alt="java: >= 22" />
+                </ao:a>
+              </td>
+              <td><code>arg.javaseVersion="22"</code></td>
+            </tr>
             <tr>
               <td>
                 <ao:a rel="nofollow" href="https://docs.oracle.com/en/java/javase/">

diff --git a/book/src/main/resources-filtered/META-INF/resources/badges/changelog.jspx b/book/src/main/resources-filtered/META-INF/resources/badges/changelog.jspx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 ao-badges - Badges from shields.io bundled into a reusable JSP-based web component.
-Copyright (C) 2017, 2019, 2020, 2021, 2022, 2023  AO Industries, Inc.
+Copyright (C) 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 ao-badges.  If not, see <https://www.gnu.org/licenses/>.
     shortTitle="Changelog"
     tocLevels="1"
     datePublished="2017-07-15T16:36:26-05:00"
-    dateModified="2023-08-02T17:32:59Z"
+    dateModified="2024-01-08T00:08:41Z"
   >
     <c:set var="latestRelease" value="1.10.1" />
     <c:if test="${
@@ -52,7 +52,17 @@ along with ao-badges.  If not, see <https://www.gnu.org/licenses/>.
         artifactId="@{documented.artifactId}"
         repository="@{nexusUrl}content/repositories/snapshots/"
         scmUrl="@{project.scm.url}"
-      />
+      >
+        <ul>
+          <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>
 
     <changelog:release

diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 ao-badges - Badges from shields.io bundled into a reusable JSP-based web component.
-Copyright (C) 2017, 2018, 2019, 2020, 2021, 2022, 2023  AO Industries, Inc.
+Copyright (C) 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024  AO Industries, Inc.
     support@aoindustries.com
     7262 Bull Pen Cir
     Mobile, AL 36695
@@ -29,7 +29,7 @@ along with ao-badges.  If not, see <https://www.gnu.org/licenses/>.
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
-  <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</version>
   <packaging>jar</packaging>
 
   <properties>

diff --git a/src/main/resources-filtered/META-INF/resources/ao-badges/badges.inc.jspx b/src/main/resources-filtered/META-INF/resources/ao-badges/badges.inc.jspx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 ao-badges - Badges from shields.io bundled into a reusable JSP-based web component.
-Copyright (C) 2017, 2019, 2020, 2021, 2022, 2023  AO Industries, Inc.
+Copyright (C) 2017, 2019, 2020, 2021, 2022, 2023, 2024  AO Industries, Inc.
     support@aoindustries.com
     7262 Bull Pen Cir
     Mobile, AL 36695
@@ -37,7 +37,7 @@ Arguments:
                            Must be one of "developmental", "active", "unsupported"
 
   arg.javaseVersion        (Optional) The minimum Java™ SE version.
-                           Must be one of "1.5", "5", "1.6", "6", "1.7", "7", "1.8", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21"
+                           Must be one of "1.5", "5", "1.6", "6", "1.7", "7", "1.8", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22"
 
   arg.javaeeVersion        (Optional) The minimum Java™ EE version.
                            Must be one of "5", "6", "7"
@@ -306,10 +306,15 @@ Arguments:
             </ao:a>
           </ao:when>
           <ao:when test="#{arg.javaseVersion == '21'}">
-            <ao:a rel="nofollow" href="https://openjdk.org/projects/jdk/21/">
+            <ao:a rel="nofollow" href="https://docs.oracle.com/en/java/javase/21/">
               <ao:img src="/ao-badges/java-21.svg" width="78" height="20" alt="java: >= 21" />
             </ao:a>
           </ao:when>
+          <ao:when test="#{arg.javaseVersion == '22'}">
+            <ao:a rel="nofollow" href="https://openjdk.org/projects/jdk/22/">
+              <ao:img src="/ao-badges/java-22.svg" width="78" height="20" alt="java: >= 22" />
+            </ao:a>
+          </ao:when>
           <ao:otherwise>
             <ao:a rel="nofollow" href="https://docs.oracle.com/en/java/javase/">
               <ao:img src="/ao-badges/java-unknown.svg" width="94" height="20" alt="java: unknown" />

diff --git a/src/main/resources/META-INF/resources/ao-badges/java-20.svg b/src/main/resources/META-INF/resources/ao-badges/java-20.svg
diff --git a/src/main/resources/META-INF/resources/ao-badges/java-21.svg b/src/main/resources/META-INF/resources/ao-badges/java-21.svg
diff --git a/src/main/resources/META-INF/resources/ao-badges/java-22.svg b/src/main/resources/META-INF/resources/ao-badges/java-22.svg