Merge pull request #612 from sghill-rewrite/modernize/jenkins-2.440.3

Update to Jenkins LTS 2.440.3
jenkinsci · Aug 12, 2024 · 273cfb4 · 273cfb4
2 parents d6ba430 + 06f79fe
commit 273cfb4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.76</version>
+    <version>4.86</version>
     <relativePath />
   </parent>
 
@@ -53,16 +53,16 @@
     <jira-rest-client.version>5.2.7</jira-rest-client.version>
     <fugue.version>4.7.2</fugue.version>
     <!-- jenkins -->
-    <jenkins.version>2.401.3</jenkins.version>
+    <jenkins.version>2.440.3</jenkins.version>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.401.x</artifactId>
-        <version>2745.vc7b_fe4c876fa_</version>
+        <artifactId>bom-2.440.x</artifactId>
+        <version>3234.v5ca_5154341ef</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/src/main/java/hudson/plugins/jira/JiraGlobalConfiguration.java b/src/main/java/hudson/plugins/jira/JiraGlobalConfiguration.java
@@ -1,6 +1,7 @@
 package hudson.plugins.jira;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import hudson.util.PersistedList;
 import java.util.List;
@@ -16,6 +17,7 @@ public static JiraGlobalConfiguration get() {
         return (JiraGlobalConfiguration) Jenkins.get().getDescriptorOrDie(JiraGlobalConfiguration.class);
     }
 
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Backwards compatibility")
     public List<JiraSite> sites = new PersistedList<>(this);
 
     public JiraGlobalConfiguration() {

diff --git a/src/main/java/hudson/plugins/jira/JiraSite.java b/src/main/java/hudson/plugins/jira/JiraSite.java
@@ -29,6 +29,7 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import hudson.Util;
 import hudson.model.AbstractDescribableImpl;
@@ -125,21 +126,25 @@ public class JiraSite extends AbstractDescribableImpl<JiraSite> {
      * URL of Jira for normal access, like {@code http://jira.codehaus.org/}.
      * Mandatory. Normalized to end with '/'
      */
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Backwards compatibility")
     public URL alternativeUrl;
 
     /**
      * Jira requires HTTP Authentication for login
      */
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Backwards compatibility")
     public boolean useHTTPAuth;
 
     /**
      * The id of the credentials to use. Optional.
      */
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Backwards compatibility")
     public String credentialsId;
 
     /**
      * Jira requires Bearer Authentication for login
      */
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Backwards compatibility")
     public boolean useBearerAuth;
 
     /**
@@ -159,30 +164,35 @@ public class JiraSite extends AbstractDescribableImpl<JiraSite> {
     /**
      * Group visibility to constrain the visibility of the added comment. Optional.
      */
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Backwards compatibility")
     public String groupVisibility;
 
     /**
      * Role visibility to constrain the visibility of the added comment. Optional.
      */
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Backwards compatibility")
     public String roleVisibility;
 
     /**
      * True if this Jira is configured to allow Confluence-style Wiki comment.
      */
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Backwards compatibility")
     public boolean supportsWikiStyleComment;
 
     /**
      * to record scm changes in jira issue
      *
      * @since 1.21
      */
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Backwards compatibility")
     public boolean recordScmChanges;
 
     /**
      * Disable annotating the changelogs
      *
      * @since todo
      */
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Backwards compatibility")
     public boolean disableChangelogAnnotations;
 
     /**
@@ -199,23 +209,27 @@ public class JiraSite extends AbstractDescribableImpl<JiraSite> {
      *
      * @since 1.22
      */
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Backwards compatibility")
     public boolean updateJiraIssueForAllStatus;
 
     /**
      * connection timeout used when calling jira rest api, in seconds
      */
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Backwards compatibility")
     public int timeout = DEFAULT_TIMEOUT;
 
     /**
      * response timeout for jira rest call
      * @since 3.0.3
      */
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Backwards compatibility")
     private int readTimeout = DEFAULT_READ_TIMEOUT;
 
     /**
      * thread pool number
      * @since 3.0.3
      */
+    @SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", justification = "Backwards compatibility")
     private int threadExecutorNumber = DEFAULT_THREAD_EXECUTOR_NUMBER;
 
     /**