Merge branch '1.1.x'

spring-boot-dependencies/pom.xml

@@ -82,6 +82,7 @@
 		<jdom2.version>2.0.5</jdom2.version>
 		<joda-time.version>2.3</joda-time.version>
 		<jolokia.version>1.2.2</jolokia.version>
+		<json-path.version>0.9.1</json-path.version>
 		<jstl.version>1.2</jstl.version>
 		<junit.version>4.11</junit.version>
 		<liquibase.version>3.0.8</liquibase.version>
@@ -405,6 +406,11 @@
 				<artifactId>h2</artifactId>
 				<version>${h2.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.jayway.jsonpath</groupId>
+				<artifactId>json-path</artifactId>
+				<version>${json-path.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.zaxxer</groupId>
 				<artifactId>HikariCP</artifactId>

spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java

@@ -185,11 +185,10 @@ public class LoggingApplicationListener implements SmartApplicationListener {
 				system.initialize(value);
 			}
 			catch (Exception ex) {
-				// Swallow exception and continue
-			}
 				this.logger.warn("Logging environment value '" + value
 						+ "' cannot be opened and will be ignored");
 			}
+		}
 		else {
 
 			system.initialize();