diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 443e073420..c2d880dc83 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -43,8 +43,6 @@ jetty11 = "11.0.16" jetty12 = "12.0.6" jersey3 = "3.1.11" jmh = "1.37" -# latest version of jOOQ to run tests against -jooqNew = "3.20.6" jsr107 = "1.1.1" jsr305 = "3.0.2" junit = "5.13.4" @@ -151,9 +149,7 @@ jersey3Hk2 = { module = "org.glassfish.jersey.inject:jersey-hk2", version.ref = jersey3TestFrameworkJdkHttp = { module = "org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jdk-http", version.ref = "jersey3" } jmhCore = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" } jmhAnnotationProcessor = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" } -# 3.14.x is the newest version of OSS jOOQ that supports Java 8 -jooq = { module = "org.jooq:jooq", version = "3.14.16" } -jooqLatest = { module = "org.jooq:jooq", version.ref = "jooqNew" } +jooq = { module = "org.jooq:jooq", version = "3.20.7" } jsonPath = { module = "com.jayway.jsonpath:json-path", version = "2.9.0" } jspecify = { module = "org.jspecify:jspecify", version = "1.0.0" } jsr107 = { module = "org.jsr107.ri:cache-ri-impl", version.ref = "jsr107" } diff --git a/micrometer-core/build.gradle b/micrometer-core/build.gradle index 88359114a2..3e1d01f4da 100644 --- a/micrometer-core/build.gradle +++ b/micrometer-core/build.gradle @@ -138,7 +138,8 @@ dependencies { optionalApi libs.mongoSync - optionalApi libs.jooq + // 3.14.x is the newest version of OSS jOOQ that supports Java 8 + optionalApi 'org.jooq:jooq:3.14.16' optionalApi libs.kafkaClients optionalApi libs.kafkaStreams diff --git a/samples/micrometer-samples-jooq/build.gradle b/samples/micrometer-samples-jooq/build.gradle index c94ab28bd7..027c09330d 100644 --- a/samples/micrometer-samples-jooq/build.gradle +++ b/samples/micrometer-samples-jooq/build.gradle @@ -10,7 +10,7 @@ if (!javaLanguageVersion.canCompileOrRun(21)) { dependencies { implementation project(":micrometer-core") - implementation libs.jooqLatest + implementation libs.jooq testImplementation platform(libs.junitBom) testImplementation libs.junitJupiter