Merge branch '1.4.x'

micrometer-metrics · Feb 21, 2025 · f7b2e2d · f7b2e2d
2 parents c8604aa + c538456
commit f7b2e2d
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 7 deletions.
diff --git a/docs/build.gradle b/docs/build.gradle
@@ -34,7 +34,8 @@ dependencies {
 	testImplementation project(':micrometer-tracing-test')
 	testImplementation project(':micrometer-tracing-integration-test')
 	testImplementation libs.aspectjweaver
-	testImplementation 'org.junit.jupiter:junit-jupiter'
+	testImplementation libs.junitJupiter
+	testRuntimeOnly libs.junitPlatformLauncher
 	testImplementation libs.mockitoCore
 	testImplementation libs.assertj
 	testImplementation libs.springContext

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -43,6 +43,8 @@ jmh = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
 jmhGeneratorAnnProcess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
 jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" }
 junitBom = { module = "org.junit:junit-bom", version.ref = "junit" }
+junitJupiter = { module = "org.junit.jupiter:junit-jupiter" }
+junitPlatformLauncher = { module = "org.junit.platform:junit-platform-launcher" }
 log4j = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
 micrometerContextPropagation = { module = "io.micrometer:context-propagation", version.ref = "micrometerContextPropagation" }

diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle b/micrometer-tracing-bridges/micrometer-tracing-bridge-brave/build.gradle
@@ -17,7 +17,8 @@ dependencies {
 	testImplementation project(':micrometer-tracing-test')
 	testImplementation 'io.micrometer:micrometer-core'
 	testImplementation 'io.micrometer:micrometer-observation-test'
-	testImplementation 'org.junit.jupiter:junit-jupiter'
+	testImplementation libs.junitJupiter
+	testRuntimeOnly libs.junitPlatformLauncher
 	testImplementation libs.assertj
 	testImplementation libs.awaitility
 	testImplementation 'io.zipkin.brave:brave-instrumentation-http-tests'

diff --git a/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle b/micrometer-tracing-bridges/micrometer-tracing-bridge-otel/build.gradle
@@ -19,7 +19,8 @@ dependencies {
 	testImplementation project(':micrometer-tracing-test')
 	testImplementation 'io.micrometer:micrometer-core'
 	testImplementation 'io.micrometer:micrometer-observation-test'
-	testImplementation 'org.junit.jupiter:junit-jupiter'
+	testImplementation libs.junitJupiter
+	testRuntimeOnly libs.junitPlatformLauncher
 	testImplementation libs.assertj
 	testImplementation libs.awaitility
 	testImplementation libs.mockitoCore

diff --git a/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle b/micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/build.gradle
@@ -23,7 +23,8 @@ dependencies {
 
 	// Tests
 	testImplementation project(':micrometer-tracing-test')
-	testImplementation 'org.junit.jupiter:junit-jupiter'
+	testImplementation libs.junitJupiter
+	testRuntimeOnly libs.junitPlatformLauncher
 	testImplementation libs.assertj
 	testImplementation libs.awaitility
 	testImplementation libs.logback

diff --git a/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle b/micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle
@@ -44,10 +44,11 @@ dependencies {
 	api libs.wavefrontReporter
 
 	// Tests
-	api 'org.junit.jupiter:junit-jupiter'
+	api libs.junitJupiter
 	api libs.assertj
 
 	// Tests for tests
+	testRuntimeOnly libs.junitPlatformLauncher
 	testImplementation libs.springContext
 	testImplementation libs.mockitoCore
 	testImplementation libs.wiremock

diff --git a/micrometer-tracing-tests/micrometer-tracing-test/build.gradle b/micrometer-tracing-tests/micrometer-tracing-test/build.gradle
@@ -8,7 +8,8 @@ dependencies {
 
     // Tests for tests
     testImplementation libs.logback
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation libs.junitJupiter
+    testRuntimeOnly libs.junitPlatformLauncher
     testImplementation 'org.mockito:mockito-core'
 
     // aspects

diff --git a/micrometer-tracing/build.gradle b/micrometer-tracing/build.gradle
@@ -18,7 +18,8 @@ dependencies {
 	optionalApi libs.logback
 	optionalApi libs.log4j
 
-	testImplementation 'org.junit.jupiter:junit-jupiter'
+	testImplementation libs.junitJupiter
+	testRuntimeOnly libs.junitPlatformLauncher
 	testImplementation libs.assertj
 	testImplementation libs.mockitoCore
 	testImplementation libs.mockitoJunit