From 283932a0ab494d07a59042ae7ce3de6347609cf4 Mon Sep 17 00:00:00 2001
From: Alex Earl <slide.o.mix@gmail.com>
Date: Thu, 21 Apr 2022 05:32:43 -0700
Subject: [PATCH] chore: test on java 17 (#115)

* chore: test on java 17

* Fix javadoc issue
---
 Jenkinsfile                                       | 15 +++++++++++----
 pom.xml                                           |  1 -
 .../jenkinsci/plugins/tokenmacro/TokenMacro.java  |  3 ---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b97b0a8..faa4dea 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,9 +1,16 @@
 def configurations = [
-    [ platform: "linux", jdk: "8", jenkins: null ],
-    [ platform: "windows", jdk: "8", jenkins: null ],
-    [ platform: "linux", jdk: "11", jenkins: null ],
+  // Test the long-term support end of the compatibility spectrum (i.e., the minimum required
+  // Jenkins version).
+  [ platform: 'linux', jdk: '8', jenkins: null ],
+
+  // Test the common case (i.e., a recent LTS release) on both Linux and Windows.
+  [ platform: 'linux', jdk: '11', jenkins: '2.332.1' ],
+  [ platform: 'windows', jdk: '11', jenkins: '2.332.1' ],
+
+  // Test the bleeding edge of the compatibility spectrum (i.e., the latest supported Java runtime).
+  [ platform: 'linux', jdk: '17', jenkins: '2.342' ],
 ]
 
 buildPlugin(
     configurations: configurations
-)
+)
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 94080d3..a628f28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,6 @@
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <jenkins.version>2.289.1</jenkins.version>
-    <java.level>8</java.level>
   </properties>
   
   <licenses>
diff --git a/src/main/java/org/jenkinsci/plugins/tokenmacro/TokenMacro.java b/src/main/java/org/jenkinsci/plugins/tokenmacro/TokenMacro.java
index cfe3a47..a817c58 100644
--- a/src/main/java/org/jenkinsci/plugins/tokenmacro/TokenMacro.java
+++ b/src/main/java/org/jenkinsci/plugins/tokenmacro/TokenMacro.java
@@ -99,9 +99,6 @@ public abstract class TokenMacro implements ExtensionPoint {
     /**
      * Evaluates the macro and produces the token.
      *
-     *
-     * <h3>Locale</h3>
-     * <p>
      * If the token is to produce a human readable text, it should do so by using the implicit locale associated
      * with the calling thread &mdash; see {@code Functions.getCurrentLocale()}.
      *