Skip to content

Commit 3c34c8d

Browse files
Merge branch '1.0.x' into 1.1.x
Use context-propagation 1.0.5 and micrometer 1.11.4 Closes gh-352
2 parents 5a6b6a5 + 2459756 commit 3c34c8d

File tree

9 files changed

+42
-42
lines changed

9 files changed

+42
-42
lines changed

benchmarks/gradle.lockfile

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,10 @@ subprojects {
316316
description = 'Facade over tracing concepts'
317317

318318
repositories {
319-
maven {
320-
url 'https://repo.spring.io/snapshot/'
321-
content { includeGroup 'io.micrometer' }
322-
}
319+
// maven {
320+
// url 'https://repo.spring.io/snapshot/'
321+
// content { includeGroup 'io.micrometer' }
322+
// }
323323
mavenCentral()
324324
}
325325

micrometer-tracing-bom/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-tracing-bridges/micrometer-tracing-bridge-brave/gradle.lockfile

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

micrometer-tracing-bridges/micrometer-tracing-bridge-otel/gradle.lockfile

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

micrometer-tracing-reporters/micrometer-tracing-reporter-wavefront/gradle.lockfile

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

micrometer-tracing-tests/micrometer-tracing-integration-test/gradle.lockfile

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

micrometer-tracing-tests/micrometer-tracing-test/gradle.lockfile

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

micrometer-tracing/gradle.lockfile

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)