Merge branch '3.5.x' into 4.0.x

Closes gh-50617

Author: snicoll

core/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/ProcessRunner.java

@@ -123,7 +123,8 @@ private int waitForProcess(Process process) {
 			return process.waitFor();
 		}
 		catch (InterruptedException ex) {
-			throw new IllegalStateException("Interrupted waiting for %s".formatted(process));
+			Thread.currentThread().interrupt();
+			throw new IllegalStateException("Interrupted waiting for %s".formatted(process), ex);
 		}
 	}
 
@@ -175,6 +176,7 @@ public String toString() {
 				return this.output.toString();
 			}
 			catch (InterruptedException ex) {
+				Thread.currentThread().interrupt();
 				return "";
 			}
 		}