Merge branch '2.0.x'

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -124,7 +124,7 @@
 		<logback.version>1.2.3</logback.version>
 		<lombok.version>1.16.22</lombok.version>
 		<mariadb.version>2.2.5</mariadb.version>
-		<micrometer.version>1.0.4</micrometer.version>
+		<micrometer.version>1.0.5</micrometer.version>
 		<mockito.version>2.18.3</mockito.version>
 		<mongo-driver-reactivestreams.version>1.9.0-beta1</mongo-driver-reactivestreams.version>
 		<mongodb.version>3.8.0-beta2</mongodb.version>