Merge branch '1.10.x' into 1.11.x

micrometer-metrics · Jul 7, 2023 · 4ead8ef · 4ead8ef
2 parents f4f02ee + 8a93c7d
commit 4ead8ef
Show file tree

Hide file tree

Showing 43 changed files with 389 additions and 382 deletions.
diff --git a/benchmarks/benchmarks-core/gradle.lockfile b/benchmarks/benchmarks-core/gradle.lockfile
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -117,4 +117,11 @@ subprojects {
       }
     }
   }
+  configurations.configureEach {
+    // see https://github.com/google/guava/releases/tag/v32.1.0
+    // "Reporting dependencies that overlap with Guava"
+    resolutionStrategy.capabilitiesResolution.withCapability('com.google.guava:listenablefuture') {
+        select('com.google.guava:guava:0')
+    }
+  }
 }
diff --git a/implementations/micrometer-registry-appoptics/gradle.lockfile b/implementations/micrometer-registry-appoptics/gradle.lockfile
diff --git a/implementations/micrometer-registry-atlas/gradle.lockfile b/implementations/micrometer-registry-atlas/gradle.lockfile
diff --git a/implementations/micrometer-registry-azure-monitor/gradle.lockfile b/implementations/micrometer-registry-azure-monitor/gradle.lockfile
diff --git a/implementations/micrometer-registry-cloudwatch/gradle.lockfile b/implementations/micrometer-registry-cloudwatch/gradle.lockfile
diff --git a/implementations/micrometer-registry-cloudwatch2/gradle.lockfile b/implementations/micrometer-registry-cloudwatch2/gradle.lockfile
diff --git a/implementations/micrometer-registry-datadog/gradle.lockfile b/implementations/micrometer-registry-datadog/gradle.lockfile
diff --git a/implementations/micrometer-registry-dynatrace/gradle.lockfile b/implementations/micrometer-registry-dynatrace/gradle.lockfile