Skip to content

Commit e6d6dbb

Browse files
basilbasil
committed
Require Jenkins 2.479.1 LTS or newer
1 parent 91d9641 commit e6d6dbb

29 files changed

+98
-98
lines changed

‎.github/CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @jenkinsci/github-plugin-developers

‎.github/workflows/release-drafter.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
# Drafts your next Release notes as Pull Requests are merged into the default branch
15-
- uses: release-drafter/release-drafter@v5
15+
- uses: release-drafter/release-drafter@v6
1616
env:
1717
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.mvn/extensions.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<extension>
33
<groupId>io.jenkins.tools.incrementals</groupId>
44
<artifactId>git-changelist-maven-extension</artifactId>
5-
<version>1.7</version>
5+
<version>1.8</version>
66
</extension>
77
</extensions>

‎pom.xml

+10-12
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.jenkins-ci.plugins</groupId>
77
<artifactId>plugin</artifactId>
8-
<version>4.77</version>
8+
<version>5.2</version>
99
<relativePath />
1010
</parent>
1111

@@ -49,14 +49,13 @@
4949
<properties>
5050
<revision>1.40.1</revision>
5151
<changelist>-SNAPSHOT</changelist>
52-
<gitHubRepo>jenkinsci/github-plugin</gitHubRepo>
53-
<jenkins.version>2.414.3</jenkins.version>
52+
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
53+
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
54+
<jenkins.baseline>2.479</jenkins.baseline>
55+
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
5456
<release.skipTests>false</release.skipTests>
5557
<tagNameFormat>v@{project.version}</tagNameFormat>
5658
<useBeta>true</useBeta> <!-- For Jenkins.MANAGE permission -->
57-
<!-- TODO JENKINS-73339 until in parent POM -->
58-
<jenkins-test-harness.version>2250.v03a_1295b_0a_30</jenkins-test-harness.version>
59-
<maven.compiler.testRelease>17</maven.compiler.testRelease>
6059
</properties>
6160

6261
<repositories>
@@ -184,14 +183,14 @@
184183
<dependency>
185184
<groupId>com.github.tomakehurst</groupId>
186185
<artifactId>wiremock-jre8-standalone</artifactId>
187-
<version>2.35.0</version>
186+
<version>2.35.2</version>
188187
<scope>test</scope>
189188
</dependency>
190189

191190
<dependency>
192191
<groupId>io.rest-assured</groupId>
193192
<artifactId>rest-assured</artifactId>
194-
<version>5.3.1</version>
193+
<version>5.3.2</version>
195194
<scope>test</scope>
196195
</dependency>
197196

@@ -201,8 +200,8 @@
201200
<dependencies>
202201
<dependency>
203202
<groupId>io.jenkins.tools.bom</groupId>
204-
<artifactId>bom-2.414.x</artifactId>
205-
<version>2718.v7e8a_d43b_3f0b_</version>
203+
<artifactId>bom-${jenkins.baseline}.x</artifactId>
204+
<version>3559.vb_5b_81183b_d23</version>
206205
<scope>import</scope>
207206
<type>pom</type>
208207
</dependency>
@@ -229,7 +228,7 @@
229228

230229
<plugin>
231230
<artifactId>maven-checkstyle-plugin</artifactId>
232-
<version>3.1.2</version>
231+
<version>3.6.0</version>
233232
<executions>
234233
<execution>
235234
<id>checkstyle</id>
@@ -240,7 +239,6 @@
240239
</execution>
241240
</executions>
242241
<configuration>
243-
<encoding>UTF-8</encoding>
244242
<failOnViolation>true</failOnViolation>
245243
<logViolationsToConsole>true</logViolationsToConsole>
246244
<linkXRef>false</linkXRef>

‎src/main/java/com/cloudbees/jenkins/GitHubPushTrigger.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void onPost() {
8686
*/
8787
public void onPost(String triggeredByUser) {
8888
onPost(GitHubTriggerEvent.create()
89-
.withOrigin(SCMEvent.originOf(Stapler.getCurrentRequest()))
89+
.withOrigin(SCMEvent.originOf(Stapler.getCurrentRequest2()))
9090
.withTriggeredByUser(triggeredByUser)
9191
.build()
9292
);

‎src/main/java/com/cloudbees/jenkins/GitHubTriggerEvent.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.cloudbees.jenkins;
22

3+
import jakarta.servlet.http.HttpServletRequest;
34
import jenkins.scm.api.SCMEvent;
45

56
/**
@@ -14,7 +15,7 @@ public class GitHubTriggerEvent {
1415
*/
1516
private final long timestamp;
1617
/**
17-
* The origin of the event (see {@link SCMEvent#originOf(javax.servlet.http.HttpServletRequest)})
18+
* The origin of the event (see {@link SCMEvent#originOf(HttpServletRequest)})
1819
*/
1920
private final String origin;
2021
/**

‎src/main/java/com/cloudbees/jenkins/GitHubWebHook.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public List<Item> reRegisterAllHooks() {
118118
@RequirePostWithGHHookPayload
119119
public void doIndex(@NonNull @GHEventHeader GHEvent event, @NonNull @GHEventPayload String payload) {
120120
GHSubscriberEvent subscriberEvent =
121-
new GHSubscriberEvent(SCMEvent.originOf(Stapler.getCurrentRequest()), event, payload);
121+
new GHSubscriberEvent(SCMEvent.originOf(Stapler.getCurrentRequest2()), event, payload);
122122
from(GHEventsSubscriber.all())
123123
.filter(isInterestedIn(event))
124124
.transform(processEvent(subscriberEvent)).toList();

‎src/main/java/com/cloudbees/jenkins/GitHubWebHookCrumbExclusion.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import hudson.Extension;
44
import hudson.security.csrf.CrumbExclusion;
55

6-
import javax.servlet.FilterChain;
7-
import javax.servlet.ServletException;
8-
import javax.servlet.http.HttpServletRequest;
9-
import javax.servlet.http.HttpServletResponse;
6+
import jakarta.servlet.FilterChain;
7+
import jakarta.servlet.ServletException;
8+
import jakarta.servlet.http.HttpServletRequest;
9+
import jakarta.servlet.http.HttpServletResponse;
1010
import java.io.IOException;
1111

1212
import static org.apache.commons.lang3.StringUtils.isEmpty;

‎src/main/java/com/coravy/hudson/plugins/github/GithubProjectProperty.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import net.sf.json.JSONObject;
1010
import org.kohsuke.stapler.DataBoundConstructor;
1111
import org.kohsuke.stapler.DataBoundSetter;
12-
import org.kohsuke.stapler.StaplerRequest;
12+
import org.kohsuke.stapler.StaplerRequest2;
1313

1414
import edu.umd.cs.findbugs.annotations.CheckForNull;
1515
import edu.umd.cs.findbugs.annotations.NonNull;
@@ -116,7 +116,7 @@ public String getDisplayName() {
116116
}
117117

118118
@Override
119-
public JobProperty<?> newInstance(@NonNull StaplerRequest req,
119+
public JobProperty<?> newInstance(@NonNull StaplerRequest2 req,
120120
JSONObject formData) throws Descriptor.FormException {
121121

122122
GithubProjectProperty tpp = req.bindJSON(

‎src/main/java/org/jenkinsci/plugins/github/admin/GHRepoName.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.cloudbees.jenkins.GitHubRepositoryName;
44
import org.kohsuke.stapler.AnnotationHandler;
55
import org.kohsuke.stapler.InjectedParameter;
6-
import org.kohsuke.stapler.StaplerRequest;
6+
import org.kohsuke.stapler.StaplerRequest2;
77
import org.slf4j.Logger;
88

99
import java.lang.annotation.Documented;
@@ -37,8 +37,8 @@ class PayloadHandler extends AnnotationHandler<GHRepoName> {
3737
* @return {@link GitHubRepositoryName} extracted from request or null on any problem
3838
*/
3939
@Override
40-
public GitHubRepositoryName parse(StaplerRequest req, GHRepoName a, Class type, String param) {
41-
String repo = notNull(req, "Why StaplerRequest is null?").getParameter(param);
40+
public GitHubRepositoryName parse(StaplerRequest2 req, GHRepoName a, Class type, String param) {
41+
String repo = notNull(req, "Why StaplerRequest2 is null?").getParameter(param);
4242
LOGGER.trace("Repo url in method {}", repo);
4343
return GitHubRepositoryName.create(repo);
4444
}

‎src/main/java/org/jenkinsci/plugins/github/admin/GitHubHookRegisterProblemMonitor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.kohsuke.stapler.HttpRedirect;
1616
import org.kohsuke.stapler.HttpResponse;
1717
import org.kohsuke.stapler.HttpResponses;
18-
import org.kohsuke.stapler.StaplerRequest;
18+
import org.kohsuke.stapler.StaplerRequest2;
1919
import org.kohsuke.stapler.interceptor.RequirePOST;
2020
import org.slf4j.Logger;
2121
import org.slf4j.LoggerFactory;
@@ -147,7 +147,7 @@ public boolean isActivated() {
147147
*/
148148
@RequirePOST
149149
@RequireAdminRights
150-
public HttpResponse doAct(StaplerRequest req) throws IOException {
150+
public HttpResponse doAct(StaplerRequest2 req) throws IOException {
151151
if (req.hasParameter("no")) {
152152
disable(true);
153153
return HttpResponses.redirectViaContextPath("/manage");

‎src/main/java/org/jenkinsci/plugins/github/admin/RequireAdminRights.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package org.jenkinsci.plugins.github.admin;
22

33
import jenkins.model.Jenkins;
4-
import org.kohsuke.stapler.StaplerRequest;
5-
import org.kohsuke.stapler.StaplerResponse;
4+
import org.kohsuke.stapler.StaplerRequest2;
5+
import org.kohsuke.stapler.StaplerResponse2;
66
import org.kohsuke.stapler.interceptor.Interceptor;
77
import org.kohsuke.stapler.interceptor.InterceptorAnnotation;
88

9-
import javax.servlet.ServletException;
9+
import jakarta.servlet.ServletException;
1010
import java.lang.annotation.Retention;
1111
import java.lang.annotation.Target;
1212
import java.lang.reflect.InvocationTargetException;
@@ -29,7 +29,7 @@
2929
class Processor extends Interceptor {
3030

3131
@Override
32-
public Object invoke(StaplerRequest request, StaplerResponse response, Object instance, Object[] arguments)
32+
public Object invoke(StaplerRequest2 request, StaplerResponse2 response, Object instance, Object[] arguments)
3333
throws IllegalAccessException, InvocationTargetException, ServletException {
3434

3535
Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);

‎src/main/java/org/jenkinsci/plugins/github/admin/RespondWithRedirect.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package org.jenkinsci.plugins.github.admin;
22

33
import org.kohsuke.stapler.HttpRedirect;
4-
import org.kohsuke.stapler.StaplerRequest;
5-
import org.kohsuke.stapler.StaplerResponse;
4+
import org.kohsuke.stapler.StaplerRequest2;
5+
import org.kohsuke.stapler.StaplerResponse2;
66
import org.kohsuke.stapler.interceptor.Interceptor;
77
import org.kohsuke.stapler.interceptor.InterceptorAnnotation;
88

9-
import javax.servlet.ServletException;
9+
import jakarta.servlet.ServletException;
1010
import java.lang.annotation.Retention;
1111
import java.lang.annotation.Target;
1212
import java.lang.reflect.InvocationTargetException;
@@ -30,7 +30,7 @@
3030
class Processor extends Interceptor {
3131

3232
@Override
33-
public Object invoke(StaplerRequest request, StaplerResponse response, Object instance, Object[] arguments)
33+
public Object invoke(StaplerRequest2 request, StaplerResponse2 response, Object instance, Object[] arguments)
3434
throws IllegalAccessException, InvocationTargetException, ServletException {
3535
target.invoke(request, response, instance, arguments);
3636
throw new InvocationTargetException(new HttpRedirect("."));

‎src/main/java/org/jenkinsci/plugins/github/admin/ValidateRepoName.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package org.jenkinsci.plugins.github.admin;
22

33
import com.cloudbees.jenkins.GitHubRepositoryName;
4-
import org.kohsuke.stapler.StaplerRequest;
5-
import org.kohsuke.stapler.StaplerResponse;
4+
import org.kohsuke.stapler.StaplerRequest2;
5+
import org.kohsuke.stapler.StaplerResponse2;
66
import org.kohsuke.stapler.interceptor.Interceptor;
77
import org.kohsuke.stapler.interceptor.InterceptorAnnotation;
88

9-
import javax.servlet.ServletException;
9+
import jakarta.servlet.ServletException;
1010
import java.lang.annotation.Retention;
1111
import java.lang.annotation.Target;
1212
import java.lang.reflect.InvocationTargetException;
@@ -16,7 +16,7 @@
1616
import static java.lang.annotation.ElementType.FIELD;
1717
import static java.lang.annotation.ElementType.METHOD;
1818
import static java.lang.annotation.RetentionPolicy.RUNTIME;
19-
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
19+
import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
2020
import static org.jenkinsci.plugins.github.util.FluentIterableWrapper.from;
2121
import static org.kohsuke.stapler.HttpResponses.errorWithoutStack;
2222

@@ -34,7 +34,7 @@
3434
class Processor extends Interceptor {
3535

3636
@Override
37-
public Object invoke(StaplerRequest request, StaplerResponse response, Object instance, Object[] arguments)
37+
public Object invoke(StaplerRequest2 request, StaplerResponse2 response, Object instance, Object[] arguments)
3838
throws IllegalAccessException, InvocationTargetException, ServletException {
3939

4040
if (!from(newArrayList(arguments)).firstMatch(instanceOf(GitHubRepositoryName.class)).isPresent()) {

‎src/main/java/org/jenkinsci/plugins/github/config/GitHubPluginConfig.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.kohsuke.github.GitHub;
2727
import org.kohsuke.stapler.DataBoundSetter;
2828
import org.kohsuke.stapler.QueryParameter;
29-
import org.kohsuke.stapler.StaplerRequest;
29+
import org.kohsuke.stapler.StaplerRequest2;
3030
import org.kohsuke.stapler.interceptor.RequirePOST;
3131
import org.slf4j.Logger;
3232
import org.slf4j.LoggerFactory;
@@ -191,7 +191,7 @@ protected XmlFile getConfigFile() {
191191
}
192192

193193
@Override
194-
public boolean configure(StaplerRequest req, JSONObject json) throws FormException {
194+
public boolean configure(StaplerRequest2 req, JSONObject json) throws FormException {
195195
hookSecretConfigs = null; // form binding might omit empty lists
196196
try {
197197
req.bindJSON(this, json);

‎src/main/java/org/jenkinsci/plugins/github/extension/GHEventsSubscriber.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ protected boolean applyNullSafe(@NonNull GHEventsSubscriber subscriber) {
222222
*/
223223
@Deprecated
224224
public static Function<GHEventsSubscriber, Void> processEvent(final GHEvent event, final String payload) {
225-
return processEvent(new GHSubscriberEvent(SCMEvent.originOf(Stapler.getCurrentRequest()), event, payload));
225+
return processEvent(new GHSubscriberEvent(SCMEvent.originOf(Stapler.getCurrentRequest2()), event, payload));
226226
}
227227

228228
/**

‎src/main/java/org/jenkinsci/plugins/github/extension/GHSubscriberEvent.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.jenkinsci.plugins.github.extension;
22

3+
import jakarta.servlet.http.HttpServletRequest;
34
import jenkins.scm.api.SCMEvent;
45
import org.kohsuke.github.GHEvent;
56

@@ -20,7 +21,7 @@ public class GHSubscriberEvent extends SCMEvent<String> {
2021
/**
2122
* Constructs a new {@link GHSubscriberEvent}.
2223
*
23-
* @param origin the origin (see {@link SCMEvent#originOf(javax.servlet.http.HttpServletRequest)}) or {@code null}.
24+
* @param origin the origin (see {@link SCMEvent#originOf(HttpServletRequest)}) or {@code null}.
2425
* @param ghEvent the type of event received from GitHub.
2526
* @param payload the event payload.
2627
*/

‎src/main/java/org/jenkinsci/plugins/github/webhook/GHEventHeader.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import org.kohsuke.github.GHEvent;
44
import org.kohsuke.stapler.AnnotationHandler;
55
import org.kohsuke.stapler.InjectedParameter;
6-
import org.kohsuke.stapler.StaplerRequest;
6+
import org.kohsuke.stapler.StaplerRequest2;
77
import org.slf4j.Logger;
88

9-
import javax.servlet.ServletException;
9+
import jakarta.servlet.ServletException;
1010
import java.lang.annotation.Documented;
1111
import java.lang.annotation.Retention;
1212
import java.lang.annotation.Target;
@@ -42,7 +42,7 @@ class PayloadHandler extends AnnotationHandler<GHEventHeader> {
4242
* @return parsed {@link GHEvent} or null on empty header or unknown value
4343
*/
4444
@Override
45-
public Object parse(StaplerRequest req, GHEventHeader a, Class type, String param) throws ServletException {
45+
public Object parse(StaplerRequest2 req, GHEventHeader a, Class type, String param) throws ServletException {
4646
isTrue(GHEvent.class.isAssignableFrom(type),
4747
"Parameter '%s' should has type %s, not %s", param,
4848
GHEvent.class.getName(),

0 commit comments

Comments
 (0)