From 80b4b9850a29a87e63fdf16c620542bd6e9ca65a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 27 Mar 2019 18:08:35 +0100 Subject: [PATCH 1/6] Upgrade to Reactor Californium SR6 Closes gh-22693 --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 98377a7f6c4..d64812643d6 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ ext { kotlinVersion = "1.2.71" log4jVersion = "2.11.2" nettyVersion = "4.1.34.Final" - reactorVersion = "Californium-SR5" + reactorVersion = "Californium-SR6" rxjavaVersion = "1.3.8" rxjavaAdapterVersion = "1.2.1" rxjava2Version = "2.2.7" @@ -149,7 +149,6 @@ configure(allprojects) { project -> repositories { maven { url "https://repo.spring.io/libs-release" } - maven { url "https://repo.spring.io/snapshot" } // Reactor } dependencies { From 8f77b7366e641af3712c06de77f4baf2714773e9 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Mon, 25 Mar 2019 23:14:47 -0500 Subject: [PATCH 2/6] URL Cleanup This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). These URLs were unable to be fixed. Please review them to see if they can be manually resolved. * [ ] http://castor.org/mapping.dtd (301) with 1 occurrences could not be migrated: ([https](https://castor.org/mapping.dtd) result AnnotatedConnectException). * [ ] http://mydomain2.com (302) with 2 occurrences could not be migrated: ([https](https://mydomain2.com) result ConnectTimeoutException). * [ ] http://www.foo.com/schema/component/component.xsd (404) with 1 occurrences could not be migrated: ([https](https://www.foo.com/schema/component/component.xsd) result SSLHandshakeException). These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * [ ] http://www.kbcafe.com/rss/atom.xsd.xml (ConnectTimeoutException) with 1 occurrences migrated to: https://www.kbcafe.com/rss/atom.xsd.xml ([https](https://www.kbcafe.com/rss/atom.xsd.xml) result ConnectTimeoutException). * [ ] http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd (ReadTimeoutException) with 5 occurrences migrated to: https://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd ([https](https://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd) result ReadTimeoutException). * [ ] http://domain1.com (UnknownHostException) with 2 occurrences migrated to: https://domain1.com ([https](https://domain1.com) result UnknownHostException). * [ ] http://domain2.com (UnknownHostException) with 1 occurrences migrated to: https://domain2.com ([https](https://domain2.com) result UnknownHostException). * [ ] http://mydomain1.com,http://mydomain2.com (UnknownHostException) with 1 occurrences migrated to: https://mydomain1.com,http://mydomain2.com ([https](https://mydomain1.com,https://mydomain2.com) result UnknownHostException). * [ ] http://mydomain3.com,http://mydomain4.com (UnknownHostException) with 1 occurrences migrated to: https://mydomain3.com,http://mydomain4.com ([https](https://mydomain3.com,https://mydomain4.com) result UnknownHostException). * [ ] http://www.springframework.org/schema/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd (404) with 1 occurrences migrated to: https://www.springframework.org/schema/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd ([https](https://www.springframework.org/schema/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd) result 404). These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://example.com with 1 occurrences migrated to: https://example.com ([https](https://example.com) result 200). * [ ] http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd (301) with 2 occurrences migrated to: https://hibernate.org/dtd/hibernate-mapping-3.0.dtd ([https](https://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd) result 200). * [ ] http://testng.org/testng-1.0.dtd with 3 occurrences migrated to: https://testng.org/testng-1.0.dtd ([https](https://testng.org/testng-1.0.dtd) result 200). * [ ] http://tiles.apache.org/dtds/tiles-config_2_0.dtd with 2 occurrences migrated to: https://tiles.apache.org/dtds/tiles-config_2_0.dtd ([https](https://tiles.apache.org/dtds/tiles-config_2_0.dtd) result 200). * [ ] http://tiles.apache.org/dtds/tiles-config_2_1.dtd with 2 occurrences migrated to: https://tiles.apache.org/dtds/tiles-config_2_1.dtd ([https](https://tiles.apache.org/dtds/tiles-config_2_1.dtd) result 200). * [ ] http://tiles.apache.org/dtds/tiles-config_3_0.dtd with 4 occurrences migrated to: https://tiles.apache.org/dtds/tiles-config_3_0.dtd ([https](https://tiles.apache.org/dtds/tiles-config_3_0.dtd) result 200). * [ ] http://www.quartz-scheduler.org/xml/job_scheduling_data_1_8.xsd with 1 occurrences migrated to: https://www.quartz-scheduler.org/xml/job_scheduling_data_1_8.xsd ([https](https://www.quartz-scheduler.org/xml/job_scheduling_data_1_8.xsd) result 200). * [ ] http://www.springframework.org/dtd/spring-beans-2.0.dtd with 176 occurrences migrated to: https://www.springframework.org/dtd/spring-beans-2.0.dtd ([https](https://www.springframework.org/dtd/spring-beans-2.0.dtd) result 200). * [ ] http://www.springframework.org/schema/aop/spring-aop-2.0.xsd with 68 occurrences migrated to: https://www.springframework.org/schema/aop/spring-aop-2.0.xsd ([https](https://www.springframework.org/schema/aop/spring-aop-2.0.xsd) result 200). * [ ] http://www.springframework.org/schema/aop/spring-aop-2.5.xsd with 11 occurrences migrated to: https://www.springframework.org/schema/aop/spring-aop-2.5.xsd ([https](https://www.springframework.org/schema/aop/spring-aop-2.5.xsd) result 200). * [ ] http://www.springframework.org/schema/aop/spring-aop-3.0.xsd with 2 occurrences migrated to: https://www.springframework.org/schema/aop/spring-aop-3.0.xsd ([https](https://www.springframework.org/schema/aop/spring-aop-3.0.xsd) result 200). * [ ] http://www.springframework.org/schema/aop/spring-aop.xsd with 7 occurrences migrated to: https://www.springframework.org/schema/aop/spring-aop.xsd ([https](https://www.springframework.org/schema/aop/spring-aop.xsd) result 200). * [ ] http://www.springframework.org/schema/beans/spring-beans-2.0.xsd with 112 occurrences migrated to: https://www.springframework.org/schema/beans/spring-beans-2.0.xsd ([https](https://www.springframework.org/schema/beans/spring-beans-2.0.xsd) result 200). * [ ] http://www.springframework.org/schema/beans/spring-beans-2.5.xsd with 46 occurrences migrated to: https://www.springframework.org/schema/beans/spring-beans-2.5.xsd ([https](https://www.springframework.org/schema/beans/spring-beans-2.5.xsd) result 200). * [ ] http://www.springframework.org/schema/beans/spring-beans-3.0.xsd with 10 occurrences migrated to: https://www.springframework.org/schema/beans/spring-beans-3.0.xsd ([https](https://www.springframework.org/schema/beans/spring-beans-3.0.xsd) result 200). * [ ] http://www.springframework.org/schema/beans/spring-beans-3.1.xsd with 33 occurrences migrated to: https://www.springframework.org/schema/beans/spring-beans-3.1.xsd ([https](https://www.springframework.org/schema/beans/spring-beans-3.1.xsd) result 200). * [ ] http://www.springframework.org/schema/beans/spring-beans-3.2.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/beans/spring-beans-3.2.xsd ([https](https://www.springframework.org/schema/beans/spring-beans-3.2.xsd) result 200). * [ ] http://www.springframework.org/schema/beans/spring-beans-4.0.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/beans/spring-beans-4.0.xsd ([https](https://www.springframework.org/schema/beans/spring-beans-4.0.xsd) result 200). * [ ] http://www.springframework.org/schema/beans/spring-beans-4.1.xsd with 3 occurrences migrated to: https://www.springframework.org/schema/beans/spring-beans-4.1.xsd ([https](https://www.springframework.org/schema/beans/spring-beans-4.1.xsd) result 200). * [ ] http://www.springframework.org/schema/beans/spring-beans-4.2.xsd with 4 occurrences migrated to: https://www.springframework.org/schema/beans/spring-beans-4.2.xsd ([https](https://www.springframework.org/schema/beans/spring-beans-4.2.xsd) result 200). * [ ] http://www.springframework.org/schema/beans/spring-beans-4.3.xsd with 4 occurrences migrated to: https://www.springframework.org/schema/beans/spring-beans-4.3.xsd ([https](https://www.springframework.org/schema/beans/spring-beans-4.3.xsd) result 200). * [ ] http://www.springframework.org/schema/beans/spring-beans.xsd with 142 occurrences migrated to: https://www.springframework.org/schema/beans/spring-beans.xsd ([https](https://www.springframework.org/schema/beans/spring-beans.xsd) result 200). * [ ] http://www.springframework.org/schema/cache/spring-cache.xsd with 10 occurrences migrated to: https://www.springframework.org/schema/cache/spring-cache.xsd ([https](https://www.springframework.org/schema/cache/spring-cache.xsd) result 200). * [ ] http://www.springframework.org/schema/context/spring-context-2.5.xsd with 41 occurrences migrated to: https://www.springframework.org/schema/context/spring-context-2.5.xsd ([https](https://www.springframework.org/schema/context/spring-context-2.5.xsd) result 200). * [ ] http://www.springframework.org/schema/context/spring-context-3.0.xsd with 2 occurrences migrated to: https://www.springframework.org/schema/context/spring-context-3.0.xsd ([https](https://www.springframework.org/schema/context/spring-context-3.0.xsd) result 200). * [ ] http://www.springframework.org/schema/context/spring-context-3.1.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/context/spring-context-3.1.xsd ([https](https://www.springframework.org/schema/context/spring-context-3.1.xsd) result 200). * [ ] http://www.springframework.org/schema/context/spring-context-3.2.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/context/spring-context-3.2.xsd ([https](https://www.springframework.org/schema/context/spring-context-3.2.xsd) result 200). * [ ] http://www.springframework.org/schema/context/spring-context-4.0.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/context/spring-context-4.0.xsd ([https](https://www.springframework.org/schema/context/spring-context-4.0.xsd) result 200). * [ ] http://www.springframework.org/schema/context/spring-context-4.2.xsd with 4 occurrences migrated to: https://www.springframework.org/schema/context/spring-context-4.2.xsd ([https](https://www.springframework.org/schema/context/spring-context-4.2.xsd) result 200). * [ ] http://www.springframework.org/schema/context/spring-context-4.3.xsd with 2 occurrences migrated to: https://www.springframework.org/schema/context/spring-context-4.3.xsd ([https](https://www.springframework.org/schema/context/spring-context-4.3.xsd) result 200). * [ ] http://www.springframework.org/schema/context/spring-context.xsd with 10 occurrences migrated to: https://www.springframework.org/schema/context/spring-context.xsd ([https](https://www.springframework.org/schema/context/spring-context.xsd) result 200). * [ ] http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd with 9 occurrences migrated to: https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd ([https](https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd) result 200). * [ ] http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd with 5 occurrences migrated to: https://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd ([https](https://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd) result 200). * [ ] http://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd with 9 occurrences migrated to: https://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd ([https](https://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd) result 200). * [ ] http://www.springframework.org/schema/jdbc/spring-jdbc-4.3.xsd with 2 occurrences migrated to: https://www.springframework.org/schema/jdbc/spring-jdbc-4.3.xsd ([https](https://www.springframework.org/schema/jdbc/spring-jdbc-4.3.xsd) result 200). * [ ] http://www.springframework.org/schema/jdbc/spring-jdbc.xsd with 8 occurrences migrated to: https://www.springframework.org/schema/jdbc/spring-jdbc.xsd ([https](https://www.springframework.org/schema/jdbc/spring-jdbc.xsd) result 200). * [ ] http://www.springframework.org/schema/jee/spring-jee-3.1.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/jee/spring-jee-3.1.xsd ([https](https://www.springframework.org/schema/jee/spring-jee-3.1.xsd) result 200). * [ ] http://www.springframework.org/schema/jms/spring-jms-4.1.xsd with 9 occurrences migrated to: https://www.springframework.org/schema/jms/spring-jms-4.1.xsd ([https](https://www.springframework.org/schema/jms/spring-jms-4.1.xsd) result 200). * [ ] http://www.springframework.org/schema/jms/spring-jms-4.2.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/jms/spring-jms-4.2.xsd ([https](https://www.springframework.org/schema/jms/spring-jms-4.2.xsd) result 200). * [ ] http://www.springframework.org/schema/lang/spring-lang-2.0.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/lang/spring-lang-2.0.xsd ([https](https://www.springframework.org/schema/lang/spring-lang-2.0.xsd) result 200). * [ ] http://www.springframework.org/schema/lang/spring-lang-2.5.xsd with 3 occurrences migrated to: https://www.springframework.org/schema/lang/spring-lang-2.5.xsd ([https](https://www.springframework.org/schema/lang/spring-lang-2.5.xsd) result 200). * [ ] http://www.springframework.org/schema/lang/spring-lang-3.0.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/lang/spring-lang-3.0.xsd ([https](https://www.springframework.org/schema/lang/spring-lang-3.0.xsd) result 200). * [ ] http://www.springframework.org/schema/lang/spring-lang-3.1.xsd with 5 occurrences migrated to: https://www.springframework.org/schema/lang/spring-lang-3.1.xsd ([https](https://www.springframework.org/schema/lang/spring-lang-3.1.xsd) result 200). * [ ] http://www.springframework.org/schema/lang/spring-lang-4.2.xsd with 2 occurrences migrated to: https://www.springframework.org/schema/lang/spring-lang-4.2.xsd ([https](https://www.springframework.org/schema/lang/spring-lang-4.2.xsd) result 200). * [ ] http://www.springframework.org/schema/lang/spring-lang.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/lang/spring-lang.xsd ([https](https://www.springframework.org/schema/lang/spring-lang.xsd) result 200). * [ ] http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd ([https](https://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd) result 200). * [ ] http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd with 2 occurrences migrated to: https://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd ([https](https://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd) result 200). * [ ] http://www.springframework.org/schema/mvc/spring-mvc.xsd with 26 occurrences migrated to: https://www.springframework.org/schema/mvc/spring-mvc.xsd ([https](https://www.springframework.org/schema/mvc/spring-mvc.xsd) result 200). * [ ] http://www.springframework.org/schema/oxm/spring-oxm.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/oxm/spring-oxm.xsd ([https](https://www.springframework.org/schema/oxm/spring-oxm.xsd) result 200). * [ ] http://www.springframework.org/schema/task/spring-task-4.1.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/task/spring-task-4.1.xsd ([https](https://www.springframework.org/schema/task/spring-task-4.1.xsd) result 200). * [ ] http://www.springframework.org/schema/task/spring-task.xsd with 6 occurrences migrated to: https://www.springframework.org/schema/task/spring-task.xsd ([https](https://www.springframework.org/schema/task/spring-task.xsd) result 200). * [ ] http://www.springframework.org/schema/tx/spring-tx-2.5.xsd with 3 occurrences migrated to: https://www.springframework.org/schema/tx/spring-tx-2.5.xsd ([https](https://www.springframework.org/schema/tx/spring-tx-2.5.xsd) result 200). * [ ] http://www.springframework.org/schema/tx/spring-tx-4.0.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/tx/spring-tx-4.0.xsd ([https](https://www.springframework.org/schema/tx/spring-tx-4.0.xsd) result 200). * [ ] http://www.springframework.org/schema/tx/spring-tx.xsd with 2 occurrences migrated to: https://www.springframework.org/schema/tx/spring-tx.xsd ([https](https://www.springframework.org/schema/tx/spring-tx.xsd) result 200). * [ ] http://www.springframework.org/schema/util/spring-util-2.0.xsd with 2 occurrences migrated to: https://www.springframework.org/schema/util/spring-util-2.0.xsd ([https](https://www.springframework.org/schema/util/spring-util-2.0.xsd) result 200). * [ ] http://www.springframework.org/schema/util/spring-util-2.5.xsd with 2 occurrences migrated to: https://www.springframework.org/schema/util/spring-util-2.5.xsd ([https](https://www.springframework.org/schema/util/spring-util-2.5.xsd) result 200). * [ ] http://www.springframework.org/schema/util/spring-util-3.0.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/util/spring-util-3.0.xsd ([https](https://www.springframework.org/schema/util/spring-util-3.0.xsd) result 200). * [ ] http://www.springframework.org/schema/util/spring-util-3.1.xsd with 2 occurrences migrated to: https://www.springframework.org/schema/util/spring-util-3.1.xsd ([https](https://www.springframework.org/schema/util/spring-util-3.1.xsd) result 200). * [ ] http://www.springframework.org/schema/util/spring-util-4.1.xsd with 1 occurrences migrated to: https://www.springframework.org/schema/util/spring-util-4.1.xsd ([https](https://www.springframework.org/schema/util/spring-util-4.1.xsd) result 200). * [ ] http://www.springframework.org/schema/util/spring-util-4.2.xsd with 4 occurrences migrated to: https://www.springframework.org/schema/util/spring-util-4.2.xsd ([https](https://www.springframework.org/schema/util/spring-util-4.2.xsd) result 200). * [ ] http://www.springframework.org/schema/util/spring-util.xsd with 2 occurrences migrated to: https://www.springframework.org/schema/util/spring-util.xsd ([https](https://www.springframework.org/schema/util/spring-util.xsd) result 200). * [ ] http://www.springframework.org/schema/websocket/spring-websocket.xsd with 11 occurrences migrated to: https://www.springframework.org/schema/websocket/spring-websocket.xsd ([https](https://www.springframework.org/schema/websocket/spring-websocket.xsd) result 200). * [ ] http://www.w3.org/1999/02/22-rdf-syntax-ns with 2 occurrences migrated to: https://www.w3.org/1999/02/22-rdf-syntax-ns ([https](https://www.w3.org/1999/02/22-rdf-syntax-ns) result 200). * [ ] http://mydomain1.com with 2 occurrences migrated to: https://mydomain1.com ([https](https://mydomain1.com) result 301). * [ ] http://www.springframework.org with 1 occurrences migrated to: https://www.springframework.org ([https](https://www.springframework.org) result 301). * [ ] http://help.sap.com/saphelp_hanaplatform/helpdata/en/20/a78d3275191014b41bae7c4a46d835/content.htm with 1 occurrences migrated to: https://help.sap.com/saphelp_hanaplatform/helpdata/en/20/a78d3275191014b41bae7c4a46d835/content.htm ([https](https://help.sap.com/saphelp_hanaplatform/helpdata/en/20/a78d3275191014b41bae7c4a46d835/content.htm) result 302). * [ ] http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd with 1 occurrences migrated to: https://java.sun.com/xml/ns/j2ee/connector_1_5.xsd ([https](https://java.sun.com/xml/ns/j2ee/connector_1_5.xsd) result 302). * [ ] http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd with 1 occurrences migrated to: https://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd ([https](https://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd) result 302). * [ ] http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd with 12 occurrences migrated to: https://java.sun.com/xml/ns/persistence/persistence_1_0.xsd ([https](https://java.sun.com/xml/ns/persistence/persistence_1_0.xsd) result 302). * [ ] http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd with 1 occurrences migrated to: https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd ([https](https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd) result 302). * [ ] http://purl.org/dc/dcmitype/StillImage with 2 occurrences migrated to: https://purl.org/dc/dcmitype/StillImage ([https](https://purl.org/dc/dcmitype/StillImage) result 302). These URLs were intentionally ignored. * http://creativecommons.org/ns with 2 occurrences * http://java.sun.com/dtd/properties.dtd with 4 occurrences * http://java.sun.com/xml/ns/j2ee with 2 occurrences * http://java.sun.com/xml/ns/javaee with 2 occurrences * http://java.sun.com/xml/ns/persistence with 27 occurrences * http://localhost:8080 with 3 occurrences * http://purl.org/dc/elements/1.1/ with 2 occurrences * http://samples.springframework.org/flight with 7 occurrences * http://schemas.microsoft.com/visio/2003/SVGExtensions/ with 7 occurrences * http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd with 2 occurrences * http://www.foo.com/schema/component with 2 occurrences * http://www.greeting.com/goodbye/ with 1 occurrences * http://www.greeting.com/hello/ with 1 occurrences * http://www.inkscape.org/namespaces/inkscape with 2 occurrences * http://www.quartz-scheduler.org/xml/JobSchedulingData with 2 occurrences * http://www.springframework.org/schema/aop with 176 occurrences * http://www.springframework.org/schema/beans with 715 occurrences * http://www.springframework.org/schema/beans/test with 2 occurrences * http://www.springframework.org/schema/c with 9 occurrences * http://www.springframework.org/schema/cache with 20 occurrences * http://www.springframework.org/schema/context with 126 occurrences * http://www.springframework.org/schema/jdbc with 66 occurrences * http://www.springframework.org/schema/jee with 2 occurrences * http://www.springframework.org/schema/jms with 20 occurrences * http://www.springframework.org/schema/lang with 27 occurrences * http://www.springframework.org/schema/mvc with 58 occurrences * http://www.springframework.org/schema/oxm with 2 occurrences * http://www.springframework.org/schema/p with 16 occurrences * http://www.springframework.org/schema/task with 14 occurrences * http://www.springframework.org/schema/tx with 12 occurrences * http://www.springframework.org/schema/util with 28 occurrences * http://www.springframework.org/schema/websocket with 22 occurrences * http://www.w3.org/2000/svg with 9 occurrences * http://www.w3.org/2001/XMLSchema-instance with 375 occurrences * http://www.w3.org/2005/Atom with 2 occurrences Closes gh-22669 --- .../aop/config/AopNamespaceHandlerEventTests-context.xml | 4 ++-- ...AopNamespaceHandlerEventTests-directPointcutEvents.xml | 4 ++-- .../AopNamespaceHandlerEventTests-pointcutEvents.xml | 4 ++-- .../AopNamespaceHandlerEventTests-pointcutRefEvents.xml | 4 ++-- ...spaceHandlerPointcutErrorTests-pointcutDuplication.xml | 4 ++-- ...NamespaceHandlerPointcutErrorTests-pointcutMissing.xml | 4 ++-- .../aop/config/TopLevelAopTagTests-context.xml | 2 +- .../aop/framework/PrototypeTargetTests-context.xml | 2 +- .../ExposeInvocationInterceptorTests-context.xml | 2 +- .../ScopedProxyAutowireTests-scopedAutowireFalse.xml | 4 ++-- .../scope/ScopedProxyAutowireTests-scopedAutowireTrue.xml | 4 ++-- ...egexpMethodPointcutAdvisorIntegrationTests-context.xml | 2 +- .../target/CommonsPool2TargetSourceProxyTests-context.xml | 2 +- .../aop/target/HotSwappableTargetSourceTests-context.xml | 2 +- .../aop/target/LazyInitTargetSourceTests-customTarget.xml | 2 +- .../aop/target/LazyInitTargetSourceTests-factoryBean.xml | 2 +- .../aop/target/LazyInitTargetSourceTests-singleton.xml | 2 +- .../aop/target/PrototypeTargetSourceTests-context.xml | 2 +- .../aop/target/ThreadLocalTargetSourceTests-context.xml | 2 +- .../aop/aspectj/autoproxy/ajcAutoproxyTests.xml | 4 ++-- .../beans/factory/aspectj/beanConfigurerTests-beans.xml | 2 +- .../beans/factory/aspectj/beanConfigurerTests.xml | 4 ++-- .../beans/factory/aspectj/springConfigured.xml | 6 +++--- .../cache/config/annotation-cache-aspectj.xml | 4 ++-- .../cache/config/annotation-jcache-aspectj.xml | 4 ++-- .../scheduling/aspectj/annotationDrivenContext.xml | 4 ++-- .../aspectj/TransactionAspectTests-context.xml | 2 +- .../factory/BeanFactoryUtilsTests-dependentBeans.xml | 2 +- .../beans/factory/BeanFactoryUtilsTests-leaf.xml | 2 +- .../beans/factory/BeanFactoryUtilsTests-middle.xml | 2 +- .../beans/factory/BeanFactoryUtilsTests-root.xml | 2 +- .../beans/factory/ConcurrentBeanFactoryTests-context.xml | 2 +- .../beans/factory/FactoryBeanLookupTests-context.xml | 2 +- .../beans/factory/FactoryBeanTests-abstract.xml | 2 +- .../beans/factory/FactoryBeanTests-circular.xml | 2 +- .../beans/factory/FactoryBeanTests-returnsNull.xml | 2 +- .../beans/factory/FactoryBeanTests-withAutowiring.xml | 2 +- .../annotation/CustomAutowireConfigurerTests-context.xml | 2 +- .../config/FieldRetrievingFactoryBeanTests-context.xml | 2 +- .../ObjectFactoryCreatingFactoryBeanTests-context.xml | 2 +- .../config/PropertyPathFactoryBeanTests-context.xml | 2 +- .../beans/factory/config/SimpleScopeTests-context.xml | 2 +- .../parsing/CustomProblemReporterTests-context.xml | 2 +- .../beans/factory/support/genericBeanTests.xml | 4 ++-- .../beans/factory/support/lookupMethodTests.xml | 2 +- .../beans/factory/support/security/callbacks.xml | 2 +- .../xml/DuplicateBeanIdTests-multiLevel-context.xml | 2 +- .../xml/DuplicateBeanIdTests-sameLevel-context.xml | 2 +- ...ttributeRecursionTests-autowire-candidates-context.xml | 2 +- ...ansElementAttributeRecursionTests-autowire-context.xml | 2 +- ...lementAttributeRecursionTests-init-destroy-context.xml | 2 +- ...edBeansElementAttributeRecursionTests-lazy-context.xml | 2 +- ...dBeansElementAttributeRecursionTests-merge-context.xml | 2 +- .../beans/factory/xml/NestedBeansElementTests-context.xml | 2 +- ...ProfileXmlBeanDefinitionTests-customDefaultProfile.xml | 2 +- ...ProfileXmlBeanDefinitionTests-defaultAndDevProfile.xml | 2 +- .../xml/ProfileXmlBeanDefinitionTests-defaultProfile.xml | 2 +- .../xml/ProfileXmlBeanDefinitionTests-devProfile.xml | 2 +- .../xml/ProfileXmlBeanDefinitionTests-multiProfile.xml | 2 +- .../ProfileXmlBeanDefinitionTests-multiProfileNegated.xml | 2 +- .../ProfileXmlBeanDefinitionTests-multiProfileNotDev.xml | 2 +- .../xml/ProfileXmlBeanDefinitionTests-noProfile.xml | 2 +- .../xml/ProfileXmlBeanDefinitionTests-notDevProfile.xml | 2 +- .../xml/ProfileXmlBeanDefinitionTests-prodProfile.xml | 2 +- ...rofileXmlBeanDefinitionTests-spaceDelimitedProfile.xml | 2 +- .../xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml | 2 +- .../factory/xml/autowire-constructor-with-exclusion.xml | 2 +- .../beans/factory/xml/autowire-with-exclusion.xml | 2 +- .../beans/factory/xml/autowire-with-inclusion.xml | 2 +- .../factory/xml/autowire-with-selective-inclusion.xml | 2 +- .../org/springframework/beans/factory/xml/beanEvents.xml | 2 +- .../beans/factory/xml/beanEventsImported.xml | 2 +- .../beans/factory/xml/beanNameGeneration.xml | 2 +- .../beans/factory/xml/collectionMerging.xml | 2 +- .../org/springframework/beans/factory/xml/collections.xml | 2 +- .../beans/factory/xml/collectionsWithDefaultTypes.xml | 2 +- .../beans/factory/xml/defaultLifecycleMethods.xml | 2 +- .../springframework/beans/factory/xml/factory-methods.xml | 2 +- .../beans/factory/xml/ignoreDefaultLifecycleMethods.xml | 2 +- .../org/springframework/beans/factory/xml/import.xml | 2 +- .../springframework/beans/factory/xml/importPattern.xml | 2 +- .../beans/factory/xml/invalidPerSchema.xml | 2 +- .../springframework/beans/factory/xml/schemaValidated.xml | 2 +- .../xml/simpleConstructorNamespaceHandlerTests.xml | 2 +- .../simpleConstructorNamespaceHandlerTestsWithErrors.xml | 2 +- .../factory/xml/simplePropertyNamespaceHandlerTests.xml | 2 +- .../xml/simplePropertyNamespaceHandlerTestsWithErrors.xml | 2 +- .../org/springframework/beans/factory/xml/test.xml | 2 +- .../beans/factory/xml/testUtilNamespace.xml | 4 ++-- .../springframework/beans/factory/xml/validateWithDtd.xml | 2 +- .../springframework/beans/factory/xml/validateWithXsd.xml | 2 +- .../org/springframework/beans/factory/xml/withMeta.xml | 2 +- .../jcache/config/jCacheNamespaceDriven-resolver.xml | 4 ++-- .../cache/jcache/config/jCacheNamespaceDriven.xml | 4 ++-- .../cache/jcache/config/jCacheStandaloneConfig.xml | 2 +- .../scheduling/quartz/databasePersistence.xml | 4 ++-- .../scheduling/quartz/job-scheduling-data.xml | 2 +- .../quartz/multipleAnonymousMethodInvokingJobDetailFB.xml | 2 +- .../scheduling/quartz/multipleSchedulers.xml | 2 +- .../quartz/multipleSchedulersWithQuartzProperties.xml | 2 +- .../scheduling/quartz/quartzSchedulerLifecycleTests.xml | 2 +- .../scheduling/quartz/schedulerAccessorBean.xml | 2 +- .../scheduling/quartz/schedulerRepositoryExposure.xml | 2 +- .../aop/aspectj/AfterAdviceBindingTests.xml | 4 ++-- .../aop/aspectj/AfterReturningAdviceBindingTests.xml | 4 ++-- .../aop/aspectj/AfterThrowingAdviceBindingTests.xml | 4 ++-- .../aop/aspectj/AroundAdviceBindingTests.xml | 4 ++-- .../aop/aspectj/AroundAdviceCircularTests.xml | 4 ++-- .../aop/aspectj/AspectAndAdvicePrecedenceTests.xml | 4 ++-- .../aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml | 2 +- .../aop/aspectj/BeanNamePointcutAtAspectTests.xml | 4 ++-- .../springframework/aop/aspectj/BeanNamePointcutTests.xml | 4 ++-- .../aop/aspectj/BeforeAdviceBindingTests.xml | 4 ++-- .../aop/aspectj/DeclarationOrderIndependenceTests.xml | 4 ++-- .../aop/aspectj/DeclareParentsDelegateRefTests.xml | 4 ++-- .../springframework/aop/aspectj/DeclareParentsTests.xml | 4 ++-- .../aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml | 4 ++-- .../aop/aspectj/ImplicitJPArgumentMatchingTests.xml | 4 ++-- .../aop/aspectj/OverloadedAdviceTests-ambiguous.xml | 4 ++-- .../springframework/aop/aspectj/OverloadedAdviceTests.xml | 4 ++-- .../org/springframework/aop/aspectj/ProceedTests.xml | 4 ++-- .../aop/aspectj/PropertyDependentAspectTests-after.xml | 4 ++-- .../PropertyDependentAspectTests-atAspectJ-after.xml | 4 ++-- .../PropertyDependentAspectTests-atAspectJ-before.xml | 4 ++-- .../aop/aspectj/PropertyDependentAspectTests-before.xml | 4 ++-- .../aop/aspectj/SharedPointcutWithArgsMismatchTests.xml | 4 ++-- .../aop/aspectj/SubtypeSensitiveMatchingTests.xml | 4 ++-- .../aop/aspectj/TargetPointcutSelectionTests.xml | 4 ++-- .../ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml | 4 ++-- .../aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml | 4 ++-- .../aspectj/autoproxy/AnnotationBindingTests-context.xml | 4 ++-- .../aspectj/autoproxy/AnnotationPointcutTests-context.xml | 4 ++-- .../AspectImplementingInterfaceTests-context.xml | 4 ++-- ...toProxyCreatorAndLazyInitTargetSourceTests-context.xml | 2 +- .../autoproxy/AspectJAutoProxyCreatorTests-aspects.xml | 4 ++-- .../AspectJAutoProxyCreatorTests-aspectsPlusAdvisor.xml | 2 +- ...pectJAutoProxyCreatorTests-aspectsWithAbstractBean.xml | 2 +- .../AspectJAutoProxyCreatorTests-aspectsWithCGLIB.xml | 4 ++-- .../AspectJAutoProxyCreatorTests-aspectsWithOrdering.xml | 4 ++-- .../autoproxy/AspectJAutoProxyCreatorTests-pertarget.xml | 2 +- .../autoproxy/AspectJAutoProxyCreatorTests-perthis.xml | 2 +- .../AspectJAutoProxyCreatorTests-retryAspect.xml | 4 ++-- .../AspectJAutoProxyCreatorTests-twoAdviceAspect.xml | 2 +- ...ectJAutoProxyCreatorTests-twoAdviceAspectPrototype.xml | 2 +- ...ectJAutoProxyCreatorTests-twoAdviceAspectSingleton.xml | 2 +- .../AspectJAutoProxyCreatorTests-usesInclude.xml | 4 ++-- .../AspectJAutoProxyCreatorTests-usesJoinPointAspect.xml | 2 +- ...AutoProxyCreatorTests-withBeanNameAutoProxyCreator.xml | 2 +- .../autoproxy/AtAspectJAfterThrowingTests-context.xml | 2 +- .../autoproxy/AtAspectJAnnotationBindingTests-context.xml | 4 ++-- .../autoproxy/benchmark/BenchmarkTests-aspectj.xml | 4 ++-- .../autoproxy/benchmark/BenchmarkTests-springAop.xml | 4 ++-- .../aop/aspectj/autoproxy/spr3064/SPR3064Tests.xml | 4 ++-- .../AfterReturningGenericTypeMatchingTests-context.xml | 4 ++-- ...GenericBridgeMethodMatchingClassProxyTests-context.xml | 4 ++-- .../generic/GenericBridgeMethodMatchingTests-context.xml | 4 ++-- .../generic/GenericParameterMatchingTests-context.xml | 4 ++-- .../config/AopNamespaceHandlerAdviceTypeTests-error.xml | 4 ++-- .../aop/config/AopNamespaceHandlerAdviceTypeTests-ok.xml | 4 ++-- .../aop/config/AopNamespaceHandlerArgNamesTests-error.xml | 4 ++-- .../aop/config/AopNamespaceHandlerArgNamesTests-ok.xml | 4 ++-- .../AopNamespaceHandlerProxyTargetClassTests-context.xml | 4 ++-- .../config/AopNamespaceHandlerReturningTests-error.xml | 4 ++-- .../aop/config/AopNamespaceHandlerReturningTests-ok.xml | 4 ++-- .../aop/config/AopNamespaceHandlerTests-context.xml | 4 ++-- .../aop/config/AopNamespaceHandlerThrowingTests-error.xml | 4 ++-- .../aop/config/AopNamespaceHandlerThrowingTests-ok.xml | 4 ++-- .../aop/config/PrototypeProxyTests-context.xml | 4 ++-- .../CglibProxyTests-with-dependency-checking.xml | 2 +- .../aop/framework/ObjenesisProxyTests-context.xml | 6 +++--- .../aop/framework/ProxyFactoryBeanTests-autowiring.xml | 2 +- .../aop/framework/ProxyFactoryBeanTests-context.xml | 2 +- .../ProxyFactoryBeanTests-double-targetsource.xml | 2 +- .../aop/framework/ProxyFactoryBeanTests-frozen.xml | 2 +- .../framework/ProxyFactoryBeanTests-inner-bean-target.xml | 2 +- .../aop/framework/ProxyFactoryBeanTests-invalid.xml | 2 +- .../ProxyFactoryBeanTests-notlast-targetsource.xml | 2 +- .../aop/framework/ProxyFactoryBeanTests-prototype.xml | 2 +- .../aop/framework/ProxyFactoryBeanTests-serialization.xml | 2 +- .../aop/framework/ProxyFactoryBeanTests-targetsource.xml | 2 +- .../aop/framework/ProxyFactoryBeanTests-throws-advice.xml | 2 +- .../adapter/AdvisorAdapterRegistrationTests-with-bpp.xml | 2 +- .../AdvisorAdapterRegistrationTests-without-bpp.xml | 2 +- .../AdvisorAutoProxyCreatorTests-common-interceptors.xml | 2 +- .../AdvisorAutoProxyCreatorTests-custom-targetsource.xml | 2 +- .../autoproxy/AdvisorAutoProxyCreatorTests-optimized.xml | 2 +- .../AdvisorAutoProxyCreatorTests-quick-targetsource.xml | 2 +- .../BeanNameAutoProxyCreatorInitTests-context.xml | 2 +- .../autoproxy/BeanNameAutoProxyCreatorTests-context.xml | 2 +- .../springframework/aop/scope/ScopedProxyTests-list.xml | 4 ++-- .../springframework/aop/scope/ScopedProxyTests-map.xml | 4 ++-- .../aop/scope/ScopedProxyTests-override.xml | 4 ++-- .../aop/scope/ScopedProxyTests-testbean.xml | 2 +- .../aop/target/CommonsPool2TargetSourceTests-context.xml | 2 +- .../xml/LookupMethodWrappedByCglibProxyTests-context.xml | 2 +- .../factory/xml/QualifierAnnotationTests-context.xml | 4 ++-- .../beans/factory/xml/XmlBeanFactoryTests-autowire.xml | 2 +- .../beans/factory/xml/XmlBeanFactoryTests-child.xml | 2 +- .../factory/xml/XmlBeanFactoryTests-classNotFound.xml | 2 +- .../beans/factory/xml/XmlBeanFactoryTests-collections.xml | 2 +- .../xml/XmlBeanFactoryTests-complexFactoryCircle.xml | 2 +- .../factory/xml/XmlBeanFactoryTests-constructorArg.xml | 2 +- .../xml/XmlBeanFactoryTests-constructorOverrides.xml | 2 +- .../factory/xml/XmlBeanFactoryTests-defaultAutowire.xml | 2 +- .../factory/xml/XmlBeanFactoryTests-defaultLazyInit.xml | 2 +- .../xml/XmlBeanFactoryTests-delegationOverrides.xml | 2 +- .../beans/factory/xml/XmlBeanFactoryTests-depCarg.xml | 2 +- .../factory/xml/XmlBeanFactoryTests-depCargAutowire.xml | 2 +- .../factory/xml/XmlBeanFactoryTests-depCargInner.xml | 2 +- .../factory/xml/XmlBeanFactoryTests-depDependsOn.xml | 2 +- .../factory/xml/XmlBeanFactoryTests-depDependsOnInner.xml | 2 +- .../xml/XmlBeanFactoryTests-depMaterializeThis.xml | 2 +- .../beans/factory/xml/XmlBeanFactoryTests-depProp.xml | 2 +- .../xml/XmlBeanFactoryTests-depPropAutowireByName.xml | 2 +- .../xml/XmlBeanFactoryTests-depPropAutowireByType.xml | 2 +- .../xml/XmlBeanFactoryTests-depPropInTheMiddle.xml | 2 +- .../factory/xml/XmlBeanFactoryTests-depPropInner.xml | 2 +- .../factory/xml/XmlBeanFactoryTests-factoryCircle.xml | 2 +- .../factory/xml/XmlBeanFactoryTests-initializers.xml | 2 +- .../beans/factory/xml/XmlBeanFactoryTests-invalid.xml | 2 +- .../XmlBeanFactoryTests-invalidOverridesNoSuchMethod.xml | 2 +- .../xml/XmlBeanFactoryTests-localCollectionsUsingXsd.xml | 4 ++-- .../xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml | 2 +- .../beans/factory/xml/XmlBeanFactoryTests-overrides.xml | 2 +- .../beans/factory/xml/XmlBeanFactoryTests-parent.xml | 2 +- .../factory/xml/XmlBeanFactoryTests-recursiveImport.xml | 2 +- .../factory/xml/XmlBeanFactoryTests-resourceImport.xml | 2 +- .../XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml | 2 +- .../xml/XmlBeanFactoryTests-testWithDuplicateNames.xml | 2 +- ...ropertyNamespaceHandlerWithExpressionLanguageTests.xml | 2 +- .../xml/support/CustomNamespaceHandlerTests-context.xml | 6 +++--- .../cache/config/annotationDrivenCacheConfig.xml | 4 ++-- .../annotationDrivenCacheNamespace-manager-resolver.xml | 4 ++-- .../config/annotationDrivenCacheNamespace-resolver.xml | 4 ++-- .../cache/config/annotationDrivenCacheNamespace.xml | 6 +++--- .../springframework/cache/config/cache-advice-invalid.xml | 4 ++-- .../org/springframework/cache/config/cache-advice.xml | 6 +++--- .../ContextJndiBeanFactoryLocatorTests-collections.xml | 2 +- .../access/ContextJndiBeanFactoryLocatorTests-parent.xml | 2 +- .../ContextSingletonBeanFactoryLocatorTests-context.xml | 2 +- .../annotation/DestroyMethodInferenceTests-context.xml | 2 +- .../annotation/EnableLoadTimeWeavingTests-context.xml | 4 ++-- .../context/annotation/Spr6602Tests-context.xml | 2 +- .../context/annotation/aspectjTypeFilterTests.xml | 4 ++-- .../annotation/aspectjTypeFilterTestsWithPlaceholders.xml | 4 ++-- .../componentScanRespectsProfileAnnotationTests.xml | 4 ++-- .../componentScanWithAutowiredQualifierTests.xml | 4 ++-- .../configuration/AutowiredConfigurationTests-custom.xml | 6 +++--- .../configuration/AutowiredConfigurationTests.xml | 4 ++-- .../annotation/configuration/ImportXmlConfig-context.xml | 2 +- .../configuration/ImportXmlWithAopNamespace-context.xml | 4 ++-- .../ImportXmlWithConfigurationClass-context.xml | 2 +- .../configuration/SecondLevelSubConfig-context.xml | 2 +- .../annotation/configuration/ValueInjectionTests.xml | 4 ++-- .../annotation/configuration/annotation-config.xml | 4 ++-- .../annotation/configuration/aspectj-autoproxy-config.xml | 4 ++-- ...nnotationUsedForBothComponentScanAndQualifierTests.xml | 4 ++-- .../context/annotation/customNameGeneratorTests.xml | 4 ++-- .../context/annotation/customScopeResolverTests.xml | 4 ++-- .../context/annotation/customTypeFilterTests.xml | 4 ++-- .../context/annotation/defaultAutowireByNameTests.xml | 4 ++-- .../context/annotation/defaultAutowireByTypeTests.xml | 4 ++-- .../annotation/defaultAutowireConstructorTests.xml | 4 ++-- .../context/annotation/defaultAutowireNoTests.xml | 4 ++-- .../annotation/defaultInitAndDestroyMethodsTests.xml | 4 ++-- .../context/annotation/defaultLazyInitFalseTests.xml | 4 ++-- .../context/annotation/defaultLazyInitTrueTests.xml | 4 ++-- .../defaultNonExistingInitAndDestroyMethodsTests.xml | 4 ++-- .../context/annotation/defaultWithNoOverridesTests.xml | 4 ++-- .../context/annotation/doubleScanTests.xml | 6 +++--- .../annotation/invalidClassNameScopeResolverTests.xml | 4 ++-- .../annotation/invalidConstructorNameGeneratorTests.xml | 4 ++-- .../context/annotation/matchingResourcePatternTests.xml | 4 ++-- .../context/annotation/multipleConstructors.xml | 2 +- .../annotation/nonMatchingResourcePatternTests.xml | 4 ++-- .../context/annotation/scopedProxyDefaultTests.xml | 4 ++-- .../context/annotation/scopedProxyInterfacesTests.xml | 4 ++-- .../context/annotation/scopedProxyInvalidConfigTests.xml | 4 ++-- .../context/annotation/scopedProxyNoTests.xml | 4 ++-- .../context/annotation/scopedProxyTargetClassTests.xml | 4 ++-- .../context/annotation/simpleConfigTests.xml | 6 +++--- .../context/annotation/simpleScanTests.xml | 6 +++--- .../context/annotation/spr10546/importedResource.xml | 2 +- .../contextNamespaceHandlerTests-location-placeholder.xml | 4 ++-- .../config/contextNamespaceHandlerTests-location.xml | 4 ++-- .../config/contextNamespaceHandlerTests-override.xml | 6 +++--- .../contextNamespaceHandlerTests-replace-ignore.xml | 6 +++--- .../config/contextNamespaceHandlerTests-replace.xml | 6 +++--- .../config/contextNamespaceHandlerTests-system.xml | 6 +++--- .../context/conversionservice/conversionService.xml | 4 ++-- .../context/event/simple-event-configuration.xml | 4 ++-- .../resources/org/springframework/context/groovy/test.xml | 2 +- .../ClassPathXmlApplicationContextTests-resource.xml | 2 +- ...ClassPathXmlApplicationContextTests-resourceImport.xml | 2 +- .../support/GenericXmlApplicationContextTests-context.xml | 2 +- .../springframework/context/support/aliasForParent.xml | 2 +- .../context/support/aliasThatOverridesParent.xml | 2 +- .../springframework/context/support/childWithProxy.xml | 2 +- .../context/support/classWithPlaceholder.xml | 2 +- .../springframework/context/support/conversionService.xml | 2 +- .../support/conversionServiceWithResourceOverriding.xml | 2 +- .../org/springframework/context/support/invalidClass.xml | 2 +- .../springframework/context/support/invalidValueType.xml | 2 +- .../springframework/context/support/lifecycleTests.xml | 2 +- .../org/springframework/context/support/simpleContext.xml | 2 +- .../context/support/simpleThreadScopeTests.xml | 2 +- .../org/springframework/context/support/spr7283.xml | 4 ++-- .../org/springframework/context/support/spr7816.xml | 2 +- .../context/support/test/aliased-contextC.xml | 4 ++-- .../org/springframework/context/support/test/contextA.xml | 4 ++-- .../org/springframework/context/support/test/contextB.xml | 2 +- .../org/springframework/context/support/test/contextC.xml | 4 ++-- .../org/springframework/context/support/test/import1.xml | 2 +- .../context/support/test/subtest/import2.xml | 2 +- .../ejb/config/jeeNamespaceHandlerTests.xml | 6 +++--- .../org/springframework/jmx/applicationContext.xml | 2 +- .../springframework/jmx/export/annotation/annotations.xml | 2 +- .../jmx/export/annotation/componentScan.xml | 4 ++-- .../jmx/export/annotation/lazyAssembling.xml | 4 ++-- .../springframework/jmx/export/annotation/lazyNaming.xml | 4 ++-- .../jmx/export/assembler/interfaceAssembler.xml | 2 +- .../jmx/export/assembler/interfaceAssemblerCustom.xml | 2 +- .../jmx/export/assembler/interfaceAssemblerMapped.xml | 2 +- .../jmx/export/assembler/metadata-autodetect.xml | 2 +- .../jmx/export/assembler/metadataAssembler.xml | 2 +- .../jmx/export/assembler/methodExclusionAssembler.xml | 2 +- .../export/assembler/methodExclusionAssemblerCombo.xml | 2 +- .../export/assembler/methodExclusionAssemblerMapped.xml | 2 +- .../assembler/methodExclusionAssemblerNotMapped.xml | 2 +- .../jmx/export/assembler/methodNameAssembler.xml | 2 +- .../jmx/export/assembler/methodNameAssemblerMapped.xml | 2 +- .../jmx/export/assembler/reflectiveAssembler.xml | 2 +- .../springframework/jmx/export/autodetectLazyMBeans.xml | 2 +- .../org/springframework/jmx/export/autodetectMBeans.xml | 2 +- .../org/springframework/jmx/export/autodetectNoMBeans.xml | 2 +- .../org/springframework/jmx/export/customConfigurer.xml | 2 +- .../org/springframework/jmx/export/excludedBeans.xml | 2 +- .../resources/org/springframework/jmx/export/lazyInit.xml | 2 +- .../jmx/export/notificationPublisherLazyTests.xml | 2 +- .../jmx/export/notificationPublisherTests.xml | 2 +- .../jmx/export/propertyPlaceholderConfigurer.xml | 2 +- .../scheduling/annotation/taskNamespaceTests.xml | 4 ++-- .../scheduling/config/annotationDrivenContext.xml | 4 ++-- .../springframework/scheduling/config/executorContext.xml | 8 ++++---- .../scheduling/config/lazyScheduledTasksContext.xml | 4 ++-- .../scheduling/config/scheduledTasksContext.xml | 4 ++-- .../scheduling/config/schedulerContext.xml | 4 ++-- .../org/springframework/scripting/bsh/bsh-with-xsd.xml | 4 ++-- .../springframework/scripting/bsh/bshBrokenContext.xml | 2 +- .../org/springframework/scripting/bsh/bshContext.xml | 2 +- .../scripting/bsh/bshRefreshableContext.xml | 2 +- .../config/scriptingDefaultsProxyTargetClassTests.xml | 4 ++-- .../scripting/config/scriptingDefaultsTests.xml | 4 ++-- ...roovyAspectIntegrationTests-groovy-dynamic-context.xml | 6 +++--- ...ovyAspectIntegrationTests-groovy-interface-context.xml | 6 +++--- ...IntegrationTests-groovy-proxy-target-class-context.xml | 6 +++--- .../groovy/GroovyAspectIntegrationTests-java-context.xml | 4 ++-- .../scripting/groovy/calculators-with-xsd.xml | 4 ++-- .../org/springframework/scripting/groovy/calculators.xml | 2 +- .../scripting/groovy/groovy-multiple-properties.xml | 4 ++-- .../scripting/groovy/groovy-with-xsd-jsr223.xml | 4 ++-- .../groovy/groovy-with-xsd-proxy-target-class.xml | 4 ++-- .../springframework/scripting/groovy/groovy-with-xsd.xml | 6 +++--- .../scripting/groovy/groovyBrokenContext.xml | 2 +- .../springframework/scripting/groovy/groovyContext.xml | 4 ++-- .../scripting/groovy/groovyContextWithJsr223.xml | 2 +- .../scripting/groovy/groovyRefreshableContext.xml | 2 +- .../scripting/groovy/lwspBadGroovyContext.xml | 2 +- .../scripting/groovy/twoClassesCorrectOneFirst.xml | 2 +- .../scripting/groovy/twoClassesWrongOneFirst.xml | 2 +- .../scripting/support/groovyReferences.xml | 2 +- .../springframework/scripting/support/jsr223-with-xsd.xml | 4 ++-- .../org/springframework/jdbc/support/sql-error-codes.xml | 4 ++-- .../jdbc/config/jdbc-config-custom-separator.xml | 4 ++-- ...bc-config-db-name-default-and-anonymous-datasource.xml | 4 ++-- .../jdbc/config/jdbc-config-db-name-explicit.xml | 4 ++-- .../jdbc/config/jdbc-config-db-name-generated.xml | 4 ++-- .../jdbc/config/jdbc-config-db-name-implicit.xml | 4 ++-- .../jdbc/config/jdbc-config-multiple-datasources.xml | 4 ++-- .../springframework/jdbc/config/jdbc-config-pattern.xml | 4 ++-- .../org/springframework/jdbc/config/jdbc-config.xml | 4 ++-- .../springframework/jdbc/config/jdbc-destroy-config.xml | 4 ++-- .../jdbc/config/jdbc-destroy-nested-config-h2.xml | 4 ++-- .../jdbc/config/jdbc-destroy-nested-config.xml | 4 ++-- .../jdbc/config/jdbc-initialize-cache-config.xml | 4 ++-- .../jdbc/config/jdbc-initialize-config.xml | 4 ++-- .../jdbc/config/jdbc-initialize-custom-separator.xml | 4 ++-- .../jdbc/config/jdbc-initialize-endings-config.xml | 4 ++-- .../jdbc/config/jdbc-initialize-endings-nested-config.xml | 4 ++-- .../jdbc/config/jdbc-initialize-expression-config.xml | 6 +++--- .../jdbc/config/jdbc-initialize-fail-config.xml | 4 ++-- .../jdbc/config/jdbc-initialize-pattern-config.xml | 4 ++-- .../jdbc/config/jdbc-initialize-placeholder-config.xml | 4 ++-- .../jdbc/object/GenericSqlQueryTests-context.xml | 4 ++-- .../jdbc/object/GenericStoredProcedureTests-context.xml | 4 ++-- .../springframework/jdbc/support/custom-error-codes.xml | 2 +- .../jdbc/support/test-custom-translators-context.xml | 4 ++-- .../org/springframework/jdbc/support/test-error-codes.xml | 2 +- .../springframework/jdbc/support/wildcard-error-codes.xml | 2 +- .../annotation-driven-custom-container-factory.xml | 4 ++-- .../annotation-driven-custom-handler-method-factory.xml | 4 ++-- .../jms/annotation/annotation-driven-custom-registry.xml | 4 ++-- .../annotation-driven-default-container-factory.xml | 4 ++-- .../jms/annotation/annotation-driven-full-config.xml | 4 ++-- .../annotation-driven-full-configurable-config.xml | 6 +++--- .../annotation-driven-jms-listener-repeatable.xml | 4 ++-- .../jms/annotation/annotation-driven-jms-listeners.xml | 4 ++-- .../jms/annotation/annotation-driven-sample-config.xml | 4 ++-- .../jms/config/jmsNamespaceHandlerTests.xml | 4 ++-- .../orm/jpa/domain/persistence-context.xml | 2 +- .../springframework/orm/jpa/domain/persistence-multi.xml | 2 +- .../org/springframework/orm/jpa/domain/persistence.xml | 2 +- .../orm/jpa/eclipselink/eclipselink-manager.xml | 2 +- .../orm/jpa/hibernate/hibernate-manager-multi.xml | 4 ++-- .../orm/jpa/hibernate/hibernate-manager-native.xml | 2 +- .../orm/jpa/hibernate/hibernate-manager.xml | 2 +- .../inject-hibernate-spring-bean-container-tests.xml | 4 ++-- .../test/resources/org/springframework/orm/jpa/inject.xml | 4 ++-- .../test/resources/org/springframework/orm/jpa/memdb.xml | 2 +- .../org/springframework/orm/jpa/multi-jpa-emf.xml | 2 +- .../org/springframework/orm/jpa/persistence-complex.xml | 2 +- .../org/springframework/orm/jpa/persistence-example1.xml | 2 +- .../org/springframework/orm/jpa/persistence-example2.xml | 2 +- .../org/springframework/orm/jpa/persistence-example3.xml | 2 +- .../org/springframework/orm/jpa/persistence-example4.xml | 2 +- .../org/springframework/orm/jpa/persistence-example5.xml | 2 +- .../org/springframework/orm/jpa/persistence-example6.xml | 2 +- .../springframework/orm/jpa/persistence-exclude-1.0.xml | 2 +- .../springframework/orm/jpa/persistence-exclude-2.0.xml | 2 +- .../org/springframework/orm/jpa/persistence-invalid.xml | 2 +- .../resources/org/springframework/oxm/castor/mapping.xml | 2 +- .../oxm/config/oxmNamespaceHandlerTest.xml | 4 ++-- .../META-INF/web-resources/WEB-INF/layouts/tiles.xml | 2 +- .../META-INF/web-resources/WEB-INF/views/tiles.xml | 2 +- .../context/expression/ExpressionUsageTests-context.xml | 2 +- ...ctionXmlSupersedesGroovySpringContextTests-context.xml | 2 +- .../org/springframework/test/context/groovy/contextB.xml | 2 +- ...ntextHierarchyAndMixedConfigTypesTests-ChildConfig.xml | 2 +- ...elContextHierarchyAndMixedConfigTypesTests-context.xml | 2 +- .../web/DispatcherWacRootWacEarTests-context.xml | 2 +- ...creteTransactionalJUnit4SpringContextTests-context.xml | 4 ++-- .../junit4/FailingBeforeAndAfterMethodsTests-context.xml | 4 ++-- ...sourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml | 2 +- ...sourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml | 2 +- ...sourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml | 2 +- .../ParameterizedDependencyInjectionTests-context.xml | 2 +- .../junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml | 2 +- .../xml/MultipleInitializersXmlConfigTests-context.xml | 2 +- .../junit4/hybrid/HybridContextLoaderTests-context.xml | 2 +- .../junit4/orm/HibernateSessionFlushingTests-context.xml | 8 ++++---- .../test/context/junit4/orm/domain/DriversLicense.hbm.xml | 2 +- .../test/context/junit4/orm/domain/Person.hbm.xml | 2 +- .../test/context/junit4/profile/importresource/import.xml | 2 +- .../profile/xml/DefaultProfileXmlConfigTests-context.xml | 2 +- ...anOverridingDefaultLocationsInheritedTests-context.xml | 2 +- .../junit4/spr3896/DefaultLocationsBaseTests-context.xml | 2 +- .../spr3896/DefaultLocationsInheritedTests-context.xml | 2 +- .../junit4/spr6128/AutowiredQualifierTests-context.xml | 2 +- .../datasource-config-with-auto-generated-db-name.xml | 4 ++-- .../test/context/junit4/spr8849/datasource-config.xml | 4 ++-- .../junit4/spr9799/Spr9799XmlConfigTests-context.xml | 4 ++-- .../test/context/junit4/transactionalTests-context.xml | 4 ++-- ...extConfigurationUtilsTests$BareAnnotations-context.xml | 2 +- .../CustomizedGenericXmlContextLoaderTests-context.xml | 2 +- ...rDuplicateDefaultXmlAndConfigClassTestCase-context.xml | 2 +- ...egatingSmartContextLoaderTests$XmlTestCase-context.xml | 2 +- ...1ClasspathExistentDefaultLocationsTestCase-context.xml | 2 +- ...creteTransactionalTestNGSpringContextTests-context.xml | 4 ++-- ...ntextTransactionalTestNGSpringContextTests-context.xml | 4 ++-- .../testng/FailingBeforeAndAfterMethodsTests-context.xml | 4 ++-- ...TimedTransactionalTestNGSpringContextTests-context.xml | 4 ++-- .../context/testng/transaction/ejb/testng-package.xml | 2 +- .../testng/transaction/ejb/testng-test-separate.xml | 2 +- .../testng/transaction/ejb/testng-test-together.xml | 2 +- .../test/context/transaction/ejb/common-config.xml | 8 ++++---- .../test/context/transaction/ejb/required-tx-config.xml | 2 +- .../context/transaction/ejb/requires-new-tx-config.xml | 2 +- .../test/context/web/BasicXmlWacTests-context.xml | 2 +- .../web/RequestAndSessionScopedBeansWacTests-context.xml | 2 +- .../test/web/servlet/samples/context/root-context.xml | 2 +- .../test/web/servlet/samples/context/servlet-context.xml | 4 ++-- spring-test/src/test/webapp/WEB-INF/layouts/tiles.xml | 2 +- spring-test/src/test/webapp/WEB-INF/views/tiles.xml | 2 +- .../main/resources/org/springframework/jca/context/ra.xml | 2 +- .../annotationTransactionNamespaceHandlerTests.xml | 6 +++--- .../config/annotationDrivenConfigurationClassTests.xml | 8 ++++---- .../config/annotationDrivenProxyTargetClassTests.xml | 2 +- .../interceptor/noTransactionAttributeSource.xml | 2 +- .../transaction/interceptor/transactionalBeanFactory.xml | 2 +- .../transaction/txNamespaceHandlerTests.xml | 6 +++--- spring-web/src/main/resources/META-INF/web-fragment.xml | 2 +- .../org/springframework/http/converter/feed/atom.xml | 2 +- .../org/springframework/http/converter/feed/rss.xml | 2 +- .../web/context/request/requestScopeTests.xml | 2 +- .../web/context/request/requestScopedProxyTests.xml | 4 ++-- .../web/context/request/sessionScopeTests.xml | 2 +- .../org/springframework/web/reactive/handler/map.xml | 2 +- .../context/WEB-INF/ContextLoaderTests-acc-context.xml | 2 +- .../web/context/WEB-INF/applicationContext.xml | 2 +- .../web/context/WEB-INF/context-addition.xml | 2 +- .../springframework/web/context/WEB-INF/empty-context.xml | 2 +- .../springframework/web/context/WEB-INF/empty-servlet.xml | 2 +- .../org/springframework/web/context/WEB-INF/fail.xml | 2 +- .../web/context/WEB-INF/resources/messageSource.xml | 2 +- .../web/context/WEB-INF/resources/themeSource.xml | 2 +- .../web/context/WEB-INF/sessionContext.xml | 2 +- .../springframework/web/context/WEB-INF/test-servlet.xml | 2 +- .../springframework/web/context/WEB-INF/testNamespace.xml | 2 +- .../resources/org/springframework/web/context/beans1.xml | 2 +- .../resources/org/springframework/web/context/ref1.xml | 2 +- .../web/servlet/config/annotation/WEB-INF/tiles.xml | 2 +- .../web/servlet/config/mvc-config-argument-resolvers.xml | 4 ++-- .../web/servlet/config/mvc-config-async-support.xml | 4 ++-- .../web/servlet/config/mvc-config-bean-decoration.xml | 4 ++-- .../config/mvc-config-content-negotiation-manager.xml | 4 ++-- .../web/servlet/config/mvc-config-cors-minimal.xml | 4 ++-- .../web/servlet/config/mvc-config-cors.xml | 8 ++++---- .../config/mvc-config-custom-conversion-service.xml | 4 ++-- .../web/servlet/config/mvc-config-custom-validator.xml | 4 ++-- .../config/mvc-config-default-servlet-optional-attrs.xml | 4 ++-- .../web/servlet/config/mvc-config-default-servlet.xml | 4 ++-- .../web/servlet/config/mvc-config-interceptors.xml | 4 ++-- .../servlet/config/mvc-config-message-codes-resolver.xml | 4 ++-- .../config/mvc-config-message-converters-defaults-off.xml | 4 ++-- .../web/servlet/config/mvc-config-message-converters.xml | 4 ++-- .../servlet/config/mvc-config-path-matching-mappings.xml | 4 ++-- .../web/servlet/config/mvc-config-path-matching.xml | 4 ++-- .../servlet/config/mvc-config-resources-chain-no-auto.xml | 4 ++-- .../web/servlet/config/mvc-config-resources-chain.xml | 4 ++-- .../config/mvc-config-resources-optional-attrs.xml | 4 ++-- .../web/servlet/config/mvc-config-resources.xml | 4 ++-- .../servlet/config/mvc-config-return-value-handlers.xml | 4 ++-- .../config/mvc-config-view-controllers-minimal.xml | 4 ++-- .../web/servlet/config/mvc-config-view-controllers.xml | 4 ++-- .../mvc-config-view-resolution-content-negotiation.xml | 4 ++-- .../config/mvc-config-view-resolution-custom-order.xml | 4 ++-- .../web/servlet/config/mvc-config-view-resolution.xml | 4 ++-- .../org/springframework/web/servlet/config/mvc-config.xml | 4 ++-- .../org/springframework/web/servlet/handler/map1.xml | 2 +- .../org/springframework/web/servlet/handler/map2.xml | 2 +- .../org/springframework/web/servlet/handler/map2err.xml | 2 +- .../org/springframework/web/servlet/handler/map3.xml | 2 +- .../springframework/web/servlet/resource/tiles/tiles1.xml | 2 +- .../springframework/web/servlet/resource/tiles/tiles2.xml | 2 +- .../web/servlet/view/tiles3/tiles-definitions.xml | 2 +- .../org/springframework/web/servlet/view/views.xml | 2 +- .../websocket-config-broker-converters-defaults-off.xml | 4 ++-- .../socket/config/websocket-config-broker-converters.xml | 4 ++-- ...nfig-broker-custom-argument-and-return-value-types.xml | 4 ++-- ...cket-config-broker-customchannels-default-executor.xml | 4 ++-- .../config/websocket-config-broker-customchannels.xml | 4 ++-- .../web/socket/config/websocket-config-broker-relay.xml | 4 ++-- .../web/socket/config/websocket-config-broker-simple.xml | 8 ++++---- .../config/websocket-config-handlers-attributes.xml | 6 +++--- .../websocket-config-handlers-sockjs-attributes.xml | 6 +++--- .../socket/config/websocket-config-handlers-sockjs.xml | 4 ++-- .../web/socket/config/websocket-config-handlers.xml | 4 ++-- src/docs/asciidoc/images/ejb.svg | 2 +- src/docs/asciidoc/images/full.svg | 2 +- src/docs/asciidoc/images/mvc-context-hierarchy.svg | 4 ++-- src/docs/asciidoc/images/mvc-root-context.svg | 4 ++-- src/docs/asciidoc/images/remoting.svg | 2 +- src/docs/asciidoc/images/spring-overview.svg | 2 +- src/docs/asciidoc/images/thirdparty-web.svg | 2 +- src/test/resources/com/foo/component-config.xml | 2 +- .../AopNamespaceHandlerScopeIntegrationTests-context.xml | 4 ++-- .../AdvisorAutoProxyCreatorIntegrationTests-context.xml | 2 +- .../annotation/ltw/ComponentScanningWithLTWTests.xml | 4 ++-- .../env/EnvironmentSystemIntegrationTests-context-dev.xml | 2 +- .../EnvironmentSystemIntegrationTests-context-prod.xml | 2 +- .../env/EnvironmentSystemIntegrationTests-context.xml | 2 +- .../transaction/annotation/enable-caching.xml | 4 ++-- 572 files changed, 863 insertions(+), 863 deletions(-) diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml index 984f5ada7b8..48da214eb4d 100644 --- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml +++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-context.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml index 42291802335..852f7479377 100644 --- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml +++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-directPointcutEvents.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml index 8350030c171..ed04cb45e09 100644 --- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml +++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutEvents.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml index 23e4a88b3fc..8300b280512 100644 --- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml +++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerEventTests-pointcutRefEvents.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml index cd01ffd5326..1162d714f32 100644 --- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml +++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutDuplication.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml index 850fbc15d1b..b47670e08d3 100644 --- a/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml +++ b/spring-aop/src/test/resources/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests-pointcutMissing.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-aop/src/test/resources/org/springframework/aop/config/TopLevelAopTagTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/config/TopLevelAopTagTests-context.xml index f1fff08fa4a..4a1cd95aa13 100644 --- a/spring-aop/src/test/resources/org/springframework/aop/config/TopLevelAopTagTests-context.xml +++ b/spring-aop/src/test/resources/org/springframework/aop/config/TopLevelAopTagTests-context.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-aop/src/test/resources/org/springframework/aop/framework/PrototypeTargetTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/framework/PrototypeTargetTests-context.xml index 21d1eedb408..89b8d261d4f 100644 --- a/spring-aop/src/test/resources/org/springframework/aop/framework/PrototypeTargetTests-context.xml +++ b/spring-aop/src/test/resources/org/springframework/aop/framework/PrototypeTargetTests-context.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-aop/src/test/resources/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml b/spring-aop/src/test/resources/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml index 5f00163fb55..1bfd0c2814b 100644 --- a/spring-aop/src/test/resources/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml +++ b/spring-aop/src/test/resources/org/springframework/aop/interceptor/ExposeInvocationInterceptorTests-context.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/support/security/callbacks.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/support/security/callbacks.xml index 36a8aeaebfc..1df2d27b485 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/support/security/callbacks.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/support/security/callbacks.xml @@ -2,7 +2,7 @@ diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml index 8e53cee2934..f5f975bf7b5 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/DuplicateBeanIdTests-multiLevel-context.xml @@ -2,7 +2,7 @@ + https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"> diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml index 12a2fb08602..7bd11a98717 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/DuplicateBeanIdTests-sameLevel-context.xml @@ -2,7 +2,7 @@ + https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"> diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-candidates-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-candidates-context.xml index d6be7a4426f..2749cd23384 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-candidates-context.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-candidates-context.xml @@ -2,7 +2,7 @@ diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-context.xml index 49e415572c8..632d0356cef 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-context.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-autowire-context.xml @@ -2,7 +2,7 @@ + https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"> diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-init-destroy-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-init-destroy-context.xml index 90c5495d7c6..bc030754df7 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-init-destroy-context.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-init-destroy-context.xml @@ -2,7 +2,7 @@ diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-lazy-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-lazy-context.xml index 3c3df4abf08..78601ebf4bb 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-lazy-context.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-lazy-context.xml @@ -2,7 +2,7 @@ + https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"> diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml index 2edadb511eb..55a5cf04e7f 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementAttributeRecursionTests-merge-context.xml @@ -2,7 +2,7 @@ diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementTests-context.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementTests-context.xml index 5500aeedaee..8a44f25d797 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementTests-context.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/NestedBeansElementTests-context.xml @@ -2,7 +2,7 @@ + https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"> diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-customDefaultProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-customDefaultProfile.xml index fbd09ae0fc8..74c2c2ff949 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-customDefaultProfile.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-customDefaultProfile.xml @@ -2,7 +2,7 @@ + https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"> diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultAndDevProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultAndDevProfile.xml index 5fbc741ec85..fcb24a4fdab 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultAndDevProfile.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultAndDevProfile.xml @@ -2,7 +2,7 @@ diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultProfile.xml index a7d425abf1b..ca8cbf4c803 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultProfile.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-defaultProfile.xml @@ -2,7 +2,7 @@ + https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"> diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-devProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-devProfile.xml index 8ae82bc8cf6..7f391e8b738 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-devProfile.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-devProfile.xml @@ -2,7 +2,7 @@ diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfile.xml index dac5fb92449..e3a36f29f5b 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfile.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfile.xml @@ -2,7 +2,7 @@ diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfileNegated.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfileNegated.xml index a11d1704311..9c35ae70d86 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfileNegated.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfileNegated.xml @@ -2,7 +2,7 @@ diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfileNotDev.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfileNotDev.xml index b0a246c4a27..f5820c54c07 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfileNotDev.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfileNotDev.xml @@ -2,7 +2,7 @@ diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-noProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-noProfile.xml index 656ea3aceb1..49a8c7abd1e 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-noProfile.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-noProfile.xml @@ -2,7 +2,7 @@ + https://www.springframework.org/schema/beans/spring-beans-3.1.xsd"> diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-notDevProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-notDevProfile.xml index 06ac54a37a8..9d185226237 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-notDevProfile.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-notDevProfile.xml @@ -2,7 +2,7 @@ diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-prodProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-prodProfile.xml index aba52d7066f..879b23caee5 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-prodProfile.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-prodProfile.xml @@ -2,7 +2,7 @@ diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-spaceDelimitedProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-spaceDelimitedProfile.xml index 8bfb9a98138..3d502310275 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-spaceDelimitedProfile.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-spaceDelimitedProfile.xml @@ -2,7 +2,7 @@ diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml index 922ba290485..0b0dbcef6ee 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml @@ -2,7 +2,7 @@ diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml index 2fcb1179545..0b67be5d874 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml index a2e966aab98..37a98d0ce81 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml index 9b93a16810d..b47d4231ce0 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml @@ -1,7 +1,7 @@ diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml index 089517cd427..5df4f9c21dc 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml @@ -1,7 +1,7 @@ diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml index 0b9a97de5b8..9b019ee2ff2 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEventsImported.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEventsImported.xml index bdfc3c4c31e..299c52abef9 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEventsImported.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanEventsImported.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml index 813049d1a59..1f22caddffd 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/beanNameGeneration.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml index d8fc1db88ea..b3a6142b54f 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml index de31737e4fc..0f2fff8c9b9 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collections.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.2.xsd"> Jenny diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml index 8a31ff86962..92d5d3db1db 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml index 7414f870b18..9bd3f136386 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml index 9f339bfd3df..86d94732956 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/factory-methods.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml index a10029da323..25ffd4262bd 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/import.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/import.xml index 278e5dff811..44b1c8f1e9d 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/import.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/import.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/importPattern.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/importPattern.xml index 085a29d85fd..329d25898ea 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/importPattern.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/importPattern.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/invalidPerSchema.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/invalidPerSchema.xml index 430c8adc7e4..6715273a638 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/invalidPerSchema.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/invalidPerSchema.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml index 7802a4c935b..5f22ea3cef4 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml index b2674288878..0c6b70e59ac 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/simpleConstructorNamespaceHandlerTests.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd"> - + diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml index 20aa0f53740..c7e8abe5a55 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml @@ -6,6 +6,6 @@ This is a top level block comment - + \ No newline at end of file diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml index 05c47afa53a..5126d253957 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> diff --git a/spring-context-support/src/test/resources/org/springframework/cache/jcache/config/jCacheNamespaceDriven-resolver.xml b/spring-context-support/src/test/resources/org/springframework/cache/jcache/config/jCacheNamespaceDriven-resolver.xml index 9c3c96360da..4f76dd6fb11 100644 --- a/spring-context-support/src/test/resources/org/springframework/cache/jcache/config/jCacheNamespaceDriven-resolver.xml +++ b/spring-context-support/src/test/resources/org/springframework/cache/jcache/config/jCacheNamespaceDriven-resolver.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cache="http://www.springframework.org/schema/cache" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd + https://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/cache - http://www.springframework.org/schema/cache/spring-cache.xsd"> + https://www.springframework.org/schema/cache/spring-cache.xsd"> diff --git a/spring-context-support/src/test/resources/org/springframework/cache/jcache/config/jCacheNamespaceDriven.xml b/spring-context-support/src/test/resources/org/springframework/cache/jcache/config/jCacheNamespaceDriven.xml index bd2a2edb898..b487b40b2ab 100644 --- a/spring-context-support/src/test/resources/org/springframework/cache/jcache/config/jCacheNamespaceDriven.xml +++ b/spring-context-support/src/test/resources/org/springframework/cache/jcache/config/jCacheNamespaceDriven.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cache="http://www.springframework.org/schema/cache" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd + https://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/cache - http://www.springframework.org/schema/cache/spring-cache.xsd"> + https://www.springframework.org/schema/cache/spring-cache.xsd"> diff --git a/spring-context-support/src/test/resources/org/springframework/cache/jcache/config/jCacheStandaloneConfig.xml b/spring-context-support/src/test/resources/org/springframework/cache/jcache/config/jCacheStandaloneConfig.xml index 467604f4ae9..428ea099ae3 100644 --- a/spring-context-support/src/test/resources/org/springframework/cache/jcache/config/jCacheStandaloneConfig.xml +++ b/spring-context-support/src/test/resources/org/springframework/cache/jcache/config/jCacheStandaloneConfig.xml @@ -2,7 +2,7 @@ + https://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/databasePersistence.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/databasePersistence.xml index 8d72191ad62..9b7b97c07c3 100644 --- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/databasePersistence.xml +++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/databasePersistence.xml @@ -1,8 +1,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc.xsd + http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/job-scheduling-data.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/job-scheduling-data.xml index 6b98c0d7d22..b437445431f 100644 --- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/job-scheduling-data.xml +++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/job-scheduling-data.xml @@ -1,7 +1,7 @@ diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml index bbe23b83ddd..e45ccd195fe 100644 --- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml +++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleSchedulers.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleSchedulers.xml index 02d8f3668b6..df9af20cd54 100644 --- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleSchedulers.xml +++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleSchedulers.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleSchedulersWithQuartzProperties.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleSchedulersWithQuartzProperties.xml index d1b83b17ed2..e00dc29ab43 100644 --- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleSchedulersWithQuartzProperties.xml +++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleSchedulersWithQuartzProperties.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartzSchedulerLifecycleTests.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartzSchedulerLifecycleTests.xml index fe15a1bb1dd..7e7dfb14abb 100644 --- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartzSchedulerLifecycleTests.xml +++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartzSchedulerLifecycleTests.xml @@ -2,7 +2,7 @@ + https://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml index 17f789e2e3c..0ba9c4a57a8 100644 --- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml +++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerRepositoryExposure.xml b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerRepositoryExposure.xml index b805ac5f0ec..97952cd8a77 100644 --- a/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerRepositoryExposure.xml +++ b/spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerRepositoryExposure.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml index 66d0e85228a..a3616c2df33 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterAdviceBindingTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml index 97c02b34523..214013f01af 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterReturningAdviceBindingTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml index f15aa06df7d..ad8a252f2b8 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/AfterThrowingAdviceBindingTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml index 2198e32f49c..20a1703e869 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/AroundAdviceBindingTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml index e00fa847a7d..8ba7742ffa8 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/AroundAdviceCircularTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml index 2f92db86317..bb299a67b4b 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/AspectAndAdvicePrecedenceTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml index 9ec75d75aab..2c97c864362 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/AspectJExpressionPointcutAdvisorTests.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml index b446755d57b..4d6537107f7 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutAtAspectTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutTests.xml index 4a4823b464e..0e653ebde60 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/BeanNamePointcutTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml index 4aac362c73e..626fa5d4d16 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/BeforeAdviceBindingTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml index 7ecb079c464..1f60985ab5d 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclarationOrderIndependenceTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml index ad56c861a20..52bc4821291 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsDelegateRefTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsTests.xml index fc449b6943c..c4c2e40b1a7 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/DeclareParentsTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml index eabf2568c1d..8c88ac24548 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingAtAspectJTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml index e4cf459ab63..32c1882cd45 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml index 5a245d3a9c7..b23236c90c2 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests-ambiguous.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests.xml index 3db07d1e43c..9cc3ab152da 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/OverloadedAdviceTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/ProceedTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/ProceedTests.xml index 8bb019245ea..c2a5a18d81b 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/ProceedTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/ProceedTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml index d55ed2d65e5..15ec58154d8 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-after.xml @@ -3,8 +3,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml index 0ec75f57379..d8d1e4dc234 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-after.xml @@ -3,8 +3,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml index 6eccaebfab4..6db71439a5e 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-atAspectJ-before.xml @@ -3,8 +3,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml index 89b5be547cd..9628565d7f7 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/PropertyDependentAspectTests-before.xml @@ -3,8 +3,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml index e062899f36b..af301fd0fd1 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/SharedPointcutWithArgsMismatchTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml index e51fbb65a19..809f1cf0e92 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/SubtypeSensitiveMatchingTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml index 1e57557518f..5d488c328f6 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/TargetPointcutSelectionTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml index f8fb56b145a..fd6e9bd335e 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsAtAspectJTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml index 1624fdfb172..7f6122606f3 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/ThisAndTargetSelectionOnlyPointcutsTests.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml index 7e1b50d1186..c943b18eb55 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AnnotationBindingTests-context.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml index f19b17b355c..2eb828e4620 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AnnotationPointcutTests-context.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml index 2991eef3809..dd92fa2bb0f 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectImplementingInterfaceTests-context.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml index a006c6fc341..66b46a8b34f 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorAndLazyInitTargetSourceTests-context.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml index b96cfef03fd..7f371a008c0 100644 --- a/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml +++ b/spring-context/src/test/resources/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests-aspects.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-2.0.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml index 854490f192b..68c29936fee 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-noSuchFactoryMethod.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml index 114c4e54029..6e61f9bcaa1 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-overrides.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml index f575bcb44a9..8903bb169d6 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-parent.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml index 4170370aa17..cb73bab1675 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-recursiveImport.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml index 31fa7a16bab..92e233b5328 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-resourceImport.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml index 393028d4f1f..7cf4c96afb0 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNameInAlias.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml index 90de5444371..45463198c7c 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/XmlBeanFactoryTests-testWithDuplicateNames.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml index 3982b48c7cf..5af5cddf68b 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/simplePropertyNamespaceHandlerWithExpressionLanguageTests.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml b/spring-context/src/test/resources/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml index 17c9c7e8f5b..46f6111b934 100644 --- a/spring-context/src/test/resources/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml +++ b/spring-context/src/test/resources/org/springframework/beans/factory/xml/support/CustomNamespaceHandlerTests-context.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:test="http://www.springframework.org/schema/beans/test" xmlns:util="http://www.springframework.org/schema/util" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd - http://www.springframework.org/schema/beans/test http://www.springframework.org/schema/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd" + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-2.0.xsd + http://www.springframework.org/schema/beans/test https://www.springframework.org/schema/beans/factory/xml/support/CustomNamespaceHandlerTests.xsd" default-lazy-init="true"> diff --git a/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml index abb8cf73d23..3df5e41c231 100644 --- a/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml +++ b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace-manager-resolver.xml b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace-manager-resolver.xml index 66f53e6b97b..4043efb0879 100644 --- a/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace-manager-resolver.xml +++ b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace-manager-resolver.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/cache https://www.springframework.org/schema/cache/spring-cache.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace-resolver.xml b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace-resolver.xml index 6ae36d7af50..1b9baab8392 100644 --- a/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace-resolver.xml +++ b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace-resolver.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/cache https://www.springframework.org/schema/cache/spring-cache.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml index 98ca6bb466e..6e52ae6f704 100644 --- a/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml +++ b/spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml @@ -3,9 +3,9 @@ xmlns:aop="http://www.springframework.org/schema/aop" xmlns:cache="http://www.springframework.org/schema/cache" xmlns:p="http://www.springframework.org/schema/p" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd + http://www.springframework.org/schema/cache https://www.springframework.org/schema/cache/spring-cache.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/cache/config/cache-advice-invalid.xml b/spring-context/src/test/resources/org/springframework/cache/config/cache-advice-invalid.xml index b4362503b43..06d6eb967ff 100644 --- a/spring-context/src/test/resources/org/springframework/cache/config/cache-advice-invalid.xml +++ b/spring-context/src/test/resources/org/springframework/cache/config/cache-advice-invalid.xml @@ -1,8 +1,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/cache https://www.springframework.org/schema/cache/spring-cache.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/cache/config/cache-advice.xml b/spring-context/src/test/resources/org/springframework/cache/config/cache-advice.xml index e108bb0f908..fa9af8d6375 100644 --- a/spring-context/src/test/resources/org/springframework/cache/config/cache-advice.xml +++ b/spring-context/src/test/resources/org/springframework/cache/config/cache-advice.xml @@ -3,9 +3,9 @@ xmlns:aop="http://www.springframework.org/schema/aop" xmlns:cache="http://www.springframework.org/schema/cache" xmlns:p="http://www.springframework.org/schema/p" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd - http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd + http://www.springframework.org/schema/cache https://www.springframework.org/schema/cache/spring-cache.xsd"> diff --git a/spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml b/spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml index 7354bff0ca2..28563204976 100644 --- a/spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml +++ b/spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-collections.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> Jenny diff --git a/spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml b/spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml index 99d732a1642..da5e835b8d2 100644 --- a/spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml +++ b/spring-context/src/test/resources/org/springframework/context/access/ContextJndiBeanFactoryLocatorTests-parent.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml b/spring-context/src/test/resources/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml index 4f4ec8d5923..d203ea369f4 100644 --- a/spring-context/src/test/resources/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml +++ b/spring-context/src/test/resources/org/springframework/context/access/ContextSingletonBeanFactoryLocatorTests-context.xml @@ -1,5 +1,5 @@ - + + diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-custom-separator.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-custom-separator.xml index 7f9479e3f46..de3b95a6cac 100644 --- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-custom-separator.xml +++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-custom-separator.xml @@ -2,8 +2,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-4.3.xsd"> diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-default-and-anonymous-datasource.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-default-and-anonymous-datasource.xml index f27d19a89cf..06f7c122bc5 100644 --- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-default-and-anonymous-datasource.xml +++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-default-and-anonymous-datasource.xml @@ -1,8 +1,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd"> diff --git a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-explicit.xml b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-explicit.xml index fbdfeecb387..e378d39625c 100644 --- a/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-explicit.xml +++ b/spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-config-db-name-explicit.xml @@ -1,8 +1,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc-4.2.xsd">