Merge branch '2.7.x'

Closes gh-31368
This commit is contained in:
Phillip Webb 2022-06-13 13:41:03 -07:00
commit e125b0c22d

View File

@ -199,12 +199,18 @@ publishing.publications.withType(MavenPublication) {
transformer(implementation: 'org.apache.maven.plugins.shade.resource.AppendingTransformer') {
delegate.resource('META-INF/spring.handlers')
}
transformer(implementation: 'org.springframework.boot.maven.PropertiesMergingResourceTransformer') {
delegate.resource('META-INF/spring.factories')
}
transformer(implementation: 'org.apache.maven.plugins.shade.resource.AppendingTransformer') {
delegate.resource('META-INF/spring.schemas')
}
transformer(implementation: 'org.apache.maven.plugins.shade.resource.AppendingTransformer') {
delegate.resource('META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports')
}
transformer(implementation: 'org.apache.maven.plugins.shade.resource.AppendingTransformer') {
delegate.resource('META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports')
}
transformer(implementation: 'org.springframework.boot.maven.PropertiesMergingResourceTransformer') {
delegate.resource('META-INF/spring.factories')
}
transformer(implementation: 'org.apache.maven.plugins.shade.resource.ServicesResourceTransformer')
transformer(implementation: 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer') {
delegate.mainClass('${start-class}')