Merge branch 'master' into SECURITY-771/Fix-test-logic

Author: A1exKH

core/src/main/java/jenkins/triggers/ReverseBuildTrigger.java

@@ -166,7 +166,7 @@ private boolean shouldTrigger(Run upstreamBuild, TaskListener listener) {
             return false;
         }
         Result result = upstreamBuild.getResult();
-        return result != null && result.isBetterOrEqualTo(threshold);
+        return result != null && result.isBetterOrEqualTo(threshold != null ? threshold : Result.SUCCESS);
     }
 
     @Override public void buildDependencyGraph(final AbstractProject downstream, DependencyGraph graph) {

pom.xml

@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.542</revision>
+    <revision>2.543</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2025-12-08T17:18:44Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-12-16T11:28:32Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>

test/pom.xml

@@ -244,7 +244,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
-      <version>1361.vfed194a_de34a_</version>
+      <version>1380.v491ff054cd35</version>
       <scope>test</scope>
     </dependency>
     <dependency>

test/src/test/java/jenkins/triggers/ReverseBuildTriggerTest.java

@@ -189,25 +189,30 @@ void upstreamProjectSecurity() throws Exception {
         assertEquals(3, downstream.getLastBuild().number);
     }
 
-    @Issue("JENKINS-29876")
+    @Issue({"JENKINS-29876", "JENKINS-39044", "https://github.com/jenkinsci/jenkins/issues/17611"})
     @Test
     void nullJobInTriggerNotCausesNPE() throws Exception {
         final FreeStyleProject upstreamJob = r.createFreeStyleProject("upstream");
 
         //job with trigger.job == null
         final FreeStyleProject downstreamJob1 = r.createFreeStyleProject("downstream1");
-        final ReverseBuildTrigger reverseBuildTrigger = new ReverseBuildTrigger("upstream", Result.SUCCESS);
+        final ReverseBuildTrigger reverseBuildTrigger = new ReverseBuildTrigger("upstream");
         downstreamJob1.addTrigger(reverseBuildTrigger);
         downstreamJob1.save();
 
         //job with trigger.job != null
         final FreeStyleProject downstreamJob2 = r.createFreeStyleProject("downstream2");
-        final ReverseBuildTrigger reverseBuildTrigger2 = new ReverseBuildTrigger("upstream", Result.SUCCESS);
+        final ReverseBuildTrigger reverseBuildTrigger2 = new ReverseBuildTrigger("upstream");
         downstreamJob2.addTrigger(reverseBuildTrigger2);
         downstreamJob2.save();
         r.configRoundtrip(downstreamJob2);
 
         r.jenkins.rebuildDependencyGraph();
+
+        // JENKINS-39044 - NPE if trigger threshold is null
+        ReverseBuildTrigger trigger = downstreamJob2.getTrigger(ReverseBuildTrigger.class);
+        trigger.setThreshold(null);
+
         final FreeStyleBuild build = r.buildAndAssertSuccess(upstreamJob);
         r.waitUntilNoActivity();
 

war/pom.xml

@@ -318,7 +318,7 @@ THE SOFTWARE.
                   <!-- detached after 1.577 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>junit</artifactId>
-                  <version>1361.vfed194a_de34a_</version>
+                  <version>1380.v491ff054cd35</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>
@@ -349,6 +349,13 @@ THE SOFTWARE.
                   <version>373.vfe7645102093</version>
                   <type>hpi</type>
                 </artifactItem>
+                <artifactItem>
+                  <!-- dependency of junit -->
+                  <groupId>io.jenkins.plugins</groupId>
+                  <artifactId>prism-api</artifactId>
+                  <version>1.30.0-630.va_e19d17f83b_0</version>
+                  <type>hpi</type>
+                </artifactItem>
 
                 <artifactItem>
                   <!-- dependency of checks-api and plugin-util-api -->