Merge branch '1.9.x' into 1.10.x

Author: shakuzen

benchmarks/benchmarks-core/gradle.lockfile

@@ -389,7 +389,14 @@ subprojects {
 
     repositories {
         mavenCentral()
-        maven { url "https://repo.spring.io/snapshot/" } // for context-propagation snapshots
+        maven {
+            // TODO remove before releasing
+            url "https://repo.spring.io/snapshot/"
+            content {
+                // for context-propagation snapshots
+                includeModule 'io.micrometer', 'context-propagation'
+            }
+        }
     }
 
     def check = tasks.findByName('check')

build.gradle

@@ -26,7 +26,7 @@ def VERSIONS = [
         'com.signalfx.public:signalfx-java:latest.release',
         'com.squareup.okhttp3:okhttp:latest.release',
         'com.tngtech.archunit:archunit-junit5:latest.release',
-        'com.wavefront:wavefront-sdk-java:latest.release',
+        'com.wavefront:wavefront-sdk-java:3.0.+',
         'io.dropwizard.metrics:metrics-core:4.+',
         'io.dropwizard.metrics:metrics-graphite:4.+',
         'io.dropwizard.metrics:metrics-jmx:4.+',