8000 Merge branch '1.6.x' into 1.7.x · micrometer-metrics/micrometer@48dbc9b · GitHub 8000
[go: up one dir, main page]
Skip to content

Commit 48dbc9b

Browse files
jonatan-ivanovjonatan-ivanov
committed
Merge branch '1.6.x' into 1.7.x
# Conflicts: # benchmarks/benchmarks-core/gradle.lockfile # dependencies.gradle # implementations/micrometer-registry-atlas/gradle.lockfile # implementations/micrometer-registry-elastic/gradle.lockfile # implementations/micrometer-registry-graphite/gradle.lockfile # implementations/micrometer-registry-statsd/gradle.lockfile # micrometer-core/gradle.lockfile # micrometer-jersey2/gradle.lockfile # micrometer-test/gradle.lockfile # samples/micrometer-samples-boot2-reactive/build.gradle # samples/micrometer-samples-boot2-reactive/gradle.lockfile # samples/micrometer-samples-boot2/build.gradle # samples/micrometer-samples-boot2/gradle.lockfile # samples/micrometer-samples-core/gradle.lockfile # samples/micrometer-samples-javalin/gradle.lockfile # samples/micrometer-samples-spring-integration/build.gradle # samples/micrometer-samples-spring-integration/gradle.lockfile
2 parents 5f8357d + 2debf49 commit 48dbc9b

File tree

29 files changed

+114
-120
lines changed

29 files changed

+114
-120
lines changed

‎dependencies.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def VERSIONS = [
1818
// in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
1919
// <=1.5.11 or 1.5.18 doesn't break with Micrometer, but open metrics won't be correct necessarily.
2020
'com.netflix.hystrix:hystrix-core:1.5.12',
21-
'com.netflix.spectator:spectator-reg-atlas:latest.release',
21+
'com.netflix.spectator:spectator-reg-atlas:0.+',
2222
'com.newrelic.agent.java:newrelic-api:5.+',
2323
'com.signalfx.public:signalfx-java:1.0.+',
2424
'com.squareup.okhttp3:okhttp:latest.release',
@@ -69,8 +69,8 @@ def VERSIONS = [
6969
'org.junit.platform:junit-platform-launcher:1.7.+',
7070
'org.junit.vintage:junit-vintage-engine:5.7.+',
7171
'org.latencyutils:LatencyUtils:latest.release',
72-
'org.mockito:mockito-core:latest.release',
73-
'org.mockito:mockito-inline:latest.release',
72+
'org.mockito:mockito-core:3.+',
73+
'org.mockito:mockito-inline:3.+',
7474
'org.mongodb:mongodb-driver-sync:latest.release',
7575
'org.slf4j:slf4j-api:1.7.+',
7676
'org.springframework:spring-context:latest.release',

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

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

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

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

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

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

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

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

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