diff --git a/acl/pom.xml b/acl/pom.xml index 61b1ae5c44..3d9d787db0 100644 --- a/acl/pom.xml +++ b/acl/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-acl diff --git a/acl/src/test/resources/jdbcMutableAclServiceTests-context.xml b/acl/src/test/resources/jdbcMutableAclServiceTests-context.xml index 4c1802536a..9234847bd8 100644 --- a/acl/src/test/resources/jdbcMutableAclServiceTests-context.xml +++ b/acl/src/test/resources/jdbcMutableAclServiceTests-context.xml @@ -1,5 +1,5 @@ - + diff --git a/etc/checkstyle/suppressions.xml b/etc/checkstyle/suppressions.xml index a7d3052a83..297f0624c9 100644 --- a/etc/checkstyle/suppressions.xml +++ b/etc/checkstyle/suppressions.xml @@ -1,6 +1,6 @@ + "https://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> diff --git a/itest/context/pom.xml b/itest/context/pom.xml index c20b562628..6d78bae8c9 100644 --- a/itest/context/pom.xml +++ b/itest/context/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 org.springframework.security itest-context diff --git a/itest/context/src/integration-test/resources/filter-chain-performance-app-context.xml b/itest/context/src/integration-test/resources/filter-chain-performance-app-context.xml index eadd0dbaa3..7b6ac0c656 100644 --- a/itest/context/src/integration-test/resources/filter-chain-performance-app-context.xml +++ b/itest/context/src/integration-test/resources/filter-chain-performance-app-context.xml @@ -7,8 +7,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/context/src/integration-test/resources/http-extra-fsi-app-context.xml b/itest/context/src/integration-test/resources/http-extra-fsi-app-context.xml index 3c6225451c..2481baeeb9 100644 --- a/itest/context/src/integration-test/resources/http-extra-fsi-app-context.xml +++ b/itest/context/src/integration-test/resources/http-extra-fsi-app-context.xml @@ -7,8 +7,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/context/src/integration-test/resources/http-path-param-stripping-app-context.xml b/itest/context/src/integration-test/resources/http-path-param-stripping-app-context.xml index 123bfdb38d..4c014beeb1 100644 --- a/itest/context/src/integration-test/resources/http-path-param-stripping-app-context.xml +++ b/itest/context/src/integration-test/resources/http-path-param-stripping-app-context.xml @@ -7,8 +7,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/context/src/integration-test/resources/multi-sec-annotation-app-context.xml b/itest/context/src/integration-test/resources/multi-sec-annotation-app-context.xml index 959c1eeb82..5e3b6267da 100644 --- a/itest/context/src/integration-test/resources/multi-sec-annotation-app-context.xml +++ b/itest/context/src/integration-test/resources/multi-sec-annotation-app-context.xml @@ -5,9 +5,9 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> + http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/context/src/integration-test/resources/protect-pointcut-performance-app-context.xml b/itest/context/src/integration-test/resources/protect-pointcut-performance-app-context.xml index cabc71b11b..14f1ee0f15 100644 --- a/itest/context/src/integration-test/resources/protect-pointcut-performance-app-context.xml +++ b/itest/context/src/integration-test/resources/protect-pointcut-performance-app-context.xml @@ -1,8 +1,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/context/src/integration-test/resources/python-method-access-app-context.xml b/itest/context/src/integration-test/resources/python-method-access-app-context.xml index dcacf74279..4972556462 100644 --- a/itest/context/src/integration-test/resources/python-method-access-app-context.xml +++ b/itest/context/src/integration-test/resources/python-method-access-app-context.xml @@ -5,9 +5,9 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> + http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/context/src/integration-test/resources/sec-933-app-context.xml b/itest/context/src/integration-test/resources/sec-933-app-context.xml index ee5b77ca1c..09b1d2ba4a 100755 --- a/itest/context/src/integration-test/resources/sec-933-app-context.xml +++ b/itest/context/src/integration-test/resources/sec-933-app-context.xml @@ -4,10 +4,10 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> + http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-3.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/context/src/integration-test/resources/sec-936-app-context.xml b/itest/context/src/integration-test/resources/sec-936-app-context.xml index 3a2dc0c29a..d76a933713 100755 --- a/itest/context/src/integration-test/resources/sec-936-app-context.xml +++ b/itest/context/src/integration-test/resources/sec-936-app-context.xml @@ -3,9 +3,9 @@ xmlns:util="http://www.springframework.org/schema/util" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd"> + http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/web/pom.xml b/itest/web/pom.xml index 7c68f4d61e..7aeab05310 100644 --- a/itest/web/pom.xml +++ b/itest/web/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 org.springframework.security itest-web diff --git a/itest/web/src/integration-test/resources/spring/http-security-basic.xml b/itest/web/src/integration-test/resources/spring/http-security-basic.xml index 3656a25bbb..fe92897aa2 100644 --- a/itest/web/src/integration-test/resources/spring/http-security-basic.xml +++ b/itest/web/src/integration-test/resources/spring/http-security-basic.xml @@ -3,8 +3,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/web/src/integration-test/resources/spring/http-security-concurrency.xml b/itest/web/src/integration-test/resources/spring/http-security-concurrency.xml index 48181b2f46..853b033ce3 100644 --- a/itest/web/src/integration-test/resources/spring/http-security-concurrency.xml +++ b/itest/web/src/integration-test/resources/spring/http-security-concurrency.xml @@ -3,8 +3,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/itest/web/src/integration-test/resources/spring/http-security.xml b/itest/web/src/integration-test/resources/spring/http-security.xml index 94789db78c..e5b2e475c1 100644 --- a/itest/web/src/integration-test/resources/spring/http-security.xml +++ b/itest/web/src/integration-test/resources/spring/http-security.xml @@ -3,8 +3,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/samples/xml/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml b/samples/xml/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml index 994c28a647..f3f25bd504 100644 --- a/samples/xml/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml +++ b/samples/xml/contacts/src/main/webapp/WEB-INF/remoting-servlet.xml @@ -1,5 +1,5 @@ - + + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> diff --git a/samples/xml/gae/pom.xml b/samples/xml/gae/pom.xml index 5fbbfe2f8c..02b181eb18 100644 --- a/samples/xml/gae/pom.xml +++ b/samples/xml/gae/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-xml-gae diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/xml/gae/src/main/webapp/WEB-INF/applicationContext-security.xml index 14a29ac05f..ce1152becf 100644 --- a/samples/xml/gae/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/samples/xml/gae/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -3,8 +3,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/gae-servlet.xml b/samples/xml/gae/src/main/webapp/WEB-INF/gae-servlet.xml index 34a38b2bcd..352e4e520e 100644 --- a/samples/xml/gae/src/main/webapp/WEB-INF/gae-servlet.xml +++ b/samples/xml/gae/src/main/webapp/WEB-INF/gae-servlet.xml @@ -1,9 +1,9 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.0.xsd + http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd"> diff --git a/samples/xml/gae/src/main/webapp/WEB-INF/web.xml b/samples/xml/gae/src/main/webapp/WEB-INF/web.xml index a907c44705..c123a5fef6 100644 --- a/samples/xml/gae/src/main/webapp/WEB-INF/web.xml +++ b/samples/xml/gae/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ + xmlns:web="https://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee https://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5"> contextConfigLocation diff --git a/samples/xml/helloworld/pom.xml b/samples/xml/helloworld/pom.xml index 484cc5125f..e37cfecb1f 100644 --- a/samples/xml/helloworld/pom.xml +++ b/samples/xml/helloworld/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-xml-helloworld diff --git a/samples/xml/helloworld/src/main/webapp/WEB-INF/spring/security.xml b/samples/xml/helloworld/src/main/webapp/WEB-INF/spring/security.xml index d39e52a2f1..7dfb7b8b50 100644 --- a/samples/xml/helloworld/src/main/webapp/WEB-INF/spring/security.xml +++ b/samples/xml/helloworld/src/main/webapp/WEB-INF/spring/security.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/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/samples/xml/helloworld/src/main/webapp/WEB-INF/web.xml b/samples/xml/helloworld/src/main/webapp/WEB-INF/web.xml index 68563b6eea..5e99e51420 100644 --- a/samples/xml/helloworld/src/main/webapp/WEB-INF/web.xml +++ b/samples/xml/helloworld/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,7 @@ + https://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> diff --git a/samples/xml/openid/src/main/webapp/WEB-INF/web.xml b/samples/xml/openid/src/main/webapp/WEB-INF/web.xml index 0b01e67188..38f1ffc789 100644 --- a/samples/xml/openid/src/main/webapp/WEB-INF/web.xml +++ b/samples/xml/openid/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee https://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> Spring Security OpenID Demo Application diff --git a/samples/xml/pom.xml b/samples/xml/pom.xml index 7a28754702..fd6c6c079a 100644 --- a/samples/xml/pom.xml +++ b/samples/xml/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 org.springframework.security xml diff --git a/samples/xml/preauth/pom.xml b/samples/xml/preauth/pom.xml index e466782e22..ef59960135 100644 --- a/samples/xml/preauth/pom.xml +++ b/samples/xml/preauth/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-xml-preauth diff --git a/samples/xml/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml b/samples/xml/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml index 4698926782..bb7523b5d2 100644 --- a/samples/xml/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml +++ b/samples/xml/preauth/src/main/webapp/WEB-INF/applicationContext-security.xml @@ -8,8 +8,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-4.1.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd"> diff --git a/samples/xml/preauth/src/main/webapp/WEB-INF/web.xml b/samples/xml/preauth/src/main/webapp/WEB-INF/web.xml index cd4173c21d..5bac977c9f 100644 --- a/samples/xml/preauth/src/main/webapp/WEB-INF/web.xml +++ b/samples/xml/preauth/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,7 @@ + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee https://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> Spring Security Preauthentication Demo Application diff --git a/samples/xml/servletapi/pom.xml b/samples/xml/servletapi/pom.xml index c4e6911892..935e4f1759 100644 --- a/samples/xml/servletapi/pom.xml +++ b/samples/xml/servletapi/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-samples-xml-servletapi diff --git a/samples/xml/servletapi/src/main/resources/applicationContext-security.xml b/samples/xml/servletapi/src/main/resources/applicationContext-security.xml index 966594acfb..1ba08564be 100644 --- a/samples/xml/servletapi/src/main/resources/applicationContext-security.xml +++ b/samples/xml/servletapi/src/main/resources/applicationContext-security.xml @@ -4,9 +4,9 @@ xmlns="http://www.springframework.org/schema/security" xmlns:p="http://www.springframework.org/schema/p" xmlns:util="http://www.springframework.org/schema/util" - xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd + http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-3.0.xsd"> diff --git a/samples/xml/servletapi/src/main/webapp/WEB-INF/spring-servlet.xml b/samples/xml/servletapi/src/main/webapp/WEB-INF/spring-servlet.xml index b8b114d6f7..548541298e 100644 --- a/samples/xml/servletapi/src/main/webapp/WEB-INF/spring-servlet.xml +++ b/samples/xml/servletapi/src/main/webapp/WEB-INF/spring-servlet.xml @@ -4,9 +4,9 @@ xmlns:b="http://www.springframework.org/schema/beans" xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/mvc https://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd + http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.2.xsd + http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.2.xsd"> diff --git a/samples/xml/servletapi/src/main/webapp/WEB-INF/web.xml b/samples/xml/servletapi/src/main/webapp/WEB-INF/web.xml index af75e5fc0a..f9baaac4d9 100644 --- a/samples/xml/servletapi/src/main/webapp/WEB-INF/web.xml +++ b/samples/xml/servletapi/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,7 @@ diff --git a/sandbox/heavyduty/src/main/resources/applicationContext-business.xml b/sandbox/heavyduty/src/main/resources/applicationContext-business.xml index 65376beb8f..1e3acd89f0 100755 --- a/sandbox/heavyduty/src/main/resources/applicationContext-business.xml +++ b/sandbox/heavyduty/src/main/resources/applicationContext-business.xml @@ -3,8 +3,8 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd +http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security-2.0.xsd"> diff --git a/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-misc.xml b/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-misc.xml index 506f314d55..b17f3d873f 100755 --- a/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-misc.xml +++ b/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-misc.xml @@ -10,9 +10,9 @@ xmlns:sec="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security-2.0.xsd + http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-2.5.xsd"> diff --git a/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-persistence.xml b/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-persistence.xml index 8b82eb9c20..2a0c081ce0 100755 --- a/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-persistence.xml +++ b/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-persistence.xml @@ -7,12 +7,12 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd - http://www.springframework.org/schema/config http://www.springframework.org/schema/config/spring-config-2.5.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> + http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.0.xsd + http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx-3.0.xsd + http://www.springframework.org/schema/config https://www.springframework.org/schema/config/spring-config-2.5.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security-2.0.xsd + http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.0.xsd"> diff --git a/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-security.xml b/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-security.xml index e78dad3351..a94ab0c2d9 100755 --- a/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-security.xml +++ b/sandbox/heavyduty/src/main/webapp/WEB-INF/appContext-security.xml @@ -10,10 +10,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop-3.0.xsd + http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.0.xsd + http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security-3.0.xsd"> diff --git a/sandbox/heavyduty/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml b/sandbox/heavyduty/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml index 3d7ac540e3..2699f2dfa4 100644 --- a/sandbox/heavyduty/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml +++ b/sandbox/heavyduty/src/main/webapp/WEB-INF/applicationContext-acegi-security.xml @@ -1,5 +1,5 @@ - + diff --git a/sandbox/webflow/src/main/webapp/WEB-INF/web.xml b/sandbox/webflow/src/main/webapp/WEB-INF/web.xml index 2291e594e4..2163b88d28 100644 --- a/sandbox/webflow/src/main/webapp/WEB-INF/web.xml +++ b/sandbox/webflow/src/main/webapp/WEB-INF/web.xml @@ -6,7 +6,7 @@ + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee https://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> Spring Security Tutorial Application diff --git a/sandbox/webflow/src/main/webapp/WEB-INF/webflow-servlet.xml b/sandbox/webflow/src/main/webapp/WEB-INF/webflow-servlet.xml index 2205b387fd..70aba18dee 100644 --- a/sandbox/webflow/src/main/webapp/WEB-INF/webflow-servlet.xml +++ b/sandbox/webflow/src/main/webapp/WEB-INF/webflow-servlet.xml @@ -5,9 +5,9 @@ xmlns:webflow="http://www.springframework.org/schema/webflow-config" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + https://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/webflow-config - http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd"> + https://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd"> diff --git a/taglibs/pom.xml b/taglibs/pom.xml index f6aa3aa028..35b0be4a1f 100644 --- a/taglibs/pom.xml +++ b/taglibs/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-taglibs diff --git a/test/pom.xml b/test/pom.xml index 1cc1d8122a..a739863c6d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-test diff --git a/web/pom.xml b/web/pom.xml index 991c25c94c..876436c3ff 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 org.springframework.security spring-security-web diff --git a/web/src/test/resources/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTest-context.xml b/web/src/test/resources/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTest-context.xml index 5c52ebd913..66d965955b 100644 --- a/web/src/test/resources/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTest-context.xml +++ b/web/src/test/resources/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTest-context.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/web/src/test/resources/webxml/NoRoles.web.xml b/web/src/test/resources/webxml/NoRoles.web.xml index 9a94d8b634..dd0855b135 100644 --- a/web/src/test/resources/webxml/NoRoles.web.xml +++ b/web/src/test/resources/webxml/NoRoles.web.xml @@ -1,5 +1,5 @@ - + poc-acegi-web diff --git a/web/src/test/resources/webxml/Role1-4.web.xml b/web/src/test/resources/webxml/Role1-4.web.xml index eb07eca720..102864cc42 100644 --- a/web/src/test/resources/webxml/Role1-4.web.xml +++ b/web/src/test/resources/webxml/Role1-4.web.xml @@ -1,5 +1,5 @@ - + poc-acegi-web