Skip to content

Commit 68a2f37

Browse files
ampuscasMarkEWaite
andauthored
[JENKINS-73135] Require Jenkins 2.472, adapt tests for Jetty 12 EE 8 (#1678)
* [JENKINS-73135] adapt gitlab-plugin for jetty12 * Format with spotless * Use newer Jenkins LTS baseline for BOM Also include a TODO comment to restore the jenkins.version based on jenkins.baseline once an LTS baseline is available that includes 2.472. --------- Co-authored-by: Mark Waite <[email protected]>
1 parent aee213f commit 68a2f37

File tree

2 files changed

+14
-17
lines changed

2 files changed

+14
-17
lines changed

pom.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,18 @@
5252
<properties>
5353
<revision>1.8.2</revision>
5454
<changelist>-SNAPSHOT</changelist>
55-
<jenkins.baseline>2.440</jenkins.baseline>
56-
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
55+
<jenkins.baseline>2.462</jenkins.baseline>
56+
<!-- <jenkins.version>${jenkins.baseline}.3</jenkins.version> -->
57+
<!-- TODO: Remove when 2.472 is available in LTS -->
58+
<jenkins.version>2.472</jenkins.version>
5759
<spotbugs.effort>Max</spotbugs.effort>
5860
<spotbugs.threshold>Low</spotbugs.threshold>
5961
<gitHubRepo>jenkinsci/${project.artifactId}</gitHubRepo>
6062
<hpi.compatibleSinceVersion>1.4.0</hpi.compatibleSinceVersion>
6163
<mockserver.version>5.15.0</mockserver.version>
6264
<spotless.check.skip>false</spotless.check.skip>
65+
<jenkins-test-harness.version>2250.v03a_1295b_0a_30</jenkins-test-harness.version>
66+
<maven.compiler.release>17</maven.compiler.release>
6367
</properties>
6468

6569
<dependencyManagement>

src/test/java/com/dabsquared/gitlabjenkins/connection/GitLabConnectionConfigSSLTest.java

+8-15
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,20 @@
1313
import hudson.util.Secret;
1414
import java.io.IOException;
1515
import java.util.List;
16-
import javax.servlet.ServletException;
17-
import javax.servlet.http.HttpServletRequest;
18-
import javax.servlet.http.HttpServletResponse;
1916
import jenkins.model.Jenkins;
17+
import org.eclipse.jetty.http.HttpStatus;
2018
import org.eclipse.jetty.http.HttpVersion;
2119
import org.eclipse.jetty.server.Connector;
2220
import org.eclipse.jetty.server.Handler;
2321
import org.eclipse.jetty.server.HttpConfiguration;
2422
import org.eclipse.jetty.server.HttpConnectionFactory;
2523
import org.eclipse.jetty.server.Request;
24+
import org.eclipse.jetty.server.Response;
2625
import org.eclipse.jetty.server.SecureRequestCustomizer;
2726
import org.eclipse.jetty.server.Server;
2827
import org.eclipse.jetty.server.ServerConnector;
2928
import org.eclipse.jetty.server.SslConnectionFactory;
30-
import org.eclipse.jetty.server.handler.AbstractHandler;
31-
import org.eclipse.jetty.server.handler.HandlerCollection;
29+
import org.eclipse.jetty.util.Callback;
3230
import org.eclipse.jetty.util.ssl.SslContextFactory;
3331
import org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl;
3432
import org.junit.AfterClass;
@@ -128,18 +126,13 @@ public static void startJetty() throws Exception {
128126
// Set the connectors
129127
server.setConnectors(new Connector[] {http, https});
130128

131-
HandlerCollection handlerCollection = new HandlerCollection();
132-
handlerCollection.setHandlers(new Handler[] {
133-
new AbstractHandler() {
134-
public void handle(
135-
String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
136-
throws IOException, ServletException {
137-
response.setStatus(HttpServletResponse.SC_OK);
138-
baseRequest.setHandled(true);
139-
}
129+
server.setHandler(new Handler.Abstract() {
130+
@Override
131+
public boolean handle(Request request, Response response, Callback callback) throws IOException {
132+
response.setStatus(HttpStatus.OK_200);
133+
return true;
140134
}
141135
});
142-
server.setHandler(handlerCollection);
143136
server.start();
144137
}
145138

0 commit comments

Comments
 (0)