Incremental build for testing (Jakarta)

jenkinsci · May 29, 2024 · 4ad0625 · 4ad0625
1 parent a36e093
commit 4ad0625
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -42,15 +42,21 @@
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
 
     <!-- jenkins versions -->
-    <jenkins.version>2.401.3</jenkins.version>
-    <bom.artifactId>bom-2.401.x</bom.artifactId>
-    <bom.version>2745.vc7b_fe4c876fa_</bom.version>
+    <!-- TODO https://ci.jenkins.io/job/Core/job/jenkins/job/jakarta/ -->
+    <jenkins.version>2.461-rc34995.c2e30b_e29d2d</jenkins.version>
+    <bom.artifactId>bom-2.452.x</bom.artifactId>
+    <bom.version>3080.vfa_b_e4a_a_39b_44</bom.version>
 
     <!-- maven plugins versions -->
     <maven-coveralls.version>4.3.0</maven-coveralls.version>
 
     <spotbugs.effort>Max</spotbugs.effort>
     <spotbugs.threshold>Low</spotbugs.threshold>
+
+    <!-- TODO https://github.com/jenkinsci/jenkins-test-harness/pull/631 -->
+    <jenkins-test-harness.version>2210.v7e3d41578e98</jenkins-test-harness.version>
+    <!-- TODO JENKINS-73121 until in parent POM -->
+    <maven.compiler.release>17</maven.compiler.release>
   </properties>
 
   <dependencies>
@@ -118,6 +124,12 @@
         <scope>import</scope>
         <type>pom</type>
       </dependency>
+      <!-- TODO 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/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.server.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;
@@ -36,10 +36,12 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
                 // Now create matcher object.
                 Matcher m = r.matcher(request.getPathInfo());
                 if (m.find()) {
+                    Request jettyRequest = (Request) request;
+                    String rootUrl = jettyRequest.getHttpURI().getScheme() + "://" + jettyRequest.getHttpURI().getHost() + ":" + jettyRequest.getHttpURI().getPort();
                     String responseToClient = "{\n" +
-                            "  \"issuer\": \"" + ((Request) request).getRootURL() + "\",\n" +
-                            "  \"authorization_endpoint\": \"" + ((Request) request).getRootURL() + "/" + m.group(1) + "/oauth/authorize\",\n" +
-                            "  \"token_endpoint\": \"" + ((Request) request).getRootURL() + "/oauth/token\",\n" +
+                            "  \"issuer\": \"" + rootUrl + "\",\n" +
+                            "  \"authorization_endpoint\": \"" + rootUrl + "/" + m.group(1) + "/oauth/authorize\",\n" +
+                            "  \"token_endpoint\": \"" + rootUrl + "/oauth/token\",\n" +
                             "  \"scopes_supported\": [\n" +
                             "    \"user:check-access\",\n" +
                             "    \"user:full\",\n" +

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.servlet.ServletContextHandler;
-import org.eclipse.jetty.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;
@@ -131,4 +131,4 @@ public void testAuthorizationHeader() {
         String header = OpenShiftBearerTokenCredentialImpl.getBasicAuthenticationHeader(USERNAME, Secret.fromString(PASSWORD));
         assertEquals("Basic bWF4LmxhdmVyc2U6c3VwZXItc2VjcmV0", header);
     }
-}
+}