Skip to content

S
spring-boot
Commit ef24f797 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '1.5.x'

parents 064faf95 9a279335
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
spring-boot-starters/spring-boot-starter-parent/pom.xml
View file @ ef24f797
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
<filtering>true</filtering> <filtering>true</filtering>
<includes> <includes>
<include>**/application*.yml</include> <include>**/application*.yml</include>
<include>**/application*.yaml</include>
<include>**/application*.properties</include> <include>**/application*.properties</include>
</includes> </includes>
</resource> </resource>
...@@ -54,6 +55,7 @@ ...@@ -54,6 +55,7 @@
<directory>${basedir}/src/main/resources</directory> <directory>${basedir}/src/main/resources</directory>
<excludes> <excludes>
<exclude>**/application*.yml</exclude> <exclude>**/application*.yml</exclude>
<exclude>**/application*.yaml</exclude>
<exclude>**/application*.properties</exclude> <exclude>**/application*.properties</exclude>
</excludes> </excludes>
</resource> </resource>
...@@ -215,4 +217,4 @@ ...@@ -215,4 +217,4 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
</project> </project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment