Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Require Java 17 or newer; migrate to EE 9 #318

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Require Java 17 or newer; migrate to EE 9 #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]
])
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.88</version>
<version>5.1</version>
<relativePath />
</parent>

Expand All @@ -23,7 +23,7 @@
</licenses>
<properties>
<changelist>999999-SNAPSHOT</changelist>
<jenkins.version>2.440.3</jenkins.version>
<jenkins.version>2.479</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<useBeta>true</useBeta>
</properties>
Expand All @@ -32,8 +32,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.440.x</artifactId>
<version>3358.vea_fa_1f41504d</version>
<artifactId>bom-2.462.x</artifactId>
<version>3435.v238d66a_043fb_</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/hudson/tasks/Mailer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
}
}
Expand Down