Merge branch '2.3.x'

Closes gh-22228
2020-07-06 09:51:44 +01:00
parent b356bc830d 40fc90e343
commit 6331a27822
1 changed files with 1 additions and 4 deletions
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1127,10 +1127,7 @@ bom {
 			]
 		}
 	}
-	library("Maven Shade Plugin", "3.2.2") {
-		prohibit("3.2.3") {
-			because "https://github.com/spring-projects/spring-boot/issues/21128"
-		}
+	library("Maven Shade Plugin", "3.2.4") {
 		group("org.apache.maven.plugins") {
 			plugins = [
 				"maven-shade-plugin"