From 7060cc1967f143970a175c589e6a4b42e67b6e2e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 Oct 2014 15:35:06 +0100 Subject: [PATCH] Correct the position of JNDI in the ordered list of property sources Fixes gh-1693 --- spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index ef4dbc8f93e..dd28da6980b 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -203,9 +203,9 @@ Spring Boot uses a very particular `PropertySource` order that is designed to al sensible overriding of values, properties are considered in the the following order: . Command line arguments. +. JNDI attributes from `java:comp/env`. . Java System properties (`System.getProperties()`). . OS environment variables. -. JNDI attributes from `java:comp/env` . A `RandomValuePropertySource` that only has properties in `+random.*+`. . Application properties outside of your packaged jar (`application.properties` including YAML and profile variants).