Skip to content

Commit 639888f

Browse files
authored
Merge pull request #519 from basil/JENKINS-71808
[JENKINS-71808] `GenericWhitelistTest#sanity` fails on Java 21
2 parents 2dc1ea0 + 18598d6 commit 639888f

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/test/java/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/StaticWhitelistTest.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import java.util.List;
4141
import java.util.Random;
4242
import java.util.Set;
43+
import java.util.regex.Matcher;
4344

4445
import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.EnumeratingWhitelist.MethodSignature;
4546
import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.EnumeratingWhitelist.Signature;
@@ -140,7 +141,11 @@ static void sanity(URL definition) throws Exception {
140141
new MethodSignature("java.util.random.RandomGenerator", "nextGaussian"),
141142
new MethodSignature("java.util.random.RandomGenerator", "nextInt"),
142143
new MethodSignature("java.util.random.RandomGenerator", "nextInt", "int"),
143-
new MethodSignature("java.util.random.RandomGenerator", "nextLong")
144+
new MethodSignature("java.util.random.RandomGenerator", "nextLong"),
145+
// Override the corresponding MatchResult methods in Java 20+.
146+
new MethodSignature(Matcher.class, "end", String.class),
147+
new MethodSignature(Matcher.class, "group", String.class),
148+
new MethodSignature(Matcher.class, "start", String.class)
144149
));
145150

146151
@Test public void sanity() throws Exception {

0 commit comments

Comments
 (0)