Lower core dependency again

jenkinsci · May 26, 2019 · cb1e719 · cb1e719
1 parent 99767ef
commit cb1e719
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -83,8 +83,8 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
-      <!--to have access to TypedFilter -->
-      <version>2.138.4</version>
+      <!--to have access to User.getById -->
+      <version>1.651.2</version>
       <type>executable-war</type>
       <exclusions>
         <exclusion>

diff --git a/src/main/java/org/jvnet/hudson/test/PluginAutomaticTestBuilder.java b/src/main/java/org/jvnet/hudson/test/PluginAutomaticTestBuilder.java
@@ -171,7 +171,7 @@ private Method findIsRoutableMethod() throws NoSuchMethodException {
         private PluginWrapper determineCurrentPlugin() {
             String plugin = (String) params.get("artifactId");
             if (plugin != null) {
-                return Jenkins.get().pluginManager.getPlugin(plugin);
+                return Jenkins.getActiveInstance().pluginManager.getPlugin(plugin);
             }
             return null;
         }

diff --git a/src/test/java/org/jvnet/hudson/test/JenkinsRuleTest.java b/src/test/java/org/jvnet/hudson/test/JenkinsRuleTest.java
@@ -4,7 +4,6 @@
 import com.gargoylesoftware.htmlunit.WebRequest;
 import hudson.model.User;
 import jenkins.security.ApiTokenProperty;
-import jenkins.security.apitoken.ApiTokenPropertyConfiguration;
 import net.sf.json.JSONObject;
 import org.junit.Rule;
 import org.junit.Test;
@@ -82,7 +81,7 @@ public void assertEqualDataBoundBeansWithSettersFailForField() throws Exception
     @Test
     public void testTokenHelperMethods() throws Exception {
         j.jenkins.setSecurityRealm(j.createDummySecurityRealm());
-        ApiTokenPropertyConfiguration.get().setTokenGenerationOnCreationEnabled(true);
+        // Jenkins 2.129+: ApiTokenPropertyConfiguration.get().setTokenGenerationOnCreationEnabled(true);
 
         JenkinsRule.WebClient wc = j.createWebClient();