Commit 1a4ee0d2 authored by Stephane Nicoll's avatar Stephane Nicoll

Apply default filtering to profile-specific files

Upgrade the `spring-boot-starter-parent` to also filter profile-specific
configuration files.

Closes gh-4856
parent fb066490
...@@ -64,7 +64,8 @@ defaults. The parent project provides the following features: ...@@ -64,7 +64,8 @@ defaults. The parent project provides the following features:
http://maven.apache.org/surefire/maven-surefire-plugin/[surefire], http://maven.apache.org/surefire/maven-surefire-plugin/[surefire],
https://github.com/ktoso/maven-git-commit-id-plugin[Git commit ID], https://github.com/ktoso/maven-git-commit-id-plugin[Git commit ID],
http://maven.apache.org/plugins/maven-shade-plugin/[shade]). http://maven.apache.org/plugins/maven-shade-plugin/[shade]).
* Sensible resource filtering for `application.properties` and `application.yml` * Sensible resource filtering for `application.properties` and `application.yml` including
profile-specific files (e.g. `application-foo.properties` and `application-foo.yml`)
On the last point: since the default config files accept On the last point: since the default config files accept
Spring style placeholders (`${...}`) the Maven filtering is changed to Spring style placeholders (`${...}`) the Maven filtering is changed to
......
...@@ -46,15 +46,15 @@ ...@@ -46,15 +46,15 @@
<directory>${basedir}/src/main/resources</directory> <directory>${basedir}/src/main/resources</directory>
<filtering>true</filtering> <filtering>true</filtering>
<includes> <includes>
<include>**/application.yml</include> <include>**/application*.yml</include>
<include>**/application.properties</include> <include>**/application*.properties</include>
</includes> </includes>
</resource> </resource>
<resource> <resource>
<directory>${basedir}/src/main/resources</directory> <directory>${basedir}/src/main/resources</directory>
<excludes> <excludes>
<exclude>**/application.yml</exclude> <exclude>**/application*.yml</exclude>
<exclude>**/application.properties</exclude> <exclude>**/application*.properties</exclude>
</excludes> </excludes>
</resource> </resource>
</resources> </resources>
......
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