Skip to content

Commit 1a4ee0d

Browse files
committed
Apply default filtering to profile-specific files
Upgrade the `spring-boot-starter-parent` to also filter profile-specific configuration files. Closes spring-projectsgh-4856
1 parent fb06649 commit 1a4ee0d

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc

+2-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ defaults. The parent project provides the following features:
6464
http://maven.apache.org/surefire/maven-surefire-plugin/[surefire],
6565
https://github.com/ktoso/maven-git-commit-id-plugin[Git commit ID],
6666
http://maven.apache.org/plugins/maven-shade-plugin/[shade]).
67-
* Sensible resource filtering for `application.properties` and `application.yml`
67+
* Sensible resource filtering for `application.properties` and `application.yml` including
68+
profile-specific files (e.g. `application-foo.properties` and `application-foo.yml`)
6869

6970
On the last point: since the default config files accept
7071
Spring style placeholders (`${...}`) the Maven filtering is changed to

spring-boot-starters/spring-boot-starter-parent/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@
4646
<directory>${basedir}/src/main/resources</directory>
4747
<filtering>true</filtering>
4848
<includes>
49-
<include>**/application.yml</include>
50-
<include>**/application.properties</include>
49+
<include>**/application*.yml</include>
50+
<include>**/application*.properties</include>
5151
</includes>
5252
</resource>
5353
<resource>
5454
<directory>${basedir}/src/main/resources</directory>
5555
<excludes>
56-
<exclude>**/application.yml</exclude>
57-
<exclude>**/application.properties</exclude>
56+
<exclude>**/application*.yml</exclude>
57+
<exclude>**/application*.properties</exclude>
5858
</excludes>
5959
</resource>
6060
</resources>

0 commit comments

Comments
 (0)