diff --git a/build.gradle.kts b/build.gradle.kts index f722b0cd49c..2084c7f1fad 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ plugins { id("io.github.gradle-nexus.publish-plugin") version "2.0.0" id("com.gradleup.shadow") version "8.3.6" apply false - id("me.champeau.jmh") version "0.7.0" apply false + id("me.champeau.jmh") version "0.7.3" apply false id("org.gradle.playframework") version "0.13" apply false id("info.solidsoft.pitest") version "1.9.11" apply false } diff --git a/dd-java-agent/agent-bootstrap/build.gradle b/dd-java-agent/agent-bootstrap/build.gradle index 547eadc939e..9608df7010a 100644 --- a/dd-java-agent/agent-bootstrap/build.gradle +++ b/dd-java-agent/agent-bootstrap/build.gradle @@ -63,7 +63,7 @@ idea { } jmh { - jmhVersion = '1.32' + jmhVersion = libs.versions.jmh.get() duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE } diff --git a/dd-java-agent/agent-iast/build.gradle b/dd-java-agent/agent-iast/build.gradle index 363d4094ee7..1bd32c49adf 100644 --- a/dd-java-agent/agent-iast/build.gradle +++ b/dd-java-agent/agent-iast/build.gradle @@ -112,7 +112,7 @@ spotless { } jmh { - jmhVersion = '1.28' + jmhVersion = libs.versions.jmh.get() duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE } diff --git a/dd-java-agent/agent-tooling/build.gradle b/dd-java-agent/agent-tooling/build.gradle index 4643e4cfadc..7c4b48f35e9 100644 --- a/dd-java-agent/agent-tooling/build.gradle +++ b/dd-java-agent/agent-tooling/build.gradle @@ -63,7 +63,7 @@ dependencies { } jmh { - jmhVersion = '1.32' + jmhVersion = libs.versions.jmh.get() includeTests = true } compileJmhJava.dependsOn compileTestJava diff --git a/dd-java-agent/appsec/build.gradle b/dd-java-agent/appsec/build.gradle index abe0b1fa5d4..aca7f3f309c 100644 --- a/dd-java-agent/appsec/build.gradle +++ b/dd-java-agent/appsec/build.gradle @@ -51,7 +51,7 @@ processResources { } jmh { - jmhVersion = '1.32' + jmhVersion = libs.versions.jmh.get() duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE jvmArgs = ['-Ddd.appsec.enabled=true -Xms64m -Xmx64m'] failOnError = false diff --git a/dd-java-agent/benchmark/build.gradle b/dd-java-agent/benchmark/build.gradle index 0ea6674c959..8bb9e2f6def 100644 --- a/dd-java-agent/benchmark/build.gradle +++ b/dd-java-agent/benchmark/build.gradle @@ -35,7 +35,7 @@ jmh { // Allows to include test sources into generate JMH jar, i.e. use it when benchmarks depend on the test classes. duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE - jmhVersion = '1.23' // Specifies JMH version + jmhVersion = libs.versions.jmh.get() } tasks.named('jmh').configure { diff --git a/dd-java-agent/instrumentation/jdbc/build.gradle b/dd-java-agent/instrumentation/jdbc/build.gradle index 1898efd78b4..096f227a660 100644 --- a/dd-java-agent/instrumentation/jdbc/build.gradle +++ b/dd-java-agent/instrumentation/jdbc/build.gradle @@ -87,6 +87,6 @@ tasks.withType(Test).configureEach { } jmh { - jmhVersion = '1.28' + jmhVersion = libs.versions.jmh.get() duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE } diff --git a/dd-trace-core/build.gradle b/dd-trace-core/build.gradle index 409477bac3f..3c64189161c 100644 --- a/dd-trace-core/build.gradle +++ b/dd-trace-core/build.gradle @@ -101,6 +101,6 @@ dependencies { } jmh { - jmhVersion = '1.28' + jmhVersion = libs.versions.jmh.get() duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE } diff --git a/dd-trace-ot/build.gradle.kts b/dd-trace-ot/build.gradle.kts index 03df2f5bf48..d7f9f8a8aff 100644 --- a/dd-trace-ot/build.gradle.kts +++ b/dd-trace-ot/build.gradle.kts @@ -194,7 +194,7 @@ jmh { // warmupBenchmarks = ['.*Warmup'] // Warmup benchmarks to include in the run in addition to already selected. JMH will not measure these benchmarks, but only use them for the warmup. // zip64 = true // Use ZIP64 format for bigger archives - jmhVersion = "1.23" // Specifies JMH version + jmhVersion = libs.versions.jmh.get() // includeTests = true // Allows to include test sources into generate JMH jar, i.e. use it when benchmarks depend on the test classes. // duplicateClassesStrategy = 'warn' // Strategy to apply when encountring duplicate classes during creation of the fat jar (i.e. while executing jmhJar task) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 344e3aa18db..c945353e6ed 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,6 +34,7 @@ ddprof = "1.29.0" asm = "9.8" cafe_crypto = "0.1.0" lz4 = "1.7.1" +jmh = "1.37" [libraries] slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } diff --git a/internal-api/build.gradle.kts b/internal-api/build.gradle.kts index 1698da8a928..eb25ebd9ac8 100644 --- a/internal-api/build.gradle.kts +++ b/internal-api/build.gradle.kts @@ -290,6 +290,6 @@ dependencies { } jmh { - jmhVersion = "1.32" + jmhVersion = libs.versions.jmh.get() duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE } diff --git a/internal-api/internal-api-9/build.gradle.kts b/internal-api/internal-api-9/build.gradle.kts index d246ac7e1db..a1030f86447 100644 --- a/internal-api/internal-api-9/build.gradle.kts +++ b/internal-api/internal-api-9/build.gradle.kts @@ -54,7 +54,7 @@ idea { } jmh { - jmhVersion = "1.28" + jmhVersion = libs.versions.jmh.get() duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE jvm = System.getenv("JAVA_11_HOME") + "/bin/java" } diff --git a/telemetry/build.gradle.kts b/telemetry/build.gradle.kts index e6827204ee3..427ac5baa32 100644 --- a/telemetry/build.gradle.kts +++ b/telemetry/build.gradle.kts @@ -54,6 +54,6 @@ dependencies { } jmh { - jmhVersion = "1.28" + jmhVersion = libs.versions.jmh.get() duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE }