Merge branch '1.10.x'

# Conflicts:
#	benchmarks/benchmarks-core/gradle.lockfile
#	build.gradle
#	buildscript-gradle.lockfile
#	implementations/micrometer-registry-appoptics/gradle.lockfile
#	implementations/micrometer-registry-atlas/gradle.lockfile
#	implementations/micrometer-registry-azure-monitor/gradle.lockfile
#	implementations/micrometer-registry-cloudwatch/gradle.lockfile
#	implementations/micrometer-registry-cloudwatch2/gradle.lockfile
#	implementations/micrometer-registry-datadog/gradle.lockfile
#	implementations/micrometer-registry-dynatrace/gradle.lockfile
#	implementations/micrometer-registry-elastic/gradle.lockfile
#	implementations/micrometer-registry-ganglia/gradle.lockfile
#	implementations/micrometer-registry-graphite/gradle.lockfile
#	implementations/micrometer-registry-health/gradle.lockfile
#	implementations/micrometer-registry-humio/gradle.lockfile
#	implementations/micrometer-registry-influx/gradle.lockfile
#	implementations/micrometer-registry-jmx/gradle.lockfile
#	implementations/micrometer-registry-kairos/gradle.lockfile
#	implementations/micrometer-registry-new-relic/gradle.lockfile
#	implementations/micrometer-registry-opentsdb/gradle.lockfile
#	implementations/micrometer-registry-otlp/gradle.lockfile
#	implementations/micrometer-registry-prometheus/gradle.lockfile
#	implementations/micrometer-registry-signalfx/gradle.lockfile
#	implementations/micrometer-registry-stackdriver/gradle.lockfile
#	implementations/micrometer-registry-statsd/gradle.lockfile
#	implementations/micrometer-registry-wavefront/gradle.lockfile
#	micrometer-commons/gradle.lockfile
#	micrometer-core/gradle.lockfile
#	micrometer-jetty11/gradle.lockfile
#	micrometer-observation-test/gradle.lockfile
#	micrometer-observation/gradle.lockfile
#	micrometer-test/gradle.lockfile
#	samples/micrometer-samples-boot2-reactive/gradle.lockfile
#	samples/micrometer-samples-boot2/gradle.lockfile
#	samples/micrometer-samples-core/gradle.lockfile
#	samples/micrometer-samples-hazelcast/gradle.lockfile
#	samples/micrometer-samples-hazelcast3/gradle.lockfile
#	samples/micrometer-samples-javalin/gradle.lockfile
#	samples/micrometer-samples-jersey3/gradle.lockfile
#	samples/micrometer-samples-spring-integration/gradle.lockfile

Author: jonatan-ivanov

benchmarks/benchmarks-core/gradle.lockfile

@@ -20,7 +20,7 @@ buildscript {
         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 'com.diffplug.spotless:spotless-plugin-gradle:6.15.0'
+        classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.18.0'
         classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0'
 
         constraints {