Merge branch '1.11.x' into 1.12.x

micrometer-metrics · Apr 24, 2024 · 6b76117 · 6b76117
2 parents 5f2e16f + 2b7738c
commit 6b76117
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 8 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -70,7 +70,6 @@ def VERSIONS = [
         libs.junitJupiter,
         libs.junitPlatformLauncher,
         libs.latencyUtils,
-        libs.mockitoCore,
         libs.mongoSync,
         libs.postgre,
         libs.slf4jApi,

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -57,7 +57,8 @@ latency-utils = "2.0.3"
 logback12 = "1.2.13"
 log4j = "2.21.1"
 maven-resolver = "1.9.18"
-mockito = "5.7.0"
+mockito4 = "4.11.0"
+mockito5 = "5.7.0"
 mongo = "4.11.2"
 netty = "4.1.108.Final"
 newrelic-api = "5.14.0"
@@ -169,7 +170,8 @@ log4j = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j"
 mavenResolverConnectorBasic = { module = "org.apache.maven.resolver:maven-resolver-connector-basic", version.ref = "maven-resolver" }
 mavenResolverTransportHttp = { module = "org.apache.maven.resolver:maven-resolver-transport-http", version.ref = "maven-resolver" }
 mavenResolverProvider = { module = "org.apache.maven:maven-resolver-provider", version = "3.9.6" }
-mockitoCore = { module = "org.mockito:mockito-core", version.ref = "mockito" }
+mockitoCore4 = { module = "org.mockito:mockito-core", version.ref = "mockito4" }
+mockitoCore5 = { module = "org.mockito:mockito-core", version.ref = "mockito5" }
 mongoSync = { module = "org.mongodb:mongodb-driver-sync", version.ref = "mongo" }
 nettyBom = { module = "io.netty:netty-bom", version.ref = "netty" }
 newrelicApi = { module = "com.newrelic.agent.java:newrelic-api", version.ref = "newrelic-api" }

diff --git a/implementations/micrometer-registry-appoptics/build.gradle b/implementations/micrometer-registry-appoptics/build.gradle
@@ -4,4 +4,5 @@ dependencies {
     implementation 'org.slf4j:slf4j-api'
 
     testImplementation project(':micrometer-test')
+    testImplementation libs.mockitoCore5
 }
diff --git a/implementations/micrometer-registry-cloudwatch/build.gradle b/implementations/micrometer-registry-cloudwatch/build.gradle
@@ -7,4 +7,5 @@ dependencies {
     implementation 'org.slf4j:slf4j-api'
 
     testImplementation project(':micrometer-test')
+    testImplementation libs.mockitoCore5
 }
diff --git a/implementations/micrometer-registry-cloudwatch2/build.gradle b/implementations/micrometer-registry-cloudwatch2/build.gradle
@@ -7,4 +7,5 @@ dependencies {
     implementation 'org.slf4j:slf4j-api'
 
     testImplementation project(':micrometer-test')
+    testImplementation libs.mockitoCore5
 }
diff --git a/implementations/micrometer-registry-datadog/build.gradle b/implementations/micrometer-registry-datadog/build.gradle
@@ -4,4 +4,5 @@ dependencies {
     implementation 'org.slf4j:slf4j-api'
 
     testImplementation project(':micrometer-test')
+    testImplementation libs.mockitoCore5
 }
diff --git a/implementations/micrometer-registry-dynatrace/build.gradle b/implementations/micrometer-registry-dynatrace/build.gradle
@@ -6,6 +6,7 @@ dependencies {
     implementation 'com.dynatrace.metric.util:dynatrace-metric-utils-java'
 
     testImplementation project(':micrometer-test')
+    testImplementation libs.mockitoCore5
     testImplementation 'com.fasterxml.jackson.core:jackson-databind'
     testImplementation 'org.awaitility:awaitility'
 }
diff --git a/implementations/micrometer-registry-new-relic/build.gradle b/implementations/micrometer-registry-new-relic/build.gradle
@@ -5,6 +5,7 @@ dependencies {
     optionalApi 'com.newrelic.agent.java:newrelic-api'
 
     testImplementation project(':micrometer-test')
+    testImplementation libs.mockitoCore5
 }
 
 jar {

diff --git a/implementations/micrometer-registry-wavefront/build.gradle b/implementations/micrometer-registry-wavefront/build.gradle
@@ -5,4 +5,5 @@ dependencies {
     implementation 'org.slf4j:slf4j-api'
 
     testImplementation project(':micrometer-test')
+    testImplementation libs.mockitoCore5
 }
diff --git a/micrometer-core/build.gradle b/micrometer-core/build.gradle
@@ -154,7 +154,7 @@ dependencies {
     // Needed for LogbackMetrics tests
     testImplementation libs.slf4jApi
 
-    testImplementation 'org.mockito:mockito-core'
+    testImplementation libs.mockitoCore5
 
     testImplementation 'org.hsqldb:hsqldb'
     testImplementation 'com.h2database:h2'

diff --git a/micrometer-jakarta9/build.gradle b/micrometer-jakarta9/build.gradle
@@ -25,6 +25,6 @@ dependencies {
         exclude group: "org.slf4j", module: "slf4j-api"
     }
     testImplementation libs.slf4jApi
-    testImplementation 'org.mockito:mockito-core'
+    testImplementation libs.mockitoCore5
     testImplementation 'org.assertj:assertj-core'
 }
diff --git a/micrometer-observation-test/build.gradle b/micrometer-observation-test/build.gradle
@@ -6,7 +6,7 @@ dependencies {
     api 'org.assertj:assertj-core'
     api 'org.junit.jupiter:junit-jupiter'
 
-    implementation 'org.mockito:mockito-core'
+    implementation libs.mockitoCore4
 
     testImplementation 'org.awaitility:awaitility'
 }
diff --git a/micrometer-observation/build.gradle b/micrometer-observation/build.gradle
@@ -38,7 +38,7 @@ dependencies {
         exclude group: "org.slf4j", module: "slf4j-api"
     }
 
-    testImplementation 'org.mockito:mockito-core'
+    testImplementation libs.mockitoCore5
 
     testImplementation 'org.assertj:assertj-core'
     testImplementation 'org.awaitility:awaitility'

diff --git a/micrometer-test/build.gradle b/micrometer-test/build.gradle
@@ -32,7 +32,7 @@ dependencies {
     api 'com.github.tomakehurst:wiremock-jre8-standalone'
     java11TestImplementation 'com.github.tomakehurst:wiremock-jre8-standalone'
 
-    api 'org.mockito:mockito-core'
+    api libs.mockitoCore4
     implementation 'org.awaitility:awaitility'
 
     testImplementation project(':micrometer-observation-test')

diff --git a/samples/micrometer-samples-hazelcast3/build.gradle b/samples/micrometer-samples-hazelcast3/build.gradle
@@ -12,4 +12,5 @@ dependencies {
     implementation 'ch.qos.logback:logback-classic'
 
     testImplementation project(':micrometer-test')
+    testImplementation libs.mockitoCore5
 }