Require Java 17 or newer

jenkinsci · Feb 12, 2025 · 32f797f · 32f797f
1 parent ad67130
commit 32f797f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/build-monitor-acceptance/pom.xml b/build-monitor-acceptance/pom.xml
@@ -12,10 +12,8 @@
   <name>Build Monitor Acceptance Tests</name>
 
   <properties>
-    <byte-buddy.version>1.15.10</byte-buddy.version>
+    <byte-buddy.version>1.15.11</byte-buddy.version>
     <serenity.version>4.2.9</serenity.version>
-    <!-- TODO until in parent POM -->
-    <maven.compiler.release>17</maven.compiler.release>
   </properties>
 
   <dependencyManagement>

diff --git a/...src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorDescriptor.java b/...src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorDescriptor.java
@@ -7,7 +7,7 @@
 import java.util.regex.PatternSyntaxException;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public final class BuildMonitorDescriptor extends ViewDescriptor {
 
@@ -36,7 +36,7 @@ public FormValidation doCheckIncludeRegex(@QueryParameter String value) {
     }
 
     @Override
-    public boolean configure(StaplerRequest req, JSONObject json) {
+    public boolean configure(StaplerRequest2 req, JSONObject json) {
         req.bindJSON(this, json.getJSONObject("build-monitor"));
         save();
 

diff --git a/...lugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView.java b/...lugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView.java
@@ -36,16 +36,16 @@
 import hudson.model.Job;
 import hudson.model.ListView;
 import hudson.model.View;
+import jakarta.servlet.ServletException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import javax.servlet.ServletException;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 import org.kohsuke.stapler.bind.JavaScriptMethod;
 
 /**
@@ -168,7 +168,7 @@ public Config getConfig() {
     }
 
     @Override
-    protected void submit(StaplerRequest req) throws ServletException, IOException, FormException {
+    protected void submit(StaplerRequest2 req) throws ServletException, IOException, FormException {
         super.submit(req);
 
         JSONObject json = req.getSubmittedForm();

diff --git a/...rc/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/facade/RelativeLocation.java b/...rc/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/facade/RelativeLocation.java
@@ -7,7 +7,7 @@
 import hudson.model.View;
 import org.kohsuke.stapler.Ancestor;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public class RelativeLocation {
     private final Job job;
@@ -19,7 +19,7 @@ public static RelativeLocation of(Job job) {
     public String name() {
         ItemGroup ig = null;
 
-        StaplerRequest request = Stapler.getCurrentRequest();
+        StaplerRequest2 request = Stapler.getCurrentRequest2();
         for (Ancestor a : request.getAncestors()) {
             if (a.getObject() instanceof BuildMonitorView) {
                 ig = ((View) a.getObject()).getOwner().getItemGroup();

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.7</version>
     <relativePath />
   </parent>
 
@@ -38,8 +38,8 @@
     <revision>1.14</revision>
     <changelist>999999-SNAPSHOT</changelist>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-    <jenkins.baseline>2.462</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <gitHubRepo>jenkinsci/build-monitor-plugin</gitHubRepo>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>