Merge pull request #114 from jonesbusy/feature/bump-core

Bump Jenkins baseline to 2.479 and use StaplerRequest2
jenkinsci · Nov 17, 2024 · ebb2e36 · ebb2e36
2 parents 6f74839 + c1b4321
commit ebb2e36
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,6 +3,7 @@
  https://github.com/jenkins-infra/pipeline-library/
 */
 buildPlugin(
+  forkCount: '1C', // run this number of tests in parallel for faster feedback.  If the number terminates with a 'C', the value will be multiplied by the number of available CPU cores
   useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
   configurations: [
     [platform: 'linux', jdk: 21],

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.88</version>
+    <version>5.2</version>
     <relativePath />
   </parent>
   <groupId>io.jenkins.plugins</groupId>
@@ -28,8 +28,8 @@
   </scm>
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
-    <jenkins.baseline>2.440</jenkins.baseline>
-    <jenkins.version>${jenkins.baseline}.3</jenkins.version>
+    <jenkins.baseline>2.479</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.1</jenkins.version>
     <hpi.compatibleSinceVersion>0.13-rc</hpi.compatibleSinceVersion>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>
@@ -39,7 +39,7 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>3435.v238d66a_043fb_</version>
+        <version>3696.vb_b_4e2d1a_0542</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/src/main/java/io/jenkins/plugins/pipeline/PipelineAsYamlScmFlowDefinition.java b/src/main/java/io/jenkins/plugins/pipeline/PipelineAsYamlScmFlowDefinition.java
@@ -16,7 +16,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.Stapler;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 /**
  * SCM Binder class for {@link org.jenkinsci.plugins.workflow.multibranch.WorkflowBranchProjectFactory}
@@ -87,7 +87,7 @@ public String getDisplayName() {
         }
 
         public Collection<? extends SCMDescriptor<?>> getApplicableDescriptors() {
-            StaplerRequest req = Stapler.getCurrentRequest();
+            StaplerRequest2 req = Stapler.getCurrentRequest2();
             Job<?, ?> job = req != null ? req.findAncestorObject(Job.class) : null;
             return SCM._for(job);
         }