From 4a9ca330261c63e3a16e62f9a2e4f701ead3392f Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Wed, 11 Nov 2020 19:35:29 +0000
Subject: [PATCH] Upgrade to Micrometer 1.6.1

Closes gh-24051
---
 .../spring-boot-dependencies/build.gradle            |  2 +-
 .../webapp/WEB-INF/jboss-deployment-structure.xml    | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 spring-boot-tests/spring-boot-deployment-tests/src/main/webapp/WEB-INF/jboss-deployment-structure.xml

diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index e8400ceb1a8d..839e72cab861 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1108,7 +1108,7 @@ bom {
 			]
 		}
 	}
-	library("Micrometer", "1.6.0") {
+	library("Micrometer", "1.6.1") {
 		group("io.micrometer") {
 			modules = [
 				"micrometer-registry-stackdriver" {
diff --git a/spring-boot-tests/spring-boot-deployment-tests/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/spring-boot-tests/spring-boot-deployment-tests/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
deleted file mode 100644
index fae8b0438c55..000000000000
--- a/spring-boot-tests/spring-boot-deployment-tests/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2">
-    <deployment>
-        <dependencies>
-            <system>
-                <paths>
-                    <path name="com/sun/management"/>
-                </paths>
-            </system>
-        </dependencies>
-    </deployment>
-</jboss-deployment-structure>
\ No newline at end of file