Merge branch '2.2.x' into 2.3.x

snicoll · snicoll · commit 2c1634e6edbe · 2020-09-28T09:21:51.000+02:00
Closes gh-23508
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1250,6 +1250,7 @@ bom {
 	library("Netty tcNative", "2.0.34.Final") {
 		group("io.netty") {
 			modules = [
+				"netty-tcnative",
 				"netty-tcnative-boringssl-static"
 			]
 		}

Original file line number	Diff line number	Diff line change
`@@ -1250,6 +1250,7 @@ bom {`
`1250`	`1250`	`library("Netty tcNative", "2.0.34.Final") {`
`1251`	`1251`	`group("io.netty") {`
`1252`	`1252`	`modules = [`
	`1253`	`+ "netty-tcnative",`
`1253`	`1254`	`"netty-tcnative-boringssl-static"`
`1254`	`1255`	`]`
`1255`	`1256`	`}`