diff --git a/Jenkinsfile b/Jenkinsfile index c4d6faa..a566ce1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,4 @@ buildPlugin(useContainerAgent: true, configurations: [ - [platform: "linux", jdk: 17], - [platform: "linux", jdk: 21], - [platform: "windows", jdk: 11] + [platform: 'linux', jdk: 21], + [platform: 'windows', jdk: 17] ]) diff --git a/pom.xml b/pom.xml index c643dfb..0f64221 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.88 + 5.1 @@ -23,7 +23,7 @@ 999999-SNAPSHOT - 2.440.3 + 2.479 jenkinsci/${project.artifactId}-plugin true @@ -32,8 +32,8 @@ io.jenkins.tools.bom - bom-2.440.x - 3358.vea_fa_1f41504d + bom-2.462.x + 3435.v238d66a_043fb_ import pom diff --git a/src/main/java/hudson/tasks/Mailer.java b/src/main/java/hudson/tasks/Mailer.java index cc7d6e2..c856a04 100644 --- a/src/main/java/hudson/tasks/Mailer.java +++ b/src/main/java/hudson/tasks/Mailer.java @@ -77,7 +77,7 @@ import org.kohsuke.accmod.restrictions.NoExternalUse; import org.kohsuke.stapler.DataBoundSetter; import org.kohsuke.stapler.QueryParameter; -import org.kohsuke.stapler.StaplerRequest; +import org.kohsuke.stapler.StaplerRequest2; import org.kohsuke.stapler.export.Exported; import jenkins.model.Jenkins; @@ -439,7 +439,7 @@ protected PasswordAuthentication getPasswordAuthentication() { } @Override - public boolean configure(StaplerRequest req, JSONObject json) throws FormException { + public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException { // Nested Describable (SMTPAuthentication) is not set to null in case it is not configured. // To mitigate that, it is being set to null before (so it gets set to sent value or null correctly) and, in @@ -637,7 +637,7 @@ public void setSmtpAuth(String userName, String password) { } @Override - public Publisher newInstance(StaplerRequest req, JSONObject formData) throws FormException { + public Publisher newInstance(StaplerRequest2 req, JSONObject formData) throws FormException { Mailer m = (Mailer)super.newInstance(req, formData); if(hudsonUrl==null) { @@ -823,7 +823,7 @@ public UserProperty newInstance(User user) { } @Override - public UserProperty newInstance(@CheckForNull StaplerRequest req, JSONObject formData) throws FormException { + public UserProperty newInstance(@CheckForNull StaplerRequest2 req, JSONObject formData) throws FormException { return new UserProperty(req != null ? req.getParameter("email.address") : null); } }