[JENKINS-73133] Adapt GitHub for Jetty 12 (EE 8)

jenkinsci · Jun 21, 2024 · dd3ff7b · dd3ff7b
1 parent 69254ce
commit dd3ff7b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -50,10 +50,14 @@
  <revision>1.39.1</revision>
  <changelist>-SNAPSHOT</changelist>
  <gitHubRepo>jenkinsci/github-plugin</gitHubRepo>
- <jenkins.version>2.414.3</jenkins.version>
+ <!-- TODO JENKINS-73130 https://ci.jenkins.io/job/Core/job/jenkins/job/prototype/ -->
+ <jenkins.version>2.464-rc35068.0fff405a_c344</jenkins.version>
  <release.skipTests>false</release.skipTests>
  <tagNameFormat>v@{project.version}</tagNameFormat>
  <useBeta>true</useBeta> <!-- For Jenkins.MANAGE permission -->
+ <!-- TODO JENKINS-73339 until in parent POM -->
+ <jenkins-test-harness.version>2230.v4fa_477b_634f4</jenkins-test-harness.version>
+ <maven.compiler.release>17</maven.compiler.release>
  </properties>
 
  <repositories>

diff --git a/src/test/java/org/jenkinsci/plugins/github/config/GitHubServerConfigIntegrationTest.java b/src/test/java/org/jenkinsci/plugins/github/config/GitHubServerConfigIntegrationTest.java
@@ -14,10 +14,9 @@
 import net.sf.json.JSONObject;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.servlet.DefaultServlet;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletContextHandler.Context;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee8.servlet.DefaultServlet;
+import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
 import org.jenkinsci.plugins.plaincredentials.impl.StringCredentialsImpl;
 import org.junit.After;
 import org.junit.Before;