Merge branch '2.2.x'

snicoll · snicoll · commit f4ae2b0584db · 2020-05-04T14:58:43.000+02:00
Closes gh-21305
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -1155,6 +1155,9 @@ bom {`
`1155`	`1155`	`}`
`1156`	`1156`	`}`
`1157`	`1157`	`library("Maven Shade Plugin", "3.2.2") {`
	`1158`	`+ prohibit("3.2.3") {`
	`1159`	`+ because "https://github.com/spring-projects/spring-boot/issues/21128"`
	`1160`	`+ }`
`1158`	`1161`	`group("org.apache.maven.plugins") {`
`1159`	`1162`	`plugins = [`
`1160`	`1163`	`"maven-shade-plugin"`