Skip to content

Commit 4ead8ef

Browse files
jonatan-ivanovjonatan-ivanov
committed
Merge branch '1.10.x' into 1.11.x
2 parents f4f02ee + 8a93c7d commit 4ead8ef

43 files changed

Lines changed: 389 additions & 382 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎benchmarks/benchmarks-core/gradle.lockfile‎

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

‎dependencies.gradle‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,11 @@ subprojects {
117117
}
118118
}
119119
}
120+
configurations.configureEach {
121+
// see https://github.com/google/guava/releases/tag/v32.1.0
122+
// "Reporting dependencies that overlap with Guava"
123+
resolutionStrategy.capabilitiesResolution.withCapability('com.google.guava:listenablefuture') {
124+
select('com.google.guava:guava:0')
125+
}
126+
}
120127
}

‎implementations/micrometer-registry-appoptics/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.

‎implementations/micrometer-registry-atlas/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.

‎implementations/micrometer-registry-azure-monitor/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.

‎implementations/micrometer-registry-cloudwatch/gradle.lockfile‎

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

‎implementations/micrometer-registry-cloudwatch2/gradle.lockfile‎

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

‎implementations/micrometer-registry-datadog/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.

‎implementations/micrometer-registry-dynatrace/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)