From 6eca017a187268e24035ef425039c17e85447800 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 29 Mar 2022 12:55:41 -0400 Subject: [PATCH] GH-1444: Move to Micrometer Snapshots https://github.com/spring-projects/spring-amqp/issues/1444 Phase 0 --- build.gradle | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index a1f0a3533d..e431c4e673 100644 --- a/build.gradle +++ b/build.gradle @@ -55,14 +55,15 @@ ext { log4jVersion = '2.17.1' logbackVersion = '1.2.3' lz4Version = '1.8.0' - micrometerVersion = '2.0.0-M3' + micrometerVersion = '2.0.0-SNAPSHOT' + micrometerTracingVersion = '1.0.0-SNAPSHOT' mockitoVersion = '4.0.0' rabbitmqStreamVersion = '0.4.0' rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.13.1' rabbitmqHttpClientVersion = '3.12.1' reactorVersion = '2020.0.17' snappyVersion = '1.1.8.4' - springDataCommonsVersion = '3.0.0-M3' + springDataVersion = '2022.0.0-M3' springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M3' springRetryVersion = '1.3.2' zstdJniVersion = '1.5.0-2' @@ -93,6 +94,9 @@ allprojects { mavenBom "org.springframework:spring-framework-bom:$springVersion" mavenBom "io.projectreactor:reactor-bom:$reactorVersion" mavenBom "org.apache.logging.log4j:log4j-bom:$log4jVersion" + mavenBom "org.springframework.data:spring-data-bom:$springDataVersion" + mavenBom "io.micrometer:micrometer-bom:$micrometerVersion" + mavenBom "io.micrometer:micrometer-tracing-bom:$micrometerTracingVersion" } } @@ -356,7 +360,7 @@ project('spring-amqp') { optionalApi 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' // Spring Data projection message binding support - optionalApi ("org.springframework.data:spring-data-commons:$springDataCommonsVersion") { + optionalApi ('org.springframework.data:spring-data-commons') { exclude group: 'org.springframework' exclude group: 'io.micrometer' } @@ -382,10 +386,10 @@ project('spring-rabbit') { optionalApi 'io.projectreactor:reactor-core' optionalApi "ch.qos.logback:logback-classic:$logbackVersion" optionalApi 'org.apache.logging.log4j:log4j-core' - optionalApi "io.micrometer:micrometer-core:$micrometerVersion" - optionalApi "io.micrometer:micrometer-binders:$micrometerVersion" + optionalApi 'io.micrometer:micrometer-binders' + optionalApi 'io.micrometer:micrometer-tracing-api' // Spring Data projection message binding support - optionalApi ("org.springframework.data:spring-data-commons:$springDataCommonsVersion") { + optionalApi ("org.springframework.data:spring-data-commons") { exclude group: 'org.springframework' } optionalApi "com.jayway.jsonpath:json-path:$jaywayJsonPathVersion" @@ -394,6 +398,9 @@ project('spring-rabbit') { testApi project(':spring-rabbit-junit') testImplementation("com.willowtreeapps.assertk:assertk-jvm:$assertkVersion") testImplementation "org.hibernate.validator:hibernate-validator:$hibernateValidationVersion" + testImplementation 'io.micrometer:micrometer-tracing-bridge-brave' + testImplementation 'io.micrometer:micrometer-tracing-test' + testImplementation 'io.micrometer:micrometer-tracing-integration-test' testRuntimeOnly 'org.springframework:spring-web' testRuntimeOnly "org.apache.httpcomponents:httpclient:$commonsHttpClientVersion" testRuntimeOnly 'com.fasterxml.jackson.core:jackson-core'