Merge branch 'master' into logging-exMTL

Author: jimklimov

plugin/package.json

@@ -20,28 +20,28 @@
   },
   "readme": "../README.md",
   "devDependencies": {
-    "@babel/cli": "^7.27.2",
-    "@babel/core": "^7.27.4",
-    "@babel/preset-env": "^7.27.2",
+    "@babel/cli": "^7.28.0",
+    "@babel/core": "^7.28.0",
+    "@babel/preset-env": "^7.28.0",
     "@delucis/if-env": "^1.1.2",
     "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.29.0",
+    "@eslint/js": "^9.33.0",
     "autoprefixer": "^10.4.21",
     "babel-loader": "^10.0.0",
     "clean-webpack-plugin": "^4.0.0",
     "css-loader": "^7.1.2",
-    "eslint": "^9.29.0",
+    "eslint": "^9.33.0",
     "eslint-formatter-checkstyle": "^8.40.0",
     "eslint-plugin-only-warn": "^1.1.0",
-    "globals": "^16.2.0",
-    "less": "^4.3.0",
+    "globals": "^16.3.0",
+    "less": "^4.4.0",
     "less-loader": "^12.3.0",
-    "mini-css-extract-plugin": "^2.9.2",
+    "mini-css-extract-plugin": "^2.9.3",
     "postcss": "^8.5.6",
     "postcss-less": "^6.0.0",
     "postcss-loader": "^8.1.1",
     "style-loader": "^4.0.0",
-    "webpack": "^5.99.9",
+    "webpack": "^5.101.0",
     "webpack-cli": "^6.0.1",
     "webpack-fix-style-only-entries": "^0.6.1",
     "webpack-merge": "^6.0.1"

plugin/pom.xml

@@ -48,6 +48,8 @@
         <maven.test.failure.ignore>false</maven.test.failure.ignore>
         <frontend.testFailureIgnore>${maven.test.failure.ignore}</frontend.testFailureIgnore>
         <useBeta>true</useBeta> <!-- FailureHandler -->
+        <hpi.bundledArtifacts>diff4j,groovy-cps</hpi.bundledArtifacts>
+        <hpi.strictBundledArtifacts>true</hpi.strictBundledArtifacts>
     </properties>
     <dependencyManagement>
         <dependencies>

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

@@ -54,10 +54,14 @@ public int hashCode() {
         return 31 * base.hashCode() + node.hashCode();
     }
 
+    @Override
+    public String toString() {
+        return "CpsBodySubContext[" + base + ":" + node.getId()+ "]";
+    }
+
     // Delegation to 'base' from here
 //======================================
 
-
     @Override
     public void onFailure(Throwable t) {
         base.onFailure(t);

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

@@ -1311,8 +1311,6 @@ void runInCpsVmThread(final FutureCallback<CpsThreadGroup> callback) {
         }
         // first we need to wait for programPromise to fullfil CpsThreadGroup, then we need to run in its runner, phew!
         Futures.addCallback(programPromise, new FutureCallback<>() {
-            final Exception source = new Exception();   // call stack of this object captures who called this. useful during debugging.
-
             @Override
             public void onSuccess(final CpsThreadGroup g) {
                 g.runner.submit(new Runnable() {

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

@@ -296,7 +296,7 @@ public CpsBodyInvoker newBodyInvoker() {
     protected <T> T doGet(Class<T> key) throws IOException, InterruptedException {
         CpsThread t = getThreadSynchronously();
         if (t == null) {
-            throw new IOException("cannot find current thread");
+            throw new IOException("cannot find current thread in " + this);
         }
         return t.getContextVariable(key, this::getExecution, this::getNode);
     }
@@ -305,7 +305,7 @@ protected <T> T doGet(Class<T> key) throws IOException, InterruptedException {
         if (node == null) {
             node = getExecution().getNode(id);
             if (node == null) {
-                throw new IOException("no node found for " + id);
+                throw new IOException("no node found for " + id + " in " + this);
             }
         }
         return node;