Merge branch '2.2.x'

Closes gh-21305
6 years ago · f4ae2b0584
1 changed files with 3 additions and 0 deletions
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@ -1155,6 +1155,9 @@ bom {
				@@ -1155,6 +1155,9 @@ bom {
 		}
 	}
 	library("Maven Shade Plugin", "3.2.2") {
+		prohibit("3.2.3") {
+			because "https://github.com/spring-projects/spring-boot/issues/21128"
+		}
 		group("org.apache.maven.plugins") {
 			plugins = [
 				"maven-shade-plugin"