Merge branch '1.4.x' into 1.5.x

Author: jonatan-ivanov

.circleci/config.yml

@@ -12,23 +12,23 @@ executors:
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     docker:
-      - image: cimg/openjdk:21.0.6
-  circle-jdk11-executor:
+      - image: cimg/openjdk:21.0.8
+  circle-jdk17-executor:
     working_directory: ~/micrometer-tracing
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     docker:
-      - image: cimg/openjdk:11.0.26
-  circle-jdk17-executor:
+      - image: cimg/openjdk:17.0.16
+  circle-jdk11-executor:
     working_directory: ~/micrometer-tracing
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     docker:
-      - image: cimg/openjdk:17.0.14
+      - image: cimg/openjdk:11.0.28
   machine-executor:
     working_directory: ~/micrometer-tracing
     machine:
-      image: ubuntu-2404:2024.11.1
+      image: ubuntu-2404:2025.09.1
 
 commands:
   gradlew-build: