Skip to content

Commit 9a5d9f2

Browse files
authored
Merge pull request #380 from basil/prototype
[JENKINS-73133] Adapt GitHub for Jetty 12 (EE 8)
2 parents 56810df + e88ae5f commit 9a5d9f2

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

pom.xml

+3
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@
5454
<release.skipTests>false</release.skipTests>
5555
<tagNameFormat>v@{project.version}</tagNameFormat>
5656
<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>
5760
</properties>
5861

5962
<repositories>

src/test/java/org/jenkinsci/plugins/github/config/GitHubServerConfigIntegrationTest.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@
1414
import net.sf.json.JSONObject;
1515
import org.eclipse.jetty.server.Server;
1616
import org.eclipse.jetty.server.ServerConnector;
17-
import org.eclipse.jetty.servlet.DefaultServlet;
18-
import org.eclipse.jetty.servlet.ServletContextHandler;
19-
import org.eclipse.jetty.servlet.ServletContextHandler.Context;
20-
import org.eclipse.jetty.servlet.ServletHolder;
17+
import org.eclipse.jetty.ee8.servlet.DefaultServlet;
18+
import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
19+
import org.eclipse.jetty.ee8.servlet.ServletHolder;
2120
import org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl;
2221
import org.junit.After;
2322
import org.junit.Before;

0 commit comments

Comments
 (0)