Merge pull request #85 from jonesbusy-automation/plugin-modernizer-tool

Require 2.479.1 and Java 17
jenkinsci · Dec 10, 2024 · 40be593 · 40be593
2 parents 92c9403 + d496954
commit 40be593
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.88</version>
+    <version>5.3</version>
     <relativePath />
   </parent>
 
@@ -41,16 +41,15 @@
   </scm>
 
   <properties>
-    <maven.compiler.release>17</maven.compiler.release>
     <changelist>999999-SNAPSHOT</changelist>
-    <jenkins.version>2.452.4</jenkins.version>
+    <jenkins.version>2.479.1</jenkins.version>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
   </properties>
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.452.x</artifactId>
+        <artifactId>bom-2.479.x</artifactId>
         <version>3790.va_b_a_2d26d2b_69</version>
         <type>pom</type>
         <scope>import</scope>

diff --git a/src/main/java/org/jenkinsci/plugins/gitlablogo/GitlabLogoColumn.java b/src/main/java/org/jenkinsci/plugins/gitlablogo/GitlabLogoColumn.java
@@ -5,7 +5,7 @@
 import hudson.views.ListViewColumn;
 import hudson.views.ListViewColumnDescriptor;
 import net.sf.json.JSONObject;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class GitlabLogoColumn extends ListViewColumn {
     @Extension
@@ -22,7 +22,7 @@ public String getDisplayName() {
         }
 
         @Override
-        public ListViewColumn newInstance(StaplerRequest request, JSONObject formData) throws FormException {
+        public ListViewColumn newInstance(StaplerRequest2 request, JSONObject formData) throws FormException {
             return new GitlabLogoColumn();
         }
     }

diff --git a/src/main/java/org/jenkinsci/plugins/gitlablogo/GitlabLogoProperty.java b/src/main/java/org/jenkinsci/plugins/gitlablogo/GitlabLogoProperty.java
@@ -13,7 +13,7 @@
 import org.gitlab4j.api.ProjectApi;
 import org.gitlab4j.api.models.Project;
 import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.StaplerResponse;
 
 public class GitlabLogoProperty extends JobProperty<Job<?, ?>> {
@@ -102,12 +102,12 @@ public boolean isApplicable(Class<? extends Job> jobType)
     }
 
     @Override
-    public GitlabLogoProperty newInstance(@NonNull StaplerRequest req, JSONObject formData) throws FormException{
+    public GitlabLogoProperty newInstance(@NonNull StaplerRequest2 req, JSONObject formData) throws FormException{
       return req.bindJSON(GitlabLogoProperty.class, formData);
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject formData) throws FormException {
+    public boolean configure(StaplerRequest2 req, JSONObject formData) throws FormException {
       // To persist global configuration information,
       // set that to properties and call save().
       privateToken = Secret.fromString(formData.getString("privateToken"));
@@ -126,7 +126,7 @@ public String getEndpointUrl() {
       return endpointUrl;
     }
 
-    public void doClearCache(StaplerRequest req, StaplerResponse rsp){
+    public void doClearCache(StaplerRequest2 req, StaplerResponse rsp){
       GitlabLogoProjectCache.PROJECT_CACHE.clear();
     }
   }