From 51196e01d5e96c538c2b42ce17acd2c673bda53e Mon Sep 17 00:00:00 2001
From: Lukasz Kryger <lukasz.kryger@gmail.com>
Date: Mon, 14 Jul 2014 21:32:26 +0100
Subject: [PATCH 1/2] Dependencies for json-path in BOM

---
 spring-boot-dependencies/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index c028ee4578..28e311f1a8 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/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>

From 341412d5b5a2dafeac46761d6445cca81a560690 Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@gopivotal.com>
Date: Mon, 14 Jul 2014 20:24:12 -0700
Subject: [PATCH 2/2] Fix LoggingApplicationListener

- If `logging.config` is set and could open/read the resource
then, return.
  - Currently, it logs warning though the resource is successfully
read.
---
 .../boot/logging/LoggingApplicationListener.java             | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
index 8f6ad83167..d7806c0649 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
@@ -185,10 +185,9 @@ 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");
 			}
-			this.logger.warn("Logging environment value '" + value
-					+ "' cannot be opened and will be ignored");
 		}
 		else {