Skip to content

Commit 7d56af0

Browse files
committed
Merge branch '1.10.x' into 1.11.x
2 parents 8ae87ff + c10457a commit 7d56af0

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,6 @@ subprojects {
402402

403403
repositories {
404404
mavenCentral()
405-
maven { url "https://repo.spring.io/snapshot" } // for context propagation snapshots
406405
}
407406

408407
def check = tasks.findByName('check')

dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def VERSIONS = [
4545
'javax.inject:javax.inject:1',
4646
'javax.servlet:javax.servlet-api:latest.release',
4747
'javax.xml.bind:jaxb-api:2.3.+',
48-
'io.micrometer:context-propagation:1.0.3-SNAPSHOT',
48+
'io.micrometer:context-propagation:1.0.+',
4949
'org.jetbrains.kotlinx:kotlinx-coroutines-core:latest.release',
5050
'net.sf.ehcache:ehcache:latest.release',
5151
'org.apache.felix:org.apache.felix.framework:7.0.5',

micrometer-core/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

micrometer-observation/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)