From 2a190f35898baa5c4a7525e09803bb8ecd434ef4 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 21 Jun 2021 14:48:38 +0200
Subject: [PATCH 1/7] Upgrade to Cassandra Driver 4.11.2

Closes gh-26990
---
 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 fc379546d7..b610412cbb 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -159,7 +159,7 @@ bom {
 			]
 		}
 	}
-	library("Cassandra Driver", "4.11.1") {
+	library("Cassandra Driver", "4.11.2") {
 		group("com.datastax.oss") {
 			imports = [
 				"java-driver-bom"

From fc5d781cfc285f224bc4144eaa95c92af3030f86 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 21 Jun 2021 14:48:40 +0200
Subject: [PATCH 2/7] Upgrade to Jedis 3.6.1

Closes gh-26992
---
 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 b610412cbb..fe346374cb 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -842,7 +842,7 @@ bom {
 			]
 		}
 	}
-	library("Jedis", "3.6.0") {
+	library("Jedis", "3.6.1") {
 		group("redis.clients") {
 			modules = [
 				"jedis"

From b3b2d9a09526e56edc188928b461af12f8d65beb Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 21 Jun 2021 14:48:41 +0200
Subject: [PATCH 3/7] Upgrade to Jetty EL 9.0.48

Closes gh-26993
---
 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 fe346374cb..d185d36987 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -859,7 +859,7 @@ bom {
 			]
 		}
 	}
-	library("Jetty EL", "9.0.29") {
+	library("Jetty EL", "9.0.48") {
 		group("org.mortbay.jasper") {
 			modules = [
 				"apache-el"

From 68cd28a4816362dd6ebf75c87d3c9784531f5055 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 21 Jun 2021 14:48:42 +0200
Subject: [PATCH 4/7] Upgrade to Postgresql 42.2.22

Closes gh-26994
---
 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 d185d36987..92a5e13a9d 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1351,7 +1351,7 @@ bom {
 			]
 		}
 	}
-	library("Postgresql", "42.2.20") {
+	library("Postgresql", "42.2.22") {
 		group("org.postgresql") {
 			modules = [
 				"postgresql"

From 3ef7ba7f9bd2165d6d207fa359f331deb7bc0340 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 21 Jun 2021 14:48:43 +0200
Subject: [PATCH 5/7] Upgrade to SLF4J 1.7.31

Closes gh-26995
---
 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 92a5e13a9d..942d1c0927 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1581,7 +1581,7 @@ bom {
 			]
 		}
 	}
-	library("SLF4J", "1.7.30") {
+	library("SLF4J", "1.7.31") {
 		group("org.slf4j") {
 			modules = [
 				"jcl-over-slf4j",

From b09cb91118b4fca145c658e98fce3c9f58aac983 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 21 Jun 2021 14:48:44 +0200
Subject: [PATCH 6/7] Upgrade to Tomcat 9.0.48

Closes gh-26996
---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 5b8384e8fc..87f8d6525f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,6 +5,6 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
 
 kotlinVersion=1.5.10
-tomcatVersion=9.0.46
+tomcatVersion=9.0.48
 
 kotlin.stdlib.default.dependency=false

From 5dc1065876fcac7c569d2897097abdf947a383d3 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 21 Jun 2021 16:53:34 +0200
Subject: [PATCH 7/7] Revert "Upgrade to Dropwizard Metrics 4.1.23"

This reverts commit ce242702712539d5be353220e71533f26ae7a3d3.

See gh-26983
---
 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 3f0ac21a7c..4ce19b0455 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -248,7 +248,7 @@ bom {
 			]
 		}
 	}
-	library("Dropwizard Metrics", "4.1.23") {
+	library("Dropwizard Metrics", "4.1.22") {
 		group("io.dropwizard.metrics") {
 			imports = [
 				"metrics-bom"