Skip to content

Commit 283932a

Browse files
authored
chore: test on java 17 (#115)
* chore: test on java 17 * Fix javadoc issue
1 parent d1aaca2 commit 283932a

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

Jenkinsfile

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
def configurations = [
2-
[ platform: "linux", jdk: "8", jenkins: null ],
3-
[ platform: "windows", jdk: "8", jenkins: null ],
4-
[ platform: "linux", jdk: "11", jenkins: null ],
2+
// Test the long-term support end of the compatibility spectrum (i.e., the minimum required
3+
// Jenkins version).
4+
[ platform: 'linux', jdk: '8', jenkins: null ],
5+
6+
// Test the common case (i.e., a recent LTS release) on both Linux and Windows.
7+
[ platform: 'linux', jdk: '11', jenkins: '2.332.1' ],
8+
[ platform: 'windows', jdk: '11', jenkins: '2.332.1' ],
9+
10+
// Test the bleeding edge of the compatibility spectrum (i.e., the latest supported Java runtime).
11+
[ platform: 'linux', jdk: '17', jenkins: '2.342' ],
512
]
613

714
buildPlugin(
815
configurations: configurations
9-
)
16+
)

pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<changelist>999999-SNAPSHOT</changelist>
1313
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
1414
<jenkins.version>2.289.1</jenkins.version>
15-
<java.level>8</java.level>
1615
</properties>
1716

1817
<licenses>

src/main/java/org/jenkinsci/plugins/tokenmacro/TokenMacro.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,6 @@ public abstract class TokenMacro implements ExtensionPoint {
9999
/**
100100
* Evaluates the macro and produces the token.
101101
*
102-
*
103-
* <h3>Locale</h3>
104-
* <p>
105102
* If the token is to produce a human readable text, it should do so by using the implicit locale associated
106103
* with the calling thread &mdash; see {@code Functions.getCurrentLocale()}.
107104
*

0 commit comments

Comments
 (0)