Merge branch '1.10.x' into 1.11.x

micrometer-metrics · Jun 9, 2023 · 192d755 · 192d755
2 parents 7d56af0 + 2f51778
commit 192d755
Show file tree

Hide file tree

Showing 44 changed files with 347 additions and 347 deletions.
diff --git a/benchmarks/benchmarks-core/gradle.lockfile b/benchmarks/benchmarks-core/gradle.lockfile
diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
         classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.4.1'
         classpath 'de.undercouch:gradle-download-task:5.2.1'
-        classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.38'
+        classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.39'
         classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.18.0'
         classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0'
 

diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile
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
diff --git a/implementations/micrometer-registry-elastic/gradle.lockfile b/implementations/micrometer-registry-elastic/gradle.lockfile
diff --git a/implementations/micrometer-registry-ganglia/gradle.lockfile b/implementations/micrometer-registry-ganglia/gradle.lockfile