Merge branch 'master' into logging-exMTL

Author: jimklimov

.mvn/extensions.xml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.8</version>
+    <version>1.10</version>
   </extension>
 </extensions>

lib/pom.xml

@@ -50,7 +50,7 @@
         <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
-            <version>3.5.0</version>
+            <version>3.5.1</version>
             <executions>
                 <execution>
                     <phase>generate-sources</phase>

plugin/package.json

@@ -20,34 +20,34 @@
   },
   "readme": "../README.md",
   "devDependencies": {
-    "@babel/cli": "^7.27.0",
-    "@babel/core": "^7.26.10",
-    "@babel/preset-env": "^7.26.9",
+    "@babel/cli": "^7.27.2",
+    "@babel/core": "^7.27.4",
+    "@babel/preset-env": "^7.27.2",
     "@delucis/if-env": "^1.1.2",
     "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.24.0",
+    "@eslint/js": "^9.29.0",
     "autoprefixer": "^10.4.21",
     "babel-loader": "^10.0.0",
     "clean-webpack-plugin": "^4.0.0",
     "css-loader": "^7.1.2",
-    "eslint": "^9.24.0",
+    "eslint": "^9.29.0",
     "eslint-formatter-checkstyle": "^8.40.0",
     "eslint-plugin-only-warn": "^1.1.0",
-    "globals": "^16.0.0",
+    "globals": "^16.2.0",
     "less": "^4.3.0",
-    "less-loader": "^12.2.0",
+    "less-loader": "^12.3.0",
     "mini-css-extract-plugin": "^2.9.2",
-    "postcss": "^8.4.35",
+    "postcss": "^8.5.6",
     "postcss-less": "^6.0.0",
     "postcss-loader": "^8.1.1",
     "style-loader": "^4.0.0",
-    "webpack": "^5.99.5",
+    "webpack": "^5.99.9",
     "webpack-cli": "^6.0.1",
     "webpack-fix-style-only-entries": "^0.6.1",
     "webpack-merge": "^6.0.1"
   },
   "dependencies": {
-    "ace-builds": "^1.40.0",
+    "ace-builds": "^1.43.2",
     "jquery": "^3.7.1",
     "jquery-ui": "^1.14.1"
   },

plugin/pom.xml

@@ -47,13 +47,14 @@
         <!-- Opt in to Jenkins handling eslint results -->
         <maven.test.failure.ignore>false</maven.test.failure.ignore>
         <frontend.testFailureIgnore>${maven.test.failure.ignore}</frontend.testFailureIgnore>
+        <useBeta>true</useBeta> <!-- FailureHandler -->
     </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-${jenkins.baseline}.x</artifactId>
-                <version>4488.v7fe26526366e</version>
+                <version>5043.v855ff4819a_0f</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -229,7 +230,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.20.6</version>
+            <version>1.21.3</version>
             <scope>test</scope>
             <exclusions>
                 <!-- Provided by Jenkins core -->
@@ -255,6 +256,11 @@
             <artifactId>test-harness</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.jenkins.plugins</groupId>
+            <artifactId>commons-lang3-api</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java

@@ -18,6 +18,7 @@
 import org.jenkinsci.plugins.workflow.cps.persistence.PersistenceContext;
 import org.jenkinsci.plugins.workflow.steps.BodyExecution;
 import org.jenkinsci.plugins.workflow.steps.BodyExecutionCallback;
+import org.jenkinsci.plugins.workflow.steps.FailureHandler;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.jenkinsci.plugins.workflow.steps.StepExecution;
 
@@ -344,14 +345,16 @@ public Next receive(Object o) {
                 StepStartNode ssn = addBodyStartFlowNode(h);
                 h.setNewHead(ssn);
             }
-
             StepEndNode en = addBodyEndFlowNode();
             Throwable t = (Throwable)o;
+
+            var sc = new CpsBodySubContext(context, en);
+            t = handleError(sc, t);
+
             en.addAction(new ErrorAction(t));
             CpsFlowExecution.maybeAutoPersistNode(en);
 
             setOutcome(new Outcome(null,t));
-            StepContext sc = new CpsBodySubContext(context, en);
             for (BodyExecutionCallback c : callbacks) {
                 try {
                     c.onFailure(sc, t);
@@ -366,6 +369,27 @@ public Next receive(Object o) {
             return Next.terminate(null);
         }
 
+        private Throwable handleError(CpsBodySubContext sc, Throwable t) {
+            CpsThread localThread;
+            synchronized (CpsBodyExecution.this) {
+                localThread = thread;
+            }
+            try {
+                var contextVars = localThread.getContextVariables();
+                // CpsFlowExecution.start sets the context variables for the initial CpsThread to null, so context
+                // variables for all subsequent threads remain null until a block step adds a variable to its body.
+                if (contextVars != null) {
+                    var handler = contextVars.get(FailureHandler.class, localThread::getExecution, sc::getNode);
+                    if (handler != null) {
+                        return handler.handle(sc, t);
+                    }
+                }
+            } catch (Throwable t2) {
+                t.addSuppressed(t2);
+            }
+            return t;
+        }
+
         private static final long serialVersionUID = 1L;
     }
 

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodySubContext.java

@@ -35,7 +35,7 @@ final class CpsBodySubContext extends DefaultStepContext {
 
     @NonNull
     @Override
-    protected FlowNode getNode() throws IOException {
+    protected FlowNode getNode() {
         return node;
     }
 

plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java

@@ -41,7 +41,6 @@
 import hudson.util.StreamTaskListener;
 import jenkins.model.Jenkins;
 import net.sf.json.JSONObject;
-import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.workflow.cps.persistence.PersistIn;
 import org.jenkinsci.plugins.workflow.flow.DurabilityHintProvider;
 import org.jenkinsci.plugins.workflow.flow.FlowDefinition;
@@ -56,6 +55,7 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
 
 import net.sf.json.JSON;
 import net.sf.json.JSONArray;
@@ -170,7 +170,7 @@ public FlowDefinition newInstance(@NonNull StaplerRequest req, @NonNull JSONObje
         private FlowDefinition newInstanceImpl(CpsFlowDefinition cpsFlowDefinition, @NonNull StaplerRequest2 req, @NonNull JSONObject formData) {
             if (!cpsFlowDefinition.sandbox && formData.get("oldScript") != null) {
                 String oldScript = formData.getString("oldScript");
-                boolean approveIfAdmin = !StringUtils.equals(oldScript, cpsFlowDefinition.script);
+                boolean approveIfAdmin = !Objects.equals(oldScript, cpsFlowDefinition.script);
                 if (approveIfAdmin) {
                     ScriptApproval.get().configuring(cpsFlowDefinition.script, GroovyLanguage.get(),
                             ApprovalContext.create().withCurrentUser().withItemAsKey(req.findAncestorObject(Item.class)), true);
@@ -188,7 +188,7 @@ public String getDisplayName() {
         public FormValidation doCheckScript(@QueryParameter String value, @QueryParameter String oldScript,
                                             @QueryParameter boolean sandbox) {
             return sandbox ? FormValidation.ok() :
-                    ScriptApproval.get().checking(value, GroovyLanguage.get(), !StringUtils.equals(oldScript, value));
+                    ScriptApproval.get().checking(value, GroovyLanguage.get(), !Objects.equals(oldScript, value));
         }
 
         @RequirePOST