diff --git a/pom.xml b/pom.xml
index 330dd95e..50fbeca8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
org.jenkins-ci.plugins
plugin
- 4.88
+ 5.3
@@ -69,8 +69,9 @@
999999-SNAPSHOT
jenkinsci/${project.artifactId}-plugin
- 2.452
- ${jenkins.baseline}.4
+ 2.479
+ ${jenkins.baseline}.1
+
2.0.0
false
@@ -80,7 +81,7 @@
io.jenkins.tools.bom
bom-${jenkins.baseline}.x
- 3850.vb_c5319efa_e29
+ 3893.v213a_42768d35
pom
import
diff --git a/src/main/java/jenkins/branch/BaseEmptyView.java b/src/main/java/jenkins/branch/BaseEmptyView.java
index c608b14d..55d8887e 100644
--- a/src/main/java/jenkins/branch/BaseEmptyView.java
+++ b/src/main/java/jenkins/branch/BaseEmptyView.java
@@ -9,9 +9,9 @@
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
-import javax.servlet.ServletException;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import jakarta.servlet.ServletException;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
/**
* Holds the basic 'empty view' parent
@@ -100,14 +100,14 @@ public void onJobRenamed(Item item, String oldName, String newName) {
* {@inheritDoc}
*/
@Override
- protected void submit(StaplerRequest req) throws IOException, ServletException, FormException {
+ protected void submit(StaplerRequest2 req) throws IOException, ServletException, FormException {
}
/**
* {@inheritDoc}
*/
@Override
- public Item doCreateItem(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
+ public Item doCreateItem(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
throw new UnsupportedOperationException();
}
}
diff --git a/src/main/java/jenkins/branch/MetadataActionFolderIcon.java b/src/main/java/jenkins/branch/MetadataActionFolderIcon.java
index 4819629e..8c920a73 100644
--- a/src/main/java/jenkins/branch/MetadataActionFolderIcon.java
+++ b/src/main/java/jenkins/branch/MetadataActionFolderIcon.java
@@ -127,7 +127,7 @@ public String getImageOf(String size) {
String image = iconClassNameImageOf(size);
return image != null
? image
- : (Stapler.getCurrentRequest().getContextPath() + Hudson.RESOURCE_PATH
+ : (Stapler.getCurrentRequest2().getContextPath() + Hudson.RESOURCE_PATH
+ "/plugin/cloudbees-folder/images/" + size + "/folder.png");
}
diff --git a/src/main/java/jenkins/branch/MultiBranchProject.java b/src/main/java/jenkins/branch/MultiBranchProject.java
index 7ce2fa64..a2a4f99a 100644
--- a/src/main/java/jenkins/branch/MultiBranchProject.java
+++ b/src/main/java/jenkins/branch/MultiBranchProject.java
@@ -85,7 +85,7 @@
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
import jenkins.model.Jenkins;
import jenkins.model.ParameterizedJobMixIn;
import jenkins.model.TransientActionFactory;
@@ -112,8 +112,8 @@
import org.jenkins.ui.icon.IconSpec;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
import org.kohsuke.stapler.export.Exported;
import org.springframework.security.core.Authentication;
@@ -912,7 +912,7 @@ public synchronized BranchIndexing
getIndexing() {
* {@inheritDoc}
*/
@Override
- protected void submit(StaplerRequest req, StaplerResponse rsp)
+ protected void submit(StaplerRequest2 req, StaplerResponse2 rsp)
throws IOException, ServletException, Descriptor.FormException {
super.submit(req, rsp);
List _sources = new ArrayList<>();
diff --git a/src/main/java/jenkins/branch/OrganizationFolder.java b/src/main/java/jenkins/branch/OrganizationFolder.java
index 9a90e02d..41228268 100644
--- a/src/main/java/jenkins/branch/OrganizationFolder.java
+++ b/src/main/java/jenkins/branch/OrganizationFolder.java
@@ -75,7 +75,7 @@
import java.util.logging.Logger;
import edu.umd.cs.findbugs.annotations.CheckForNull;
import edu.umd.cs.findbugs.annotations.NonNull;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
import jenkins.model.Jenkins;
import jenkins.model.TransientActionFactory;
import jenkins.scm.api.SCMEvent;
@@ -102,8 +102,8 @@
import org.jenkinsci.Symbol;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.StaplerRequest2;
+import org.kohsuke.stapler.StaplerResponse2;
import org.springframework.security.core.Authentication;
import org.springframework.security.access.AccessDeniedException;
@@ -377,7 +377,7 @@ public DescribableList getBu
* {@inheritDoc}
*/
@Override
- protected void submit(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
+ protected void submit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, Descriptor.FormException {
super.submit(req, rsp);
JSONObject json = req.getSubmittedForm();
diff --git a/src/main/java/jenkins/branch/OverrideIndexTriggersJobProperty.java b/src/main/java/jenkins/branch/OverrideIndexTriggersJobProperty.java
index ed7e3637..8b688f80 100644
--- a/src/main/java/jenkins/branch/OverrideIndexTriggersJobProperty.java
+++ b/src/main/java/jenkins/branch/OverrideIndexTriggersJobProperty.java
@@ -38,7 +38,7 @@
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
import java.util.List;
@@ -73,7 +73,7 @@ public boolean isOwnerMultibranch(Item item) {
}
@Override
- public JobProperty> newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+ public JobProperty> newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
return formData.optBoolean("specified") ? super.newInstance(req, formData) : null;
}
}
diff --git a/src/main/java/jenkins/branch/ProjectNameProperty.java b/src/main/java/jenkins/branch/ProjectNameProperty.java
index da96ea9a..fa3a09a3 100644
--- a/src/main/java/jenkins/branch/ProjectNameProperty.java
+++ b/src/main/java/jenkins/branch/ProjectNameProperty.java
@@ -34,7 +34,7 @@
import jenkins.scm.api.SCMNavigator;
import jenkins.scm.api.SCMSourceObserver;
import net.sf.json.JSONObject;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
/**
* Holds the unmangled project name provided to {@link SCMSourceObserver#observe(String)} and used to create a
@@ -62,7 +62,7 @@ public String getName() {
}
@Override
- public AbstractFolderProperty> reconfigure(StaplerRequest req, JSONObject form) throws Descriptor.FormException {
+ public AbstractFolderProperty> reconfigure(StaplerRequest2 req, JSONObject form) throws Descriptor.FormException {
return this;
}
diff --git a/src/main/java/jenkins/branch/RateLimitBranchProperty.java b/src/main/java/jenkins/branch/RateLimitBranchProperty.java
index 1738e8b0..874ab3d9 100644
--- a/src/main/java/jenkins/branch/RateLimitBranchProperty.java
+++ b/src/main/java/jenkins/branch/RateLimitBranchProperty.java
@@ -49,7 +49,7 @@
import org.jvnet.localizer.ResourceBundleHolder;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
/**
* A branch property that limits how often a specific branch can be built.
@@ -397,7 +397,7 @@ public long getMillisecondsBetweenBuilds() {
public static class DescriptorImpl extends JobPropertyDescriptor {
@Override
- public JobProperty> newInstance(StaplerRequest req, JSONObject formData) throws FormException {
+ public JobProperty> newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
JobPropertyImpl prop = (JobPropertyImpl) super.newInstance(req, formData);
return prop.getThrottle() != null ? prop : null;
}
diff --git a/src/test/java/integration/harness/MockHealthReportBuildStep.java b/src/test/java/integration/harness/MockHealthReportBuildStep.java
index 1dfb1190..f42f1a65 100644
--- a/src/test/java/integration/harness/MockHealthReportBuildStep.java
+++ b/src/test/java/integration/harness/MockHealthReportBuildStep.java
@@ -13,7 +13,7 @@
import edu.umd.cs.findbugs.annotations.CheckForNull;
import jenkins.util.NonLocalizable;
import net.sf.json.JSONObject;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
public class MockHealthReportBuildStep extends hudson.tasks.Builder {
@@ -31,7 +31,7 @@ public static final class DescriptorImpl extends Descriptor {
public DescriptorImpl() {
}
- public Builder newInstance(StaplerRequest req, @NonNull JSONObject data) {
+ public Builder newInstance(StaplerRequest2 req, @NonNull JSONObject data) {
throw new UnsupportedOperationException();
}
}