Upgrade to Gradle 9.2.1, add JDK 25 build, upgrade plugins (#6829)

Upgrades to the current latest version of Gradle, which required upgrading a number of Gradle plugin versions and some build configuration. This unlocks building with JDK 25 but the Gradle JVM itself now requires at least 17.

Introduces the `toolchainVersion` property to control what version of the JVM toolchain we use to compile and run tests, separate from the version of the JVM used to run Gradle. Consistently uses JDK 21 to run Gradle because the current Kotlin plugin version does not support running the Gradle JVM with 25.

---------

Signed-off-by: Tommy Ludwig <8924140+shakuzen@users.noreply.github.com>
Co-authored-by: Jonatan Ivanov <jonatan.ivanov@gmail.com>

Author: shakuzen

.circleci/config.yml

@@ -1,34 +1,28 @@
 version: 2.1
 
 executors:
-  jdk24-executor:
-    working_directory: ~/micrometer
-    environment:
-      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
-    resource_class: medium+
-    docker:
-      - 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.8
-  circle-jdk17-executor:
+# TODO: add and use JDK 25 executor when upgrading to a version of the Kotlin plugin that's compatible
+#  jdk25-executor:
+#    working_directory: ~/micrometer
+#    environment:
+#      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
+#    resource_class: medium+
+#    docker:
+#      - image: cimg/openjdk:25.0
+  jdk21-executor:
     working_directory: ~/micrometer
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1g -XX:+HeapDumpOnOutOfMemoryError"'
     resource_class: medium+
     docker:
-      - image: cimg/openjdk:17.0.16
-  circle-jdk11-executor:
+      - image: cimg/openjdk:21.0.9
+  jdk17-executor:
     working_directory: ~/micrometer
     environment:
       GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1g -XX:+HeapDumpOnOutOfMemoryError"'
     resource_class: medium+
     docker:
-      - image: cimg/openjdk:11.0.28
+      - image: cimg/openjdk:17.0.17
   machine-executor:
     working_directory: ~/micrometer
     machine:
@@ -41,6 +35,9 @@ commands:
       command:
         type: string
         default: 'build'
+      toolchainVersion:
+        type: string
+        default: ''
     steps:
       - checkout
       - restore_cache:
@@ -54,7 +51,7 @@ commands:
             - ~/.gradle
       - run:
           name: run gradle command
-          command: ./gradlew << parameters.command >>
+          command: ./gradlew << parameters.command >> -PtoolchainVersion=<< parameters.toolchainVersion >>
       - run:
           name: collect test reports
           when: always
@@ -67,32 +64,36 @@ commands:
           path: ~/micrometer/test-results/
 
 jobs:
-  build-jdk24:
-    executor: jdk24-executor
+  build-jdk25:
+    executor: jdk21-executor
     steps:
-      - gradlew-build
-      - run: ./gradlew generationalShenandoahTest
+      - gradlew-build:
+          toolchainVersion: '25'
+      - run: ./gradlew generationalShenandoahTest -PtoolchainVersion=25
 
-  build:
-    executor: circle-jdk-executor
+  build-jdk21:
+    executor: jdk21-executor
     steps:
-      - gradlew-build
-      - run: ./gradlew shenandoahTest
-      - run: ./gradlew zgcTest
-      - run: ./gradlew zgcGenerationalTest
+      - gradlew-build:
+          toolchainVersion: '21'
+      - run: ./gradlew shenandoahTest -PtoolchainVersion=21
+      - run: ./gradlew zgcTest -PtoolchainVersion=21
+      - run: ./gradlew zgcGenerationalTest -PtoolchainVersion=21
 
   build-jdk11:
-    executor: circle-jdk11-executor
+    executor: jdk21-executor
     steps:
-      - gradlew-build
+      - gradlew-build:
+          toolchainVersion: '11'
 
   build-jdk17:
-    executor: circle-jdk17-executor
+    executor: jdk17-executor
     steps:
-      - gradlew-build
+      - gradlew-build:
+          toolchainVersion: '17'
 
   concurrency-tests:
-    executor: circle-jdk-executor
+    executor: jdk21-executor
     steps:
       - gradlew-build:
           command: jcstress
@@ -104,7 +105,7 @@ jobs:
           command: dockerTest
 
   deploy:
-    executor: circle-jdk-executor
+    executor: jdk21-executor
     steps:
       - checkout
       - restore_cache:
@@ -114,7 +115,7 @@ jobs:
           command: sh ./gradle/deploy.sh
 
   stackdriver-it:
-    executor: circle-jdk-executor
+    executor: jdk21-executor
     steps:
       - run:
           name: Setup Google Cloud auth
@@ -128,10 +129,10 @@ workflows:
   version: 2
   build_prs_deploy_snapshots:
     jobs:
-      - build
       - build-jdk11
       - build-jdk17
-      - build-jdk24
+      - build-jdk21
+      - build-jdk25
       - concurrency-tests
       - docker-tests
       - stackdriver-it:
@@ -146,10 +147,10 @@ workflows:
           context:
             - deploy
           requires:
-            - build
             - build-jdk11
             - build-jdk17
-            - build-jdk24
+            - build-jdk21
+            - build-jdk25
             - concurrency-tests
             - docker-tests
           filters:
@@ -159,7 +160,7 @@ workflows:
                 - /\d+\.\d+\.x/
   build_deploy_releases:
     jobs:
-      - build:
+      - build-jdk21:
           filters:
             branches:
               ignore: /.*/
@@ -177,7 +178,7 @@ workflows:
               ignore: /.*/
             tags:
               only: /^v\d+\.\d+\.\d+(-(RC|M)\d+)?$/
-      - build-jdk24:
+      - build-jdk25:
           filters:
             branches:
               ignore: /.*/
@@ -207,10 +208,10 @@ workflows:
           context:
             - deploy
           requires:
-            - build
             - build-jdk11
             - build-jdk17
-            - build-jdk24
+            - build-jdk21
+            - build-jdk25
             - concurrency-tests
             - docker-tests
           filters:

benchmarks/benchmarks-core/build.gradle

@@ -18,14 +18,6 @@ compileJava {
     options.release = 17
 }
 
-// Uncomment as needed for benchmarking against released versions of Micrometer
-//repositories {
-//    mavenCentral()
-//    maven {
-//        url "https://repo.spring.io/milestone"
-//    }
-//}
-
 dependencies {
     jmh project(':micrometer-core')
 //    jmh 'io.micrometer:micrometer-core:1.16.0-M2'

build.gradle

@@ -1,10 +1,14 @@
 buildscript {
-    ext.javaLanguageVersion = JavaLanguageVersion.of(JavaVersion.current().isJava11Compatible() ? JavaVersion.current().getMajorVersion() : 17)
+    ext.gradleJvmVersion = JavaLanguageVersion.of(JavaVersion.current().getMajorVersion())
+    ext.javaLanguageVersion = project.hasProperty('toolchainVersion') && project.property('toolchainVersion') != '' ? JavaLanguageVersion.of(project.property('toolchainVersion') as int) : gradleJvmVersion
     ext.javaTargetVersion = JavaVersion.VERSION_1_8
 
     repositories {
         mavenCentral()
         gradlePluginPortal()
+        maven {
+            url = uri("https://bndtools.jfrog.io/bndtools/libs-release")
+        }
     }
 
     dependencies {
@@ -20,12 +24,7 @@ buildscript {
         classpath libs.plugin.japicmp
         classpath libs.plugin.downloadTask
         classpath libs.plugin.spotless
-
-        if (javaLanguageVersion.asInt() < 17) {
-            classpath libs.plugin.bnd
-        } else {
-            classpath libs.plugin.bndForJava17
-        }
+        classpath libs.plugin.bnd
 
         constraints {
             classpath(libs.asmForPlugins) {
@@ -37,6 +36,10 @@ buildscript {
     configurations.classpath.resolutionStrategy.cacheDynamicVersionsFor 0, 'minutes'
 }
 
+plugins {
+    alias(libs.plugins.kotlin) apply false
+}
+
 // Hacks because of Antora's clone/checkout/worktrees behavior
 // Antora uses shallow-clone and worktrees to check out branches/tags.
 if (project.hasProperty('antora')) {
@@ -57,6 +60,8 @@ apply plugin: 'com.netflix.nebula.release'
 release.defaultVersionStrategy = nebula.plugin.release.git.opinion.Strategies.SNAPSHOT
 
 apply plugin: 'io.github.gradle-nexus.publish-plugin'
+apply plugin: 'com.netflix.nebula.info'
+apply plugin: 'com.netflix.nebula.project'
 
 allprojects {
     group = 'io.micrometer'
@@ -135,7 +140,7 @@ subprojects {
                 }
             }
         }
-        if ((project.name.contains('samples') && !project.name.contains('kotlin')) || project.name.contains('benchmarks')) {
+        if ((project.name.contains('samples') && !project.name.contains('kotlin')) || project.name.contains('benchmarks') || project.name.contains('osgi-test')) {
             apply plugin: 'java'
         } else {
             apply plugin: 'java-library'
@@ -164,9 +169,9 @@ subprojects {
 
             toolchain {
                 languageVersion = javaLanguageVersion
-                sourceCompatibility = javaTargetVersion
-                targetCompatibility = javaTargetVersion
             }
+            sourceCompatibility = javaTargetVersion
+            targetCompatibility = javaTargetVersion
         }
 
         // Dependencies for all projects that are not transitive to consumers of our modules
@@ -399,7 +404,7 @@ subprojects {
             tasks.register("testModules", Exec) {
                 dependsOn jar
                 String executablePath = javaToolchains.launcherFor { languageVersion = javaLanguageVersion }.get().executablePath
-                commandLine "$executablePath", '-p', "$jar.archivePath", '--list-modules'
+                commandLine "$executablePath", '-p', "$jar.archiveFile", '--list-modules'
                 standardOutput = new ByteArrayOutputStream()
                 ignoreExitValue = true
 
@@ -477,6 +482,10 @@ subprojects {
                 moniker 'Tommy Ludwig'
                 github 'shakuzen'
             }
+            'jivanov@vmware.com' {
+                moniker 'Jonatan Ivanov'
+                github 'jonatan-ivanov'
+            }
         }
     }
 
@@ -502,7 +511,7 @@ nexusPublishing {
 }
 
 wrapper {
-    gradleVersion = '8.14.3'
+    gradleVersion = '9.2.1'
 }
 
 defaultTasks 'build'

docs/build.gradle

@@ -93,7 +93,7 @@ tasks.named('generateAntoraYml') {
     }
 }
 
-tasks.create('generateAntoraResources') {
+tasks.register('generateAntoraResources') {
     dependsOn 'generateAntoraYml'
 }
 

gradle/libs.versions.toml

@@ -59,7 +59,7 @@ mongo = "4.11.5"
 netty = "4.2.7.Final"
 newrelic-api = "5.14.0"
 # Kotlin 1.7 sample will fail from OkHttp 4.12.0 due to okio dependency being a Kotlin 1.9 module
-okhttp = "4.11.0"
+okhttp = "4.12.0"
 postgre = "42.7.8"
 prometheus = "1.4.3"
 prometheusSimpleClient = "0.16.0"
@@ -216,21 +216,19 @@ wiremockJunit5 = { module = "ru.lanwen.wiremock:wiremock-junit5", version.ref =
 # plugin dependencies
 plugin-errorprone = { module = "net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin", version = "4.3.0" }
 plugin-license = { module = "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin", version = "0.16.1" }
-plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "18.0.8" }
-plugin-nebulaPublishing = { module = "com.netflix.nebula:nebula-publishing-plugin", version = "20.3.0" }
-plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", version = "10.1.5" }
-plugin-nebulaInfo = { module = "com.netflix.nebula:gradle-info-plugin", version = "12.1.6" }
+plugin-nebulaRelease = { module = "com.netflix.nebula:nebula-release-plugin", version = "21.0.0" }
+plugin-nebulaPublishing = { module = "com.netflix.nebula:nebula-publishing-plugin", version = "23.0.0" }
+plugin-nebulaProject = { module = "com.netflix.nebula:nebula-project-plugin", version = "13.0.0" }
+plugin-nebulaInfo = { module = "com.netflix.nebula:gradle-info-plugin", version = "16.0.0" }
 plugin-noHttp = { module = "io.spring.nohttp:nohttp-gradle", version = "0.0.11" }
-plugin-nexusPublish = { module = "io.github.gradle-nexus:publish-plugin", version = "1.3.0" }
+plugin-nexusPublish = { module = "io.github.gradle-nexus:publish-plugin", version = "2.0.0" }
 plugin-javaformat = { module = "io.spring.javaformat:spring-javaformat-gradle-plugin", version.ref = "spring-javaformat" }
 plugin-japicmp = { module = "me.champeau.gradle:japicmp-gradle-plugin", version = "0.4.6" }
 plugin-downloadTask = { module = "de.undercouch:gradle-download-task", version = "5.6.0" }
 plugin-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "6.25.0" }
-plugin-bnd = "biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0"
-plugin-bndForJava17 = "biz.aQute.bnd:biz.aQute.bnd.gradle:7.1.0"
+plugin-bnd = "biz.aQute.bnd:biz.aQute.bnd.gradle:7.2.0-RC3"
 
 [plugins]
-kotlin19 = { id = "org.jetbrains.kotlin.jvm", version = "1.9.25" }
-kotlin17 = { id = "org.jetbrains.kotlin.jvm", version = "1.7.22" }
+kotlin = { id = "org.jetbrains.kotlin.jvm", version = "2.2.21" }
 jcstress = { id = "io.github.reyerizo.gradle.jcstress", version = "0.9.0" }
 aspectj = { id = 'io.freefair.aspectj.post-compile-weaving', version = '8.14.3' }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME