Merge branch '1.8.x' into 1.9.x

# Conflicts:
#	benchmarks/benchmarks-core/gradle.lockfile
#	dependencies.gradle
#	implementations/micrometer-registry-cloudwatch/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-jmx/gradle.lockfile
#	implementations/micrometer-registry-otlp/gradle.lockfile
#	implementations/micrometer-registry-prometheus/gradle.lockfile
#	micrometer-core/gradle.lockfile
#	micrometer-test/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

Author: jonatan-ivanov

benchmarks/benchmarks-core/gradle.lockfile

@@ -11,14 +11,14 @@ buildscript {
     dependencies {
         classpath 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1'
         classpath 'com.netflix.nebula:gradle-info-plugin:11.4.1'
-        classpath 'com.netflix.nebula:nebula-release-plugin:16.0.0'
+        classpath 'com.netflix.nebula:nebula-release-plugin:16.1.0'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:18.4.0'
         classpath 'com.netflix.nebula:nebula-project-plugin:9.4.0'
         classpath 'io.spring.nohttp:nohttp-gradle:0.0.10'
         classpath 'org.gradle:test-retry-gradle-plugin:1.4.1'
         classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
         classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.4.1'
-        classpath 'de.undercouch:gradle-download-task:5.0.2'
+        classpath 'de.undercouch:gradle-download-task:5.2.1'
         classpath 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.35'
 
         constraints {

build.gradle

@@ -6,7 +6,8 @@ def VERSIONS = [
         'com.fasterxml.jackson.core:jackson-databind:latest.release',
         'com.github.ben-manes.caffeine:caffeine:2.+',
         'com.github.charithe:kafka-junit:latest.release',
-        'com.github.tomakehurst:wiremock-jre8-standalone:latest.release',
+        // pinned to avoid issues with shaded slf4j version - see gh-3414
+        'com.github.tomakehurst:wiremock-jre8-standalone:2.33.+',
         'com.google.cloud:google-cloud-monitoring:3.2.+',
         'com.google.dagger:dagger:2.11',
         'com.google.dagger:dagger-compiler:2.11',
@@ -62,8 +63,8 @@ def VERSIONS = [
         'org.hsqldb:hsqldb:2.5.+', // 2.6.0 requires JDK 11.
         'org.jooq:jooq:3.14.+',
         'org.jsr107.ri:cache-ri-impl:1.0.0',
-        'org.junit.jupiter:junit-jupiter:5.8.+', // Not using latest.release to avoid using a milestone version.
-        'org.junit.platform:junit-platform-launcher:1.8.+',
+        'org.junit.jupiter:junit-jupiter:5.9.+', // Not using latest.release to avoid using a milestone version.
+        'org.junit.platform:junit-platform-launcher:1.9.+',
         'org.latencyutils:LatencyUtils:latest.release',
         'org.mockito:mockito-core:latest.release',
         'org.mockito:mockito-inline:latest.release',