From 1a4ee0d2070cc8bb04fa5eb5c5d933032b4f6dd0 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Tue, 26 Jan 2016 10:53:07 +0100
Subject: [PATCH] Apply default filtering to profile-specific files

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

Closes gh-4856
---
 spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc | 3 ++-
 spring-boot-starters/spring-boot-starter-parent/pom.xml   | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
index 2dd8791e70..fc2a050472 100644
--- a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
+++ b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
@@ -64,7 +64,8 @@ defaults. The parent project provides the following features:
   http://maven.apache.org/surefire/maven-surefire-plugin/[surefire],
   https://github.com/ktoso/maven-git-commit-id-plugin[Git commit ID],
   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
 Spring style placeholders (`${...}`) the Maven filtering is changed to
diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml
index a00c07d6e3..5a4d53cd95 100644
--- a/spring-boot-starters/spring-boot-starter-parent/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml
@@ -46,15 +46,15 @@
 				<directory>${basedir}/src/main/resources</directory>
 				<filtering>true</filtering>
 				<includes>
-					<include>**/application.yml</include>
-					<include>**/application.properties</include>
+					<include>**/application*.yml</include>
+					<include>**/application*.properties</include>
 				</includes>
 			</resource>
 			<resource>
 				<directory>${basedir}/src/main/resources</directory>
 				<excludes>
-					<exclude>**/application.yml</exclude>
-					<exclude>**/application.properties</exclude>
+					<exclude>**/application*.yml</exclude>
+					<exclude>**/application*.properties</exclude>
 				</excludes>
 			</resource>
 		</resources>