From db242794ecfbf00883963ece4217a477830627b4 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Thu, 23 Jul 2020 21:02:34 +0100
Subject: [PATCH 1/6] Upgrade to Micrometer 1.1.16

Closes gh-22536
---
 spring-boot-project/spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 56e8ba7679..378289ee57 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -133,7 +133,7 @@
 		<logback.version>1.2.3</logback.version>
 		<lombok.version>1.18.12</lombok.version>
 		<mariadb.version>2.3.0</mariadb.version>
-		<micrometer.version>1.1.15</micrometer.version>
+		<micrometer.version>1.1.16</micrometer.version>
 		<mimepull.version>1.9.13</mimepull.version>
 		<mockito.version>2.23.4</mockito.version>
 		<mongo-driver-reactivestreams.version>1.9.2</mongo-driver-reactivestreams.version>

From 698db27a7566f4946265fafb557ae68c6f748c46 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Thu, 23 Jul 2020 21:02:36 +0100
Subject: [PATCH 2/6] Upgrade to Aspectj 1.9.6

Closes gh-22537
---
 spring-boot-project/spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 378289ee57..f83355344b 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -38,7 +38,7 @@
 		<antlr2.version>2.7.7</antlr2.version>
 		<appengine-sdk.version>1.9.81</appengine-sdk.version>
 		<artemis.version>2.6.4</artemis.version>
-		<aspectj.version>1.9.5</aspectj.version>
+		<aspectj.version>1.9.6</aspectj.version>
 		<assertj.version>3.11.1</assertj.version>
 		<atomikos.version>4.0.6</atomikos.version>
 		<bitronix.version>2.1.4</bitronix.version>

From ce803cc6788e86add190ed3a3e245a0d9687bcf0 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Thu, 23 Jul 2020 21:03:49 +0100
Subject: [PATCH 3/6] Upgrade to Micrometer 1.3.11

Closes gh-22538
---
 spring-boot-project/spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 5b7c2b948d..3bdce7e629 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -152,7 +152,7 @@
 		<logback.version>1.2.3</logback.version>
 		<lombok.version>1.18.12</lombok.version>
 		<mariadb.version>2.4.4</mariadb.version>
-		<micrometer.version>1.3.10</micrometer.version>
+		<micrometer.version>1.3.11</micrometer.version>
 		<mimepull.version>1.9.13</mimepull.version>
 		<mockito.version>3.1.0</mockito.version>
 		<mongo-driver-reactivestreams.version>1.12.0</mongo-driver-reactivestreams.version>

From f93bae4bd35406a7625f227f31fd26fe6fd52e22 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Thu, 23 Jul 2020 21:03:51 +0100
Subject: [PATCH 4/6] Upgrade to Aspectj 1.9.6

Closes gh-22539
---
 spring-boot-project/spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 3bdce7e629..980a9dff8c 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -38,7 +38,7 @@
 		<antlr2.version>2.7.7</antlr2.version>
 		<appengine-sdk.version>1.9.81</appengine-sdk.version>
 		<artemis.version>2.10.1</artemis.version>
-		<aspectj.version>1.9.5</aspectj.version>
+		<aspectj.version>1.9.6</aspectj.version>
 		<assertj.version>3.13.2</assertj.version>
 		<atomikos.version>4.0.6</atomikos.version>
 		<awaitility.version>4.0.3</awaitility.version>

From 44e6cf2e55a291f692b7fb98f00defbd886699c2 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Thu, 23 Jul 2020 21:05:31 +0100
Subject: [PATCH 5/6] Upgrade to AspectJ 1.9.6

Closes gh-22540
---
 spring-boot-project/spring-boot-dependencies/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index 6a00574515..71febcff12 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -92,7 +92,7 @@ bom {
 			]
 		}
 	}
-	library("AspectJ", "1.9.5") {
+	library("AspectJ", "1.9.6") {
 		group("org.aspectj") {
 			modules = [
 				"aspectjrt",

From 39c8898008dafadd42c2e4c296e2ef1141e97bca Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Thu, 23 Jul 2020 21:05:32 +0100
Subject: [PATCH 6/6] Upgrade to MariaDB 2.6.2

Closes gh-22541
---
 spring-boot-project/spring-boot-dependencies/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index 71febcff12..17d60f4ecf 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1028,7 +1028,7 @@ bom {
 			]
 		}
 	}
-	library("MariaDB", "2.6.1") {
+	library("MariaDB", "2.6.2") {
 		group("org.mariadb.jdbc") {
 			modules = [
 				"mariadb-java-client"