Merge branch '1.15.x'

Author: shakuzen

.circleci/config.yml

@@ -1,38 +1,38 @@
 version: 2.1
 
 executors:
-  jdk24-executor:
+  circle-jdk24-executor:
     working_directory: ~/micrometer
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
     resource_class: medium+
     docker:
-      - image: gradle:8-jdk24
+      - image: cimg/openjdk:24.0.2
   circle-jdk-executor:
     working_directory: ~/micrometer
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1g -XX:+HeapDumpOnOutOfMemoryError"'
     resource_class: medium+
     docker:
-      - image: cimg/openjdk:21.0.6
+      - image: cimg/openjdk:21.0.8
   circle-jdk17-executor:
     working_directory: ~/micrometer
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1g -XX:+HeapDumpOnOutOfMemoryError"'
     resource_class: medium+
     docker:
-      - image: cimg/openjdk:17.0.14
+      - image: cimg/openjdk:17.0.16
   circle-jdk11-executor:
     working_directory: ~/micrometer
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1g -XX:+HeapDumpOnOutOfMemoryError"'
     resource_class: medium+
     docker:
-      - image: cimg/openjdk:11.0.26
+      - image: cimg/openjdk:11.0.28
   machine-executor:
     working_directory: ~/micrometer
     machine:
-      image: ubuntu-2404:2024.11.1
+      image: ubuntu-2404:2025.09.1
 
 commands:
   gradlew-build:
@@ -68,9 +68,10 @@ commands:
 
 jobs:
   build-jdk24:
-    executor: jdk24-executor
+    executor: circle-jdk24-executor
     steps:
       - gradlew-build
+      - run: ./gradlew jdk24Test
       - run: ./gradlew generationalShenandoahTest
 
   build: