From 75a721d1019da2a2fa86e24ff439df4a224e5b19 Mon Sep 17 00:00:00 2001
From: Emmanuel Bourg <ebourg@apache.org>
Date: Wed, 3 Aug 2016 19:55:01 +0200
Subject: Imported Upstream version 4.3.2

---
 .../context/config/contextNamespaceHandlerTests-location.xml        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-location.xml')

diff --git a/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-location.xml b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-location.xml
index e90a5e42..f6a4be6f 100644
--- a/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-location.xml
+++ b/spring-context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-location.xml
@@ -2,12 +2,12 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:context="http://www.springframework.org/schema/context"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 
 	<context:property-placeholder
 			location="classpath*:/org/springframework/context/config/test-*.properties,classpath*:/org/springframework/context/config/empty-*.properties,classpath*:/org/springframework/context/config/missing-*.properties"
-			file-encoding="ISO-8859-1"/>
+			file-encoding="ISO-8859-1" trim-values="true"/>
 
 	<bean id="foo" class="java.lang.String">
 		<constructor-arg value="${foo}"/>
-- 
cgit v1.2.3