Merge branch '1.11.x'

Author: shakuzen

micrometer-bom/build.gradle

@@ -9,7 +9,8 @@ dependencies {
         rootProject.subprojects.findAll {
             !it.name.contains('sample') &&
                     !it.name.contains('benchmark') &&
-                    !it.name.contains('micrometer-bom')
+                    !it.name.contains('micrometer-bom') &&
+                    !it.name.contains('micrometer-osgi-test')
         }.each {
             api(group: it.group,
                     name: it.name,