Skip to content

Commit f668b86

Browse files
committed
Lower core dependency again
1 parent 99767ef commit f668b86

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ THE SOFTWARE.
8383
<dependency>
8484
<groupId>org.jenkins-ci.main</groupId>
8585
<artifactId>jenkins-war</artifactId>
86-
<!--to have access to TypedFilter -->
87-
<version>2.138.4</version>
86+
<!--to have access to User.getById-->
87+
<version>1.651.2</version>
8888
<type>executable-war</type>
8989
<exclusions>
9090
<exclusion>

src/main/java/org/jvnet/hudson/test/PluginAutomaticTestBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ private Method findIsRoutableMethod() throws NoSuchMethodException {
171171
private PluginWrapper determineCurrentPlugin() {
172172
String plugin = (String) params.get("artifactId");
173173
if (plugin != null) {
174-
return Jenkins.get().pluginManager.getPlugin(plugin);
174+
return Jenkins.getActiveInstance().pluginManager.getPlugin(plugin);
175175
}
176176
return null;
177177
}

src/test/java/org/jvnet/hudson/test/JenkinsRuleTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.gargoylesoftware.htmlunit.WebRequest;
55
import hudson.model.User;
66
import jenkins.security.ApiTokenProperty;
7-
import jenkins.security.apitoken.ApiTokenPropertyConfiguration;
87
import net.sf.json.JSONObject;
98
import org.junit.Rule;
109
import org.junit.Test;
@@ -82,7 +81,7 @@ public void assertEqualDataBoundBeansWithSettersFailForField() throws Exception
8281
@Test
8382
public void testTokenHelperMethods() throws Exception {
8483
j.jenkins.setSecurityRealm(j.createDummySecurityRealm());
85-
ApiTokenPropertyConfiguration.get().setTokenGenerationOnCreationEnabled(true);
84+
// Jenkins 2.129+: ApiTokenPropertyConfiguration.get().setTokenGenerationOnCreationEnabled(true);
8685

8786
JenkinsRule.WebClient wc = j.createWebClient();
8887

0 commit comments

Comments
 (0)