Merge pull request #137 from MRamonLeon/fix-test-selectors-new-core

jenkinsci · Jul 7, 2021 · 5fcd5b5 · 5fcd5b5
2 parents 99548b3 + 966f192
commit 5fcd5b5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
 
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
-        <jenkins.version>2.235.5</jenkins.version>
+        <jenkins.version>2.277</jenkins.version>
         <java.level>8</java.level>
         <hpi.compatibleSinceVersion>2.15</hpi.compatibleSinceVersion>
     </properties>
@@ -54,8 +54,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.235.x</artifactId>
-                <version>19</version>
+                <artifactId>bom-2.277.x</artifactId>
+                <version>29</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/src/main/java/org/jenkinsci/lib/configprovider/ConfigProvider.java b/src/main/java/org/jenkinsci/lib/configprovider/ConfigProvider.java
@@ -134,8 +134,10 @@ public Config newConfig(@NonNull String id, String name, String comment, String
 
     private void setField(String fieldName, String value, Config config) {
         Field field = ReflectionUtils.findField(config.getClass(), fieldName);
-        field.setAccessible(true);
-        ReflectionUtils.setField(field, config, value);
+        if (field != null) {
+            field.setAccessible(true);
+            ReflectionUtils.setField(field, config, value);
+        }
     }
 
     public abstract void clearOldDataStorage();

diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/ConfigFilesTest.java b/src/test/java/org/jenkinsci/plugins/configfiles/ConfigFilesTest.java
@@ -3,14 +3,14 @@
 import hudson.model.Item;
 import hudson.model.ItemGroup;
 import jenkins.model.Jenkins;
-import org.acegisecurity.AccessDeniedException;
 import org.jenkinsci.lib.configprovider.model.Config;
 import org.jenkinsci.plugins.configfiles.custom.CustomConfig;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
+import org.springframework.security.access.AccessDeniedException;
 
 import javax.annotation.CheckForNull;
 import java.io.File;

diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/Security2203Test.java b/src/test/java/org/jenkinsci/plugins/configfiles/Security2203Test.java
@@ -9,7 +9,7 @@
 import hudson.security.Permission;
 import hudson.util.ListBoxModel;
 import jenkins.model.Jenkins;
-import org.acegisecurity.AccessDeniedException;
+import org.springframework.security.access.AccessDeniedException;
 import org.jenkinsci.lib.configprovider.ConfigProvider;
 import org.jenkinsci.lib.configprovider.model.Config;
 import org.jenkinsci.plugins.configfiles.buildwrapper.ManagedFile;

diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/sec/PermissionChecker.java b/src/test/java/org/jenkinsci/plugins/configfiles/sec/PermissionChecker.java
@@ -2,8 +2,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.security.Permission;
-import org.acegisecurity.AccessDeniedException;
-
+import org.springframework.security.access.AccessDeniedException;
 import java.util.function.Supplier;
 
 import static org.hamcrest.MatcherAssert.assertThat;

diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/sec/ProtectedCodeRunnerTests.java b/src/test/java/org/jenkinsci/plugins/configfiles/sec/ProtectedCodeRunnerTests.java
@@ -1,12 +1,12 @@
 package org.jenkinsci.plugins.configfiles.sec;
 
 import jenkins.model.Jenkins;
-import org.acegisecurity.AccessDeniedException;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.MockAuthorizationStrategy;
+import org.springframework.security.access.AccessDeniedException;
 
 import java.util.function.Supplier;