[JENKINS-73314] Adapt Kubernetes Credentials for Jetty 12 (EE 9)

jenkinsci · Aug 13, 2024 · 6d32241 · 6d32241
1 parent 4ea324c
commit 6d32241
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -42,7 +42,8 @@
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
 
     <!-- jenkins versions -->
-    <jenkins.version>2.472</jenkins.version>
+    <!-- TODO JENKINS-73278 https://ci.jenkins.io/job/Core/job/jenkins/job/jakarta/ -->
+    <jenkins.version>2.472-rc35224.83b_736a_f3fc3</jenkins.version>
     <bom.artifactId>bom-2.426.x</bom.artifactId>
     <bom.version>3208.vb_21177d4b_cd9</bom.version>
 
@@ -122,6 +123,12 @@
         <scope>import</scope>
         <type>pom</type>
       </dependency>
+      <!-- TODO JENKINS-73339 until in parent POM, work around https://github.com/jenkinsci/plugin-pom/issues/936 -->
+      <dependency>
+        <groupId>jakarta.servlet</groupId>
+        <artifactId>jakarta.servlet-api</artifactId>
+        <version>5.0.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/...kinsci/plugins/kubernetes/credentials/AbstractOpenShiftBearerTokenCredentialFIPSTest.java b/...kinsci/plugins/kubernetes/credentials/AbstractOpenShiftBearerTokenCredentialFIPSTest.java
@@ -8,8 +8,8 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
-import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
-import org.eclipse.jetty.ee8.servlet.ServletHolder;
+import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee9.servlet.ServletHolder;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.junit.After;
 import org.junit.Before;

diff --git a/src/test/java/org/jenkinsci/plugins/kubernetes/credentials/MockHttpServlet.java b/src/test/java/org/jenkinsci/plugins/kubernetes/credentials/MockHttpServlet.java
@@ -1,11 +1,11 @@
 package org.jenkinsci.plugins.kubernetes.credentials;
 
-import org.eclipse.jetty.ee8.nested.Request;
+import org.eclipse.jetty.ee9.nested.Request;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

diff --git a/...java/org/jenkinsci/plugins/kubernetes/credentials/OpenShiftBearerTokenCredentialTest.java b/...java/org/jenkinsci/plugins/kubernetes/credentials/OpenShiftBearerTokenCredentialTest.java
@@ -3,8 +3,8 @@
 import com.cloudbees.plugins.credentials.CredentialsScope;
 import hudson.util.Secret;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.ee8.servlet.ServletContextHandler;
-import org.eclipse.jetty.ee8.servlet.ServletHolder;
+import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee9.servlet.ServletHolder;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;