Merge branch '2.4.x'

Closes gh-24600
spring-projects · Dec 23, 2020 · 7c767e9 · 7c767e9
2 parents b070c39 + ff59bb3
commit 7c767e9
Showing 1 changed file with 1 addition and 0 deletions.
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}')
 								}