Merge branch '1.5.x' into 1.6.x

# Conflicts: # implementations/micrometer-registry-appoptics/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-appoptics/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-atlas/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-atlas/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-azure-monitor/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-azure-monitor/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-cloudwatch/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-cloudwatch2/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-cloudwatch2/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-datadog/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-datadog/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-dynatrace/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-dynatrace/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-elastic/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-elastic/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-ganglia/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-ganglia/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-graphite/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-graphite/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-humio/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-humio/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-influx/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-influx/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-jmx/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-jmx/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-kairos/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-kairos/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-new-relic/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-new-relic/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-opentsdb/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-opentsdb/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-prometheus/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-prometheus/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-signalfx/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-signalfx/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-stackdriver/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-stackdriver/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-statsd/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-statsd/gradle/dependency-locks/testRuntimeClasspath.lockfile # implementations/micrometer-registry-wavefront/gradle/dependency-locks/testCompileClasspath.lockfile # implementations/micrometer-registry-wavefront/gradle/dependency-locks/testRuntimeClasspath.lockfile # micrometer-core/gradle/dependency-locks/testCompileClasspath.lockfile # micrometer-core/gradle/dependency-locks/testRuntimeClasspath.lockfile # micrometer-core/src/main/java/io/micrometer/core/instrument/binder/kafka/KafkaMetrics.java # micrometer-jersey2/gradle/dependency-locks/testRuntimeClasspath.lockfile # micrometer-test/gradle/dependency-locks/compileClasspath.lockfile # micrometer-test/gradle/dependency-locks/default.lockfile # micrometer-test/gradle/dependency-locks/runtimeClasspath.lockfile # micrometer-test/gradle/dependency-locks/testCompileClasspath.lockfile # micrometer-test/gradle/dependency-locks/testRuntimeClasspath.lockfile # samples/micrometer-samples-hazelcast3/gradle/dependency-locks/testCompileClasspath.lockfile # samples/micrometer-samples-hazelcast3/gradle/dependency-locks/testRuntimeClasspath.lockfile
micrometer-metrics · Feb 15, 2021 · 20cffda · 20cffda
2 parents 185fc69 + c39d0e2
commit 20cffda
Show file tree

Hide file tree

Showing 56 changed files with 329 additions and 338 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -58,9 +58,9 @@ def VERSIONS = [
         'org.hsqldb:hsqldb:latest.release',
         'org.jooq:jooq:3.13.+',
         'org.jsr107.ri:cache-ri-impl:1.0.0',
-        'org.junit.jupiter:junit-jupiter:latest.release',
-        'org.junit.platform:junit-platform-launcher:latest.release',
-        'org.junit.vintage:junit-vintage-engine:latest.release',
+        'org.junit.jupiter:junit-jupiter:5.7.+',
+        'org.junit.platform:junit-platform-launcher:1.7.+',
+        'org.junit.vintage:junit-vintage-engine:5.7.+',
         'org.latencyutils:LatencyUtils:latest.release',
         'org.mockito:mockito-core:latest.release',
         'org.mockito:mockito-inline:latest.release',

diff --git a/...tions/micrometer-registry-appoptics/gradle/dependency-locks/testCompileClasspath.lockfile b/...tions/micrometer-registry-appoptics/gradle/dependency-locks/testCompileClasspath.lockfile
diff --git a/...tions/micrometer-registry-appoptics/gradle/dependency-locks/testRuntimeClasspath.lockfile b/...tions/micrometer-registry-appoptics/gradle/dependency-locks/testRuntimeClasspath.lockfile
diff --git a/...entations/micrometer-registry-atlas/gradle/dependency-locks/testCompileClasspath.lockfile b/...entations/micrometer-registry-atlas/gradle/dependency-locks/testCompileClasspath.lockfile
diff --git a/...entations/micrometer-registry-atlas/gradle/dependency-locks/testRuntimeClasspath.lockfile b/...entations/micrometer-registry-atlas/gradle/dependency-locks/testRuntimeClasspath.lockfile
diff --git a/...s/micrometer-registry-azure-monitor/gradle/dependency-locks/testCompileClasspath.lockfile b/...s/micrometer-registry-azure-monitor/gradle/dependency-locks/testCompileClasspath.lockfile
diff --git a/...s/micrometer-registry-azure-monitor/gradle/dependency-locks/testRuntimeClasspath.lockfile b/...s/micrometer-registry-azure-monitor/gradle/dependency-locks/testRuntimeClasspath.lockfile
diff --git a/...ions/micrometer-registry-cloudwatch/gradle/dependency-locks/testCompileClasspath.lockfile b/...ions/micrometer-registry-cloudwatch/gradle/dependency-locks/testCompileClasspath.lockfile
diff --git a/...ions/micrometer-registry-cloudwatch/gradle/dependency-locks/testRuntimeClasspath.lockfile b/...ions/micrometer-registry-cloudwatch/gradle/dependency-locks/testRuntimeClasspath.lockfile
diff --git a/...ons/micrometer-registry-cloudwatch2/gradle/dependency-locks/testCompileClasspath.lockfile b/...ons/micrometer-registry-cloudwatch2/gradle/dependency-locks/testCompileClasspath.lockfile
diff --git a/...ons/micrometer-registry-cloudwatch2/gradle/dependency-locks/testRuntimeClasspath.lockfile b/...ons/micrometer-registry-cloudwatch2/gradle/dependency-locks/testRuntimeClasspath.lockfile
diff --git a/...tations/micrometer-registry-datadog/gradle/dependency-locks/testCompileClasspath.lockfile b/...tations/micrometer-registry-datadog/gradle/dependency-locks/testCompileClasspath.lockfile
diff --git a/...tations/micrometer-registry-datadog/gradle/dependency-locks/testRuntimeClasspath.lockfile b/...tations/micrometer-registry-datadog/gradle/dependency-locks/testRuntimeClasspath.lockfile
diff --git a/...tions/micrometer-registry-dynatrace/gradle/dependency-locks/testCompileClasspath.lockfile b/...tions/micrometer-registry-dynatrace/gradle/dependency-locks/testCompileClasspath.lockfile
diff --git a/...tions/micrometer-registry-dynatrace/gradle/dependency-locks/testRuntimeClasspath.lockfile b/...tions/micrometer-registry-dynatrace/gradle/dependency-locks/testRuntimeClasspath.lockfile
diff --git a/...tations/micrometer-registry-elastic/gradle/dependency-locks/testCompileClasspath.lockfile b/...tations/micrometer-registry-elastic/gradle/dependency-locks/testCompileClasspath.lockfile
diff --git a/...tations/micrometer-registry-elastic/gradle/dependency-locks/testRuntimeClasspath.lockfile b/...tations/micrometer-registry-elastic/gradle/dependency-locks/testRuntimeClasspath.lockfile
diff --git a/...tations/micrometer-registry-ganglia/gradle/dependency-locks/testCompileClasspath.lockfile b/...tations/micrometer-registry-ganglia/gradle/dependency-locks/testCompileClasspath.lockfile
diff --git a/...tations/micrometer-registry-ganglia/gradle/dependency-locks/testRuntimeClasspath.lockfile b/...tations/micrometer-registry-ganglia/gradle/dependency-locks/testRuntimeClasspath.lockfile
diff --git a/...ations/micrometer-registry-graphite/gradle/dependency-locks/testCompileClasspath.lockfile b/...ations/micrometer-registry-graphite/gradle/dependency-locks/testCompileClasspath.lockfile
diff --git a/...ations/micrometer-registry-graphite/gradle/dependency-locks/testRuntimeClasspath.lockfile b/...ations/micrometer-registry-graphite/gradle/dependency-locks/testRuntimeClasspath.lockfile