Backport JDK 24 build job to 1.15.x

We are testing 1.15.x with Java 24 too (see gh-6804) so changes
in gh-6400 are needed on 1.15.x.

Closes gh-6809
See gh-6804
See gh-6400

Author: shakuzen

.circleci/config.yml

@@ -71,7 +71,6 @@ jobs:
     executor: circle-jdk24-executor
     steps:
       - gradlew-build
-      - run: ./gradlew jdk24Test
 
   build:
     executor: circle-jdk-executor

micrometer-java21/build.gradle

@@ -22,16 +22,6 @@ tasks.withType(JavaCompile).configureEach {
     options.release = 21
 }
 
-tasks.register('jdk24Test', Test) {
-    useJUnitPlatform {
-        includeTags 'jdk24'
-    }
-
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(24)
-    }
-}
-
 tasks.register('reflectiveTests', Test) {
     useJUnitPlatform {
         includeTags 'reflective'
@@ -49,6 +39,6 @@ tasks.register('reflectiveTests', Test) {
 test {
     dependsOn reflectiveTests
     useJUnitPlatform {
-        excludeTags 'reflective', 'jdk24'
+        excludeTags 'reflective'
     }
 }

micrometer-java21/src/test/java/io/micrometer/java21/instrument/binder/jdk/VirtualThreadMetricsJdk24Tests.java

@@ -19,16 +19,17 @@
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 
 import java.time.Duration;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@Tag("jdk24")
+@EnabledForJreRange(min = JRE.JAVA_24)
 class VirtualThreadMetricsJdk24Tests {
 
     MeterRegistry registry = new SimpleMeterRegistry();

micrometer-java21/src/test/java/io/micrometer/java21/instrument/binder/jdk/VirtualThreadMetricsTests.java

@@ -21,6 +21,8 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -58,6 +60,8 @@ void tearDown() {
     }
 
     @Test
+    @DisabledForJreRange(min = JRE.JAVA_24,
+            disabledReason = "It's not easy to test pinning with synchronized block pinning fixed in 24.")
     void pinnedEventsShouldBeRecorded() {
         try (ExecutorService executor = Executors.newVirtualThreadPerTaskExecutor()) {
             CountDownLatch latch = new CountDownLatch(1);