Skip to content

Commit 6eca017

Browse files
committed
GH-1444: Move to Micrometer Snapshots
#1444 Phase 0
1 parent ea01566 commit 6eca017

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

build.gradle

+13-6
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,15 @@ ext {
5555
log4jVersion = '2.17.1'
5656
logbackVersion = '1.2.3'
5757
lz4Version = '1.8.0'
58-
micrometerVersion = '2.0.0-M3'
58+
micrometerVersion = '2.0.0-SNAPSHOT'
59+
micrometerTracingVersion = '1.0.0-SNAPSHOT'
5960
mockitoVersion = '4.0.0'
6061
rabbitmqStreamVersion = '0.4.0'
6162
rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '5.13.1'
6263
rabbitmqHttpClientVersion = '3.12.1'
6364
reactorVersion = '2020.0.17'
6465
snappyVersion = '1.1.8.4'
65-
springDataCommonsVersion = '3.0.0-M3'
66+
springDataVersion = '2022.0.0-M3'
6667
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M3'
6768
springRetryVersion = '1.3.2'
6869
zstdJniVersion = '1.5.0-2'
@@ -93,6 +94,9 @@ allprojects {
9394
mavenBom "org.springframework:spring-framework-bom:$springVersion"
9495
mavenBom "io.projectreactor:reactor-bom:$reactorVersion"
9596
mavenBom "org.apache.logging.log4j:log4j-bom:$log4jVersion"
97+
mavenBom "org.springframework.data:spring-data-bom:$springDataVersion"
98+
mavenBom "io.micrometer:micrometer-bom:$micrometerVersion"
99+
mavenBom "io.micrometer:micrometer-tracing-bom:$micrometerTracingVersion"
96100
}
97101
}
98102

@@ -356,7 +360,7 @@ project('spring-amqp') {
356360
optionalApi 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
357361

358362
// Spring Data projection message binding support
359-
optionalApi ("org.springframework.data:spring-data-commons:$springDataCommonsVersion") {
363+
optionalApi ('org.springframework.data:spring-data-commons') {
360364
exclude group: 'org.springframework'
361365
exclude group: 'io.micrometer'
362366
}
@@ -382,10 +386,10 @@ project('spring-rabbit') {
382386
optionalApi 'io.projectreactor:reactor-core'
383387
optionalApi "ch.qos.logback:logback-classic:$logbackVersion"
384388
optionalApi 'org.apache.logging.log4j:log4j-core'
385-
optionalApi "io.micrometer:micrometer-core:$micrometerVersion"
386-
optionalApi "io.micrometer:micrometer-binders:$micrometerVersion"
389+
optionalApi 'io.micrometer:micrometer-binders'
390+
optionalApi 'io.micrometer:micrometer-tracing-api'
387391
// Spring Data projection message binding support
388-
optionalApi ("org.springframework.data:spring-data-commons:$springDataCommonsVersion") {
392+
optionalApi ("org.springframework.data:spring-data-commons") {
389393
exclude group: 'org.springframework'
390394
}
391395
optionalApi "com.jayway.jsonpath:json-path:$jaywayJsonPathVersion"
@@ -394,6 +398,9 @@ project('spring-rabbit') {
394398
testApi project(':spring-rabbit-junit')
395399
testImplementation("com.willowtreeapps.assertk:assertk-jvm:$assertkVersion")
396400
testImplementation "org.hibernate.validator:hibernate-validator:$hibernateValidationVersion"
401+
testImplementation 'io.micrometer:micrometer-tracing-bridge-brave'
402+
testImplementation 'io.micrometer:micrometer-tracing-test'
403+
testImplementation 'io.micrometer:micrometer-tracing-integration-test'
397404
testRuntimeOnly 'org.springframework:spring-web'
398405
testRuntimeOnly "org.apache.httpcomponents:httpclient:$commonsHttpClientVersion"
399406
testRuntimeOnly 'com.fasterxml.jackson.core:jackson-core'

0 commit comments

Comments
 (0)