diff --git a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
index 67536f4ace..881642eaac 100644
--- a/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
+++ b/spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
@@ -363,9 +363,6 @@ Maven '`project properties`' via `@..@` placeholders, e.g.
 	info.build.version=@project.version@
 ----
 
-NOTE: In the above example we used `+project.*+` to set some values to be used as
-fallbacks if the Maven resource filtering has not been switched on for some reason.
-
 TIP: The `spring-boot:run` maven goal adds `src/main/resources` directly to the classpath
 (for hot reloading purposes). This circumvents the resource filtering and this feature.
 You can use the `exec:java` goal instead or customize the plugin's configuration, see the
@@ -396,10 +393,14 @@ and (inside `<plugins/>`):
 			<delimiters>
 				<delimiter>@</delimiter>
 			</delimiters>
+			<useDefaultDelimiters>false</useDefaultDelimiters>
 		</configuration>
 	</plugin>
 ----
 
+NOTE: The `useDefaultDelimiters` property is important if you are using standard
+Spring placeholders in your configuration (e.g. `${foo}`). These may be expanded
+by the build if that property is not set to `false`.
 
 
 [[production-ready-application-info-automatic-expansion-gradle]]
diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml
index 820a465e83..667cc3da78 100644
--- a/spring-boot-starters/spring-boot-starter-parent/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml
@@ -114,6 +114,7 @@
 						<delimiters>
 							<delimiter>${resource.delimiter}</delimiter>
 						</delimiters>
+						<useDefaultDelimiters>false</useDefaultDelimiters>
 					</configuration>
 				</plugin>
 				<plugin>