Merge branch '1.10.x' into 1.11.x

Author: jonatan-ivanov

build.gradle

@@ -402,10 +402,10 @@ subprojects {
     description = 'Application monitoring instrumentation facade'
 
     repositories {
-        maven { 
-            url 'https://repo.spring.io/snapshot/'
-            content { includeGroup 'io.micrometer' }
-        }
+        // maven { 
+        //     url 'https://repo.spring.io/snapshot/'
+        //     content { includeGroup 'io.micrometer' }
+        // }
         mavenCentral()
     }
 

dependencies.gradle

@@ -45,7 +45,7 @@ def VERSIONS = [
         'javax.inject:javax.inject:1',
         'javax.servlet:javax.servlet-api:latest.release',
         'javax.xml.bind:jaxb-api:2.3.+',
-        'io.micrometer:context-propagation:1.0.+',
+        'io.micrometer:context-propagation:1.0.5',
         'org.jetbrains.kotlinx:kotlinx-coroutines-core:latest.release',
         'net.sf.ehcache:ehcache:latest.release',
         'org.apache.felix:org.apache.felix.framework:7.0.5',