Merge branch 'master' into combobox-rework

timja · Oct 19, 2024 · c0d4274 · c0d4274
2 parents b567252 + 091953f
commit c0d4274
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -62,7 +62,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>6.1.13</version>
+        <version>6.1.14</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/core/src/site/site.xml b/core/src/site/site.xml
@@ -40,7 +40,7 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.12.0</version>
+        <version>2.0.0-M11</version>
     </skin>
     <custom>
         <matomo>

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.123</version>
+    <version>1.125</version>
     <relativePath />
   </parent>
 
@@ -87,7 +87,7 @@ THE SOFTWARE.
     <changelog.url>https://www.jenkins.io/changelog</changelog.url>
 
     <!-- Bundled Remoting version -->
-    <remoting.version>3261.v9c670a_4748a_9</remoting.version>
+    <remoting.version>3270.v9e0d174083ed</remoting.version>
 
     <spotbugs.effort>Max</spotbugs.effort>
     <spotbugs.threshold>Medium</spotbugs.threshold>

diff --git a/test/pom.xml b/test/pom.xml
@@ -134,7 +134,7 @@ THE SOFTWARE.
         <!-- Required by plugin-util-api -->
         <groupId>org.jenkins-ci.plugins.workflow</groupId>
         <artifactId>workflow-support</artifactId>
-        <version>926.v9f4f9b_b_98c19</version>
+        <version>930.vf51d22b_ce488</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -230,7 +230,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
-      <version>1304.vc85a_b_ca_96613</version>
+      <version>1307.vdd5b_2646279e</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/test/src/test/java/hudson/cli/DeleteBuildsCommandTest.java b/test/src/test/java/hudson/cli/DeleteBuildsCommandTest.java
@@ -36,6 +36,7 @@
 import hudson.model.ExecutorTest;
 import hudson.model.FreeStyleProject;
 import hudson.model.Item;
+import hudson.model.Result;
 import hudson.model.Run;
 import hudson.model.labels.LabelAtom;
 import hudson.tasks.Shell;
@@ -139,7 +140,7 @@ public class DeleteBuildsCommandTest {
     @Issue("JENKINS-73835")
     @Test public void deleteBuildsShouldFailIfTheBuildIsRunning() throws Exception {
         FreeStyleProject project = j.createFreeStyleProject("aProject");
-        ExecutorTest.startBlockingBuild(project);
+        var build = ExecutorTest.startBlockingBuild(project);
         assertThat(((FreeStyleProject) j.jenkins.getItem("aProject")).getBuilds(), hasSize(1));
 
         final CLICommandInvoker.Result result = command
@@ -148,6 +149,9 @@ public class DeleteBuildsCommandTest {
         assertThat(result, failedWith(1));
         assertThat(result, hasNoStandardOutput());
         assertThat(result.stderr(), containsString("Unable to delete aProject #1 because it is still running"));
+
+        build.doStop();
+        j.assertBuildStatus(Result.ABORTED, j.waitForCompletion(build));
     }
 
     @Test public void deleteBuildsShouldSuccessEvenTheBuildIsStuckInTheQueue() throws Exception {

diff --git a/war/pom.xml b/war/pom.xml
@@ -314,7 +314,7 @@ THE SOFTWARE.
                   <!-- detached after 1.577 -->
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>junit</artifactId>
-                  <version>1304.vc85a_b_ca_96613</version>
+                  <version>1307.vdd5b_2646279e</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>
@@ -350,7 +350,7 @@ THE SOFTWARE.
                   <!-- dependency of checks-api and plugin-util-api -->
                   <groupId>org.jenkins-ci.plugins.workflow</groupId>
                   <artifactId>workflow-support</artifactId>
-                  <version>926.v9f4f9b_b_98c19</version>
+                  <version>930.vf51d22b_ce488</version>
                   <type>hpi</type>
                 </artifactItem>
 
@@ -365,7 +365,7 @@ THE SOFTWARE.
                   <!-- dependency of junit -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>echarts-api</artifactId>
-                  <version>5.5.1-2</version>
+                  <version>5.5.1-3</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>
@@ -523,7 +523,7 @@ THE SOFTWARE.
                   <!-- dependency of trilead-api -->
                   <groupId>io.jenkins.plugins</groupId>
                   <artifactId>gson-api</artifactId>
-                  <version>2.11.0-41.v019fcf6125dc</version>
+                  <version>2.11.0-85.v1f4e87273c33</version>
                   <type>hpi</type>
                 </artifactItem>
                 <artifactItem>