Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.5.x'

Browse Source 
Closes gh-27326
This commit is contained in:
Stephane Nicoll
2021-07-14 14:43:39 +02:00
parent c406dda181 d8f9a20221
commit b393031dbe
6 changed files with 105 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-layered-custom/jar/src/layers.xml
View File

@@ -1,7 +1,7 @@
<layers xmlns="http://www.springframework.org/schema/boot/layers"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
https://www.springframework.org/schema/layers/layers-2.4.xsd">
https://www.springframework.org/schema/layers/layers-2.5.xsd">
<application>
<into layer="configuration">
<include>**/application*.*</include>

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/war-layered-custom/war/src/layers.xml
View File

@@ -1,7 +1,7 @@
<layers xmlns="http://www.springframework.org/schema/boot/layers"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
https://www.springframework.org/schema/layers/layers-2.4.xsd">
https://www.springframework.org/schema/layers/layers-2.5.xsd">
<application>
<into layer="configuration">
<include>**/application*.*</include>