Adapt to jenkinsci/jenkins#9696

basil · Sep 6, 2024 · 79bad56 · 79bad56
1 parent b2fa784
commit 79bad56
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -75,7 +75,8 @@
 
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
-        <jenkins.version>2.475</jenkins.version>
+        <!-- TODO https://github.com/jenkinsci/jenkins/pull/9696 -->
+        <jenkins.version>2.476-rc35313.0144a_9701da_2</jenkins.version>
         <!-- TODO JENKINS-73339 until in parent POM -->
         <jenkins-test-harness.version>2265.v3da_49c8134d6</jenkins-test-harness.version>
         <maven.compiler.release>17</maven.compiler.release>

diff --git a/...t/java/org/jenkinsci/plugins/builduser/varsetter/impl/UserIdCauseDeterminantSamlTest.java b/...t/java/org/jenkinsci/plugins/builduser/varsetter/impl/UserIdCauseDeterminantSamlTest.java
@@ -1,7 +1,7 @@
 package org.jenkinsci.plugins.builduser.varsetter.impl;
 
 import hudson.model.Cause.UserIdCause;
-import hudson.security.ChainedServletFilter;
+import hudson.security.ChainedServletFilter2;
 import hudson.security.SecurityRealm;
 import jenkins.model.IdStrategy;
 import org.easymock.EasyMock;
@@ -37,7 +37,7 @@ public Map<String, String> runSamlSecurityRealmTest(JenkinsRule r, String userid
         IdStrategy strategy = new IdStrategy.CaseSensitive();
         EasyMock.expect(realm.getUserIdStrategy()).andReturn(strategy).anyTimes();
         EasyMock.expect(realm.getSecurityComponents()).andReturn(new SecurityRealm.SecurityComponents());
-        EasyMock.expect(realm.createFilter(anyObject(FilterConfig.class))).andReturn(new ChainedServletFilter());
+        EasyMock.expect(realm.createFilter(anyObject(FilterConfig.class))).andReturn(new ChainedServletFilter2());
         EasyMock.expect(realm.getUsernameCaseConversion()).andReturn(caseConversion);
         EasyMock.expect(realm.loadUserByUsername2(userid)).andReturn(user).anyTimes();