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

jenkinsci · Jun 21, 2024 · 4921bf1 · 4921bf1
1 parent 772dad6
commit 4921bf1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,5 +1,5 @@
 buildPlugin(useContainerAgent: true, configurations: [
   [platform: 'linux', jdk: 21],
   [platform: 'linux', jdk: 17],
-  [platform: 'windows', jdk: 11],
+  [platform: 'windows', jdk: 17],
 ])
diff --git a/pom.xml b/pom.xml
@@ -25,9 +25,13 @@
   <properties>
     <revision>1.321</revision>
     <changelist>999999-SNAPSHOT</changelist>
-    <jenkins.version>2.361.4</jenkins.version>
+    <!-- TODO JENKINS-73130 https://ci.jenkins.io/job/Core/job/jenkins/job/prototype/ -->
+    <jenkins.version>2.464-rc35068.0fff405a_c344</jenkins.version>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <no-test-jar>false</no-test-jar>
+    <!-- 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>
 
   <dependencies>

diff --git a/src/test/java/jenkins/plugins/github/api/mock/MockGitHub.java b/src/test/java/jenkins/plugins/github/api/mock/MockGitHub.java
@@ -27,7 +27,7 @@
 import org.eclipse.jetty.server.HttpConnectionFactory;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
 import org.jvnet.hudson.test.ThreadPoolImpl;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.QueryParameter;