Skip to content

Commit 33b4394

Browse files
authored
Upgrade plugin parent POM to latest (#274)
1 parent 974b0fe commit 33b4394

File tree

3 files changed

+16
-19
lines changed

3 files changed

+16
-19
lines changed

pom.xml

+3-6
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,17 @@
44
<parent>
55
<groupId>org.jenkins-ci.plugins</groupId>
66
<artifactId>plugin</artifactId>
7-
<version>4.88</version>
7+
<version>5.1</version>
88
<relativePath />
99
</parent>
1010

1111
<properties>
1212
<changelist>999999-SNAPSHOT</changelist>
1313
<jenkins.baseline>2.462</jenkins.baseline>
14-
<!-- TODO: replace when 2.472 is in LTS -->
14+
<!-- TODO: replace when 2.479 is in LTS -->
1515
<!-- <jenkins.version>${jenkins.baseline}.3</jenkins.version> -->
16-
<jenkins.version>2.472</jenkins.version>
16+
<jenkins.version>2.479</jenkins.version>
1717
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
18-
<!-- TODO JENKINS-73339 until in parent POM -->
19-
<jenkins-test-harness.version>2254.vcff7a_d4969e5</jenkins-test-harness.version>
20-
<maven.compiler.release>17</maven.compiler.release>
2118
</properties>
2219

2320
<groupId>org.jenkins-ci.plugins</groupId>

src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertySEC797Test.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,17 @@
2828
import hudson.model.UnprotectedRootAction;
2929
import hudson.util.HttpResponses;
3030
import java.util.Collections;
31+
import jakarta.servlet.http.HttpServletRequest;
32+
import jakarta.servlet.http.HttpServletResponse;
33+
import jakarta.servlet.http.HttpSession;
3134
import net.sf.json.JSONArray;
3235
import net.sf.json.JSONObject;
3336
import org.apache.commons.lang.StringUtils;
37+
import org.eclipse.jetty.ee9.servlet.DefaultServlet;
38+
import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
39+
import org.eclipse.jetty.ee9.servlet.ServletHolder;
3440
import org.eclipse.jetty.server.Server;
3541
import org.eclipse.jetty.server.ServerConnector;
36-
import org.eclipse.jetty.ee8.servlet.DefaultServlet;
37-
import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
38-
import org.eclipse.jetty.ee8.servlet.ServletHolder;
3942
import org.junit.After;
4043
import org.junit.Before;
4144
import org.junit.Rule;
@@ -44,12 +47,9 @@
4447
import org.jvnet.hudson.test.JenkinsRule;
4548
import org.jvnet.hudson.test.TestExtension;
4649
import org.kohsuke.stapler.HttpResponse;
47-
import org.kohsuke.stapler.StaplerRequest;
50+
import org.kohsuke.stapler.StaplerRequest2;
4851

4952
import edu.umd.cs.findbugs.annotations.CheckForNull;
50-
import javax.servlet.http.HttpServletRequest;
51-
import javax.servlet.http.HttpServletResponse;
52-
import javax.servlet.http.HttpSession;
5353
import java.io.IOException;
5454
import java.net.URI;
5555
import java.net.URL;
@@ -331,7 +331,7 @@ public String getUrlName() {
331331
return "test";
332332
}
333333

334-
public HttpResponse doIndex(StaplerRequest request) {
334+
public HttpResponse doIndex(StaplerRequest2 request) {
335335
HttpSession session = request.getSession(false);
336336
if (session == null) {
337337
sessionId = null;

src/test/java/org/jenkinsci/plugins/GithubAccessTokenPropertyTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,23 @@
2828
import hudson.model.User;
2929
import hudson.util.Scrambler;
3030
import java.util.Collections;
31+
import jakarta.servlet.http.HttpServletRequest;
32+
import jakarta.servlet.http.HttpServletResponse;
3133
import jenkins.security.ApiTokenProperty;
3234
import net.sf.json.JSONArray;
3335
import net.sf.json.JSONObject;
36+
import org.eclipse.jetty.ee9.servlet.DefaultServlet;
37+
import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
38+
import org.eclipse.jetty.ee9.servlet.ServletHolder;
3439
import org.eclipse.jetty.server.Server;
3540
import org.eclipse.jetty.server.ServerConnector;
36-
import org.eclipse.jetty.ee8.servlet.DefaultServlet;
37-
import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
38-
import org.eclipse.jetty.ee8.servlet.ServletHolder;
3941
import org.junit.After;
4042
import org.junit.Before;
4143
import org.junit.Rule;
4244
import org.junit.Test;
4345
import org.jvnet.hudson.test.Issue;
4446
import org.jvnet.hudson.test.JenkinsRule;
4547

46-
import javax.servlet.http.HttpServletRequest;
47-
import javax.servlet.http.HttpServletResponse;
4848
import java.io.IOException;
4949
import java.net.URI;
5050
import java.net.URL;

0 commit comments

Comments
 (0)