[JENKINS-71808] GenericWhitelistTest#sanity fails on Java 21

jenkinsci · Aug 11, 2023 · 18598d6 · 18598d6
1 parent ecf6602
commit 18598d6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...est/java/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/StaticWhitelistTest.java b/...est/java/org/jenkinsci/plugins/scriptsecurity/sandbox/whitelists/StaticWhitelistTest.java
@@ -40,6 +40,7 @@
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
+import java.util.regex.Matcher;
 
 import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.EnumeratingWhitelist.MethodSignature;
 import org.jenkinsci.plugins.scriptsecurity.sandbox.whitelists.EnumeratingWhitelist.Signature;
@@ -140,7 +141,11 @@ static void sanity(URL definition) throws Exception {
             new MethodSignature("java.util.random.RandomGenerator", "nextGaussian"),
             new MethodSignature("java.util.random.RandomGenerator", "nextInt"),
             new MethodSignature("java.util.random.RandomGenerator", "nextInt", "int"),
-            new MethodSignature("java.util.random.RandomGenerator", "nextLong")
+            new MethodSignature("java.util.random.RandomGenerator", "nextLong"),
+            // Override the corresponding MatchResult methods in Java 20+.
+            new MethodSignature(Matcher.class, "end", String.class),
+            new MethodSignature(Matcher.class, "group", String.class),
+            new MethodSignature(Matcher.class, "start", String.class)
     ));
 
     @Test public void sanity() throws Exception {