Merge branch '2.4.x'

snicoll · snicoll · commit 7c767e9a0b7c · 2020-12-23T10:44:52.000+01:00
Closes gh-24600
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/build.gradle
@@ -125,6 +125,7 @@ publishing.publications.withType(MavenPublication) {
 							delegate.groupId('org.apache.maven.plugins')
 							delegate.artifactId('maven-resources-plugin')
 							configuration {
+								delegate.propertiesEncoding('${project.build.sourceEncoding}')
 								delimiters {
 									delegate.delimiter('${resource.delimiter}')
 								}

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,7 @@ publishing.publications.withType(MavenPublication) {`
`125`	`125`	`delegate.groupId('org.apache.maven.plugins')`
`126`	`126`	`delegate.artifactId('maven-resources-plugin')`
`127`	`127`	`configuration {`
	`128`	`+ delegate.propertiesEncoding('${project.build.sourceEncoding}')`
`128`	`129`	`delimiters {`
`129`	`130`	`delegate.delimiter('${resource.delimiter}')`
`130`	`131`	`}`