Skip to content

Commit 4549dd7

Browse files
committed
Merge branch '1.10.x' into 1.11.x
2 parents 17cf526 + b3f6bd0 commit 4549dd7

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

Diff for: build.gradle

-4
Original file line numberDiff line numberDiff line change
@@ -385,10 +385,6 @@ subprojects {
385385
description = 'Application monitoring instrumentation facade'
386386

387387
repositories {
388-
maven {
389-
url 'https://repo.spring.io/snapshot/'
390-
content { includeGroup 'io.micrometer' }
391-
}
392388
mavenCentral()
393389
}
394390

Diff for: gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "c
8888
cloudwatch2 = { module = "software.amazon.awssdk:cloudwatch", version.ref = "cloudwatch2" }
8989
colt = { module = "colt:colt", version.ref = "colt" }
9090
commonsPool2 = "org.apache.commons:commons-pool2:2.11.1"
91-
contextPropagation = { module = "io.micrometer:context-propagation", version = "1.0.7-SNAPSHOT" }
91+
contextPropagation = { module = "io.micrometer:context-propagation", version = "1.0.6" }
9292
dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
9393
daggerCompiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
9494
dropwizardMetricsCore = { module = "io.dropwizard.metrics:metrics-core", version.ref = "dropwizard-metrics" }

0 commit comments

Comments
 (0)