Merge branch '1.13.x'

Author: shakuzen

dependencies.gradle

@@ -31,11 +31,6 @@ def VERSIONS = [
         libs.grpcTestingProto,
         libs.grpcKotlinStub,
         libs.gmetric4j,
-        libs.prometheusMetrics,
-        libs.prometheusMetricsExpositionFormats,
-        libs.prometheusMetricsTracerCommon,
-        libs.prometheusSimpleClient,
-        libs.prometheusSimpleClientPushgateway,
         libs.restAssured,
         libs.retrofit2,
         libs.jakarta.jmsApi,
@@ -67,8 +62,6 @@ def VERSIONS = [
         libs.hibernateEntitymanager,
         libs.hsqldb,
         libs.jsr107,
-        libs.junitJupiter,
-        libs.junitPlatformLauncher,
         libs.latencyUtils,
         libs.mongoSync,
         libs.postgre,

docs/build.gradle

@@ -29,7 +29,7 @@ dependencies {
     testImplementation project(':micrometer-test')
     testImplementation project(':micrometer-observation-test')
     testImplementation libs.aspectjweaver
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation libs.junitJupiter
     testImplementation 'org.assertj:assertj-core'
     testImplementation 'org.springframework:spring-context'
     testImplementation 'io.projectreactor:reactor-core'

gradle/libs.versions.toml

@@ -164,9 +164,9 @@ jsonPath = { module = "com.jayway.jsonpath:json-path", version = "2.9.0" }
 jsr107 = { module = "org.jsr107.ri:cache-ri-impl", version.ref = "jsr107" }
 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", version.ref = "junit" }
+junitJupiter = { module = "org.junit.jupiter:junit-jupiter" }
 junitLoggingExtension = "com.innoq:junit5-logging-extension:0.2.0"
-junitPlatformLauncher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }
+junitPlatformLauncher = { module = "org.junit.platform:junit-platform-launcher" }
 kafkaClients = { module = "org.apache.kafka:kafka-clients", version.ref = "kafka" }
 kafkaStreams = { module = "org.apache.kafka:kafka-streams", version.ref = "kafka" }
 kafkaJunit = { module = "com.github.charithe:kafka-junit", version.ref = "kafka-junit" }
@@ -189,11 +189,13 @@ okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 openTelemetry-proto = { module = "io.opentelemetry.proto:opentelemetry-proto", version = "1.3.2-alpha" }
 osgiJunit5 = "org.osgi:org.osgi.test.junit5:1.3.0"
 postgre = { module = "org.postgresql:postgresql", version.ref = "postgre" }
-prometheusMetrics = { module = "io.prometheus:prometheus-metrics-core", version.ref = "prometheus" }
-prometheusMetricsExpositionFormats = { module = "io.prometheus:prometheus-metrics-exposition-formats", version.ref = "prometheus" }
-prometheusMetricsTracerCommon = { module = "io.prometheus:prometheus-metrics-tracer-common", version.ref = "prometheus" }
-prometheusSimpleClient = { module = "io.prometheus:simpleclient_common", version.ref = "prometheusSimpleClient" }
-prometheusSimpleClientPushgateway = { module = "io.prometheus:simpleclient_pushgateway", version.ref = "prometheusSimpleClient" }
+prometheusMetricsBom = { module = "io.prometheus:prometheus-metrics-bom", version.ref = "prometheus" }
+prometheusMetrics = { module = "io.prometheus:prometheus-metrics-core" }
+prometheusMetricsExpositionFormats = { module = "io.prometheus:prometheus-metrics-exposition-formats" }
+prometheusMetricsTracerCommon = { module = "io.prometheus:prometheus-metrics-tracer-common" }
+prometheusSimpleClientBom = { module = "io.prometheus:simpleclient_bom", version.ref = "prometheusSimpleClient" }
+prometheusSimpleClient = { module = "io.prometheus:simpleclient_common" }
+prometheusSimpleClientPushgateway = { module = "io.prometheus:simpleclient_pushgateway" }
 reactorBom = { module = "io.projectreactor:reactor-bom", version.ref = "reactor" }
 restAssured = { module = "io.rest-assured:rest-assured", version.ref = "rest-assured" }
 retrofit2 = { module = "com.squareup.retrofit2:retrofit", version = "2.11.0" }

implementations/micrometer-registry-prometheus-simpleclient/build.gradle

@@ -1,9 +1,11 @@
 description = 'MeterRegistry implementation for Prometheus using io.prometheus:simpleclient_common. This module is deprecated in favor of io.micrometer:micrometer-registry-prometheus that uses io.prometheus:prometheus-metrics-core.'
 
 dependencies {
+    api(platform(libs.prometheusSimpleClientBom))
+
     api project(':micrometer-core')
 
-    api 'io.prometheus:simpleclient_common'
+    api libs.prometheusSimpleClient
 
     testImplementation project(':micrometer-test')
 }

implementations/micrometer-registry-prometheus/build.gradle

@@ -1,18 +1,19 @@
 description = 'MeterRegistry implementation for Prometheus using io.prometheus:prometheus-metrics-core. If you have compatibility issues with this module, you can go back to io.micrometer:micrometer-registry-prometheus-simpleclient that uses io.prometheus:simpleclient_common.'
 
 dependencies {
+    api(platform(libs.prometheusMetricsBom))
+
     api project(':micrometer-core')
 
-    api('io.prometheus:prometheus-metrics-core') {
+    api(libs.prometheusMetrics) {
         // We only need SpanContext from prometheus-metrics-tracer-common, we don't need
         // prometheus-metrics-tracer-initializer nor the dependencies it pulls in
         exclude(group: 'io.prometheus', module: 'prometheus-metrics-tracer-initializer')
     }
-    api 'io.prometheus:prometheus-metrics-tracer-common'
-    implementation 'io.prometheus:prometheus-metrics-exposition-formats'
+    api libs.prometheusMetricsTracerCommon
+    implementation libs.prometheusMetricsExpositionFormats
 
     testImplementation project(':micrometer-test')
-    testImplementation 'io.prometheus:prometheus-metrics-tracer-common'
     testImplementation 'io.rest-assured:rest-assured'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.awaitility:awaitility'

micrometer-commons/build.gradle

@@ -8,7 +8,7 @@ dependencies {
     optionalApi libs.aspectjrt
 
     // JUnit 5
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation libs.junitJupiter
     testImplementation 'org.assertj:assertj-core'
 }
 

micrometer-core/build.gradle

@@ -151,7 +151,7 @@ dependencies {
     // testAnnotationProcessor 'com.google.dagger:dagger-compiler'
 
     // JUnit 5
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation libs.junitJupiter
     testImplementation(libs.archunitJunit5) {
         // avoid transitively pulling in slf4j 2
         exclude group: "org.slf4j", module: "slf4j-api"
@@ -198,7 +198,7 @@ dependencies {
 
     // Dependencies for @ClassPathExclusions
     testImplementation("org.junit.platform:junit-platform-engine")
-    testImplementation("org.junit.platform:junit-platform-launcher")
+    testImplementation(libs.junitPlatformLauncher)
     testImplementation(libs.mavenResolverConnectorBasic)
     testImplementation(libs.mavenResolverProvider) {
         exclude(group: "javax.inject", module: "javax.inject")

micrometer-jakarta9/build.gradle

@@ -19,7 +19,7 @@ dependencies {
 
     optionalApi 'jakarta.jms:jakarta.jms-api'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation libs.junitJupiter
     testImplementation(libs.archunitJunit5) {
         // avoid transitively pulling in slf4j 2
         exclude group: "org.slf4j", module: "slf4j-api"

micrometer-jetty11/build.gradle

@@ -4,7 +4,7 @@ dependencies {
     api project(":micrometer-core")
     api libs.jetty11Server
 
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation libs.junitJupiter
     testImplementation 'org.assertj:assertj-core'
 }
 

micrometer-observation-test/build.gradle

@@ -4,7 +4,7 @@ dependencies {
     api project(':micrometer-observation')
 
     api 'org.assertj:assertj-core'
-    api 'org.junit.jupiter:junit-jupiter'
+    api libs.junitJupiter
 
     implementation libs.mockitoCore4