Incremental build for testing

jenkinsci · May 22, 2024 · d97aa35 · d97aa35
1 parent 44a109d
commit d97aa35
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.0-beta-7</version>
+    <version>1.8</version>
   </extension>
 </extensions>
diff --git a/pom.xml b/pom.xml
@@ -10,14 +10,14 @@
   <artifactId>kubernetes-credentials</artifactId>
   <version>${changelist}</version>
   <name>Kubernetes Credentials Plugin</name>
-  <url>https://github.com/jenkinsci/kubernetes-credentials-plugin/</url>
+  <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
   <packaging>hpi</packaging>
 
   <scm>
-    <connection>scm:git:https://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
-    <developerConnection>scm:git:ssh://git@github.com/jenkinsci/${project.artifactId}-plugin.git</developerConnection>
-    <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
-    <tag>kubernetes-credentials-0.11</tag>
+    <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
+    <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
+    <url>https://github.com/${gitHubRepo}</url>
+    <tag>${scmTag}</tag>
   </scm>
 
   <licenses>
@@ -37,11 +37,13 @@
 
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
+    <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
 
     <!-- jenkins versions -->
-    <jenkins.version>2.401.1</jenkins.version>
-    <bom.artifactId>bom-2.401.x</bom.artifactId>
-    <bom.version>2244.vd60654536b_96</bom.version>
+    <!-- TODO https://ci.jenkins.io/job/Core/job/jenkins/job/prototype/ -->
+    <jenkins.version>2.460-rc34962.8f0e6dd5fca_5</jenkins.version>
+    <bom.artifactId>bom-2.452.x</bom.artifactId>
+    <bom.version>3056.v53343b_a_b_a_850</bom.version>
 
     <!-- dependency versions -->
     <authentication-tokens.version>1.53.v1c90fd9191a_b_</authentication-tokens.version>
@@ -55,6 +57,11 @@
 
     <spotbugs.effort>Max</spotbugs.effort>
     <spotbugs.threshold>Low</spotbugs.threshold>
+
+    <!-- TODO https://github.com/jenkinsci/jenkins-test-harness/pull/762 -->
+    <jenkins-test-harness.version>2206.v1959a_b_09f662</jenkins-test-harness.version>
+    <!-- TODO JENKINS-73121 until in parent POM -->
+    <maven.compiler.release>17</maven.compiler.release>
   </properties>
 
   <dependencies>

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,6 +1,6 @@
 package org.jenkinsci.plugins.kubernetes.credentials;
 
-import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.ee8.nested.Request;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -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.ee8.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;