From 416302f95080b3fc67281fbb9be2a5630cb70643 Mon Sep 17 00:00:00 2001 From: eugenp Date: Mon, 26 Oct 2015 15:09:08 +0200 Subject: [PATCH] maven upgrades, xsd cleanup --- spring-all/pom.xml | 2 +- .../src/main/resources/basicConfigForProperties.xml | 6 +++--- .../main/resources/basicConfigForPropertiesOne.xml | 6 +++--- .../main/resources/basicConfigForPropertiesTwo.xml | 6 +++--- spring-all/src/main/resources/config.xml | 8 ++++---- .../src/main/resources/configForProperties.xml | 6 +++--- .../src/main/resources/configForPropertiesOne.xml | 6 +++--- .../src/main/resources/jdbc/springJdbc-config.xml | 4 ++-- spring-all/src/main/resources/springAsync-config.xml | 6 +++--- .../src/main/resources/springProfiles-config.xml | 4 ++-- spring-all/src/main/webapp/WEB-INF/mvc-servlet.xml | 2 +- spring-data-mongodb/.project | 4 ++-- spring-data-mongodb/pom.xml | 2 +- spring-exceptions/pom.xml | 2 +- .../main/resources/beancreationexception_cause4.xml | 6 +++--- .../main/resources/beancreationexception_cause6.xml | 6 +++--- .../main/resources/beancreationexception_cause7.xml | 6 +++--- .../main/resources/beancreationexception_cause9.xml | 6 +++--- .../src/main/resources/configForProperties.xml | 6 +++--- .../src/main/resources/configForPropertiesOne.xml | 6 +++--- .../src/main/resources/configForPropertiesTwo.xml | 6 +++--- .../src/main/webapp/WEB-INF/mvc-servlet.xml | 2 +- spring-hibernate3/pom.xml | 2 +- .../src/main/resources/persistenceConfig.xml | 4 ++-- spring-hibernate4/pom.xml | 2 +- .../src/main/resources/hibernate4Config.xml | 4 ++-- .../src/main/resources/webSecurityConfig.xml | 4 ++-- spring-jpa/pom.xml | 2 +- spring-jpa/src/main/resources/jpaConfig.xml | 6 +++--- spring-jpa/src/main/resources/webSecurityConfig.xml | 4 ++-- spring-mvc-java/pom.xml | 2 +- .../src/main/webapp/WEB-INF/mvc-servlet.xml | 2 +- spring-mvc-no-xml/pom.xml | 2 +- .../src/main/resources/webSecurityConfig.xml | 4 ++-- .../src/main/webapp/WEB-INF/mvc-servlet.xml | 2 +- spring-mvc-xml/pom.xml | 2 +- spring-mvc-xml/src/main/resources/webMvcConfig.xml | 6 +++--- .../src/main/webapp/WEB-INF/mvc-servlet.xml | 2 +- spring-rest/pom.xml | 2 +- spring-security-basic-auth/pom.xml | 2 +- .../src/main/resources/webSecurityConfig.xml | 4 ++-- .../src/main/webapp/WEB-INF/mvc-servlet.xml | 2 +- .../src/main/resources/webSecurityConfig.xml | 4 ++-- .../src/main/webapp/WEB-INF/mvc-servlet.xml | 2 +- spring-security-mvc-custom/pom.xml | 2 +- .../src/main/resources/webSecurityConfig.xml | 4 ++-- .../src/main/webapp/WEB-INF/mvc-servlet.xml | 2 +- spring-security-mvc-digest-auth/pom.xml | 2 +- .../src/main/resources/webSecurityConfig.xml | 4 ++-- .../src/main/webapp/WEB-INF/mvc-servlet.xml | 2 +- spring-security-mvc-ldap/pom.xml | 2 +- spring-security-mvc-login/pom.xml | 2 +- .../src/main/resources/webSecurityConfig.xml | 4 ++-- .../src/main/webapp/WEB-INF/mvc-servlet.xml | 2 +- spring-security-mvc-session/pom.xml | 2 +- .../src/main/resources/webSecurityConfig.xml | 4 ++-- .../src/main/webapp/WEB-INF/mvc-servlet.xml | 2 +- .../src/main/webapp/WEB-INF/api-servlet.xml | 2 +- spring-security-rest-custom/pom.xml | 2 +- .../src/main/resources/prop.xml | 4 ++-- .../src/main/resources/webSecurityConfig.xml | 4 ++-- spring-security-rest-digest-auth/pom.xml | 12 ++++++------ .../src/main/resources/webSecurityConfig.xml | 4 ++-- .../src/main/webapp/WEB-INF/api-servlet.xml | 2 +- spring-security-rest-full/pom.xml | 2 +- .../main/resources/springDataPersistenceConfig.xml | 2 +- .../src/main/resources/webSecurityConfig.xml | 4 ++-- .../src/main/webapp/WEB-INF/api-servlet.xml | 2 +- spring-security-rest/pom.xml | 2 +- .../src/main/resources/webSecurityConfig.xml | 4 ++-- .../src/main/webapp/WEB-INF/api-servlet.xml | 2 +- 71 files changed, 128 insertions(+), 128 deletions(-) diff --git a/spring-all/pom.xml b/spring-all/pom.xml index e7184953ffac..0551abe5a5fd 100644 --- a/spring-all/pom.xml +++ b/spring-all/pom.xml @@ -221,7 +221,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE 3.20.0-GA 1.2 diff --git a/spring-all/src/main/resources/basicConfigForProperties.xml b/spring-all/src/main/resources/basicConfigForProperties.xml index b413e0cd946d..e50de084f02c 100644 --- a/spring-all/src/main/resources/basicConfigForProperties.xml +++ b/spring-all/src/main/resources/basicConfigForProperties.xml @@ -2,9 +2,9 @@ diff --git a/spring-all/src/main/resources/basicConfigForPropertiesOne.xml b/spring-all/src/main/resources/basicConfigForPropertiesOne.xml index 4301b1faf98b..01b297d437b8 100644 --- a/spring-all/src/main/resources/basicConfigForPropertiesOne.xml +++ b/spring-all/src/main/resources/basicConfigForPropertiesOne.xml @@ -2,9 +2,9 @@ diff --git a/spring-all/src/main/resources/basicConfigForPropertiesTwo.xml b/spring-all/src/main/resources/basicConfigForPropertiesTwo.xml index b1b5c4a66bd9..bd6588104fcb 100644 --- a/spring-all/src/main/resources/basicConfigForPropertiesTwo.xml +++ b/spring-all/src/main/resources/basicConfigForPropertiesTwo.xml @@ -2,9 +2,9 @@ diff --git a/spring-all/src/main/resources/config.xml b/spring-all/src/main/resources/config.xml index 15c4f7be7ac1..244e9027ecd1 100644 --- a/spring-all/src/main/resources/config.xml +++ b/spring-all/src/main/resources/config.xml @@ -1,10 +1,10 @@ diff --git a/spring-all/src/main/resources/configForProperties.xml b/spring-all/src/main/resources/configForProperties.xml index 69939e0e4ece..0f766665eb7d 100644 --- a/spring-all/src/main/resources/configForProperties.xml +++ b/spring-all/src/main/resources/configForProperties.xml @@ -2,9 +2,9 @@ diff --git a/spring-all/src/main/resources/configForPropertiesOne.xml b/spring-all/src/main/resources/configForPropertiesOne.xml index c92c63392fff..068c86a84082 100644 --- a/spring-all/src/main/resources/configForPropertiesOne.xml +++ b/spring-all/src/main/resources/configForPropertiesOne.xml @@ -2,9 +2,9 @@ diff --git a/spring-all/src/main/resources/jdbc/springJdbc-config.xml b/spring-all/src/main/resources/jdbc/springJdbc-config.xml index cb3b3a7536cf..5fd2699b41bb 100644 --- a/spring-all/src/main/resources/jdbc/springJdbc-config.xml +++ b/spring-all/src/main/resources/jdbc/springJdbc-config.xml @@ -1,7 +1,7 @@ diff --git a/spring-all/src/main/resources/springAsync-config.xml b/spring-all/src/main/resources/springAsync-config.xml index 403c55ebdbdf..8ed5f1319de5 100644 --- a/spring-all/src/main/resources/springAsync-config.xml +++ b/spring-all/src/main/resources/springAsync-config.xml @@ -1,9 +1,9 @@ diff --git a/spring-all/src/main/resources/springProfiles-config.xml b/spring-all/src/main/resources/springProfiles-config.xml index 6466178c1e88..5f71c02e204f 100644 --- a/spring-all/src/main/resources/springProfiles-config.xml +++ b/spring-all/src/main/resources/springProfiles-config.xml @@ -1,7 +1,7 @@ diff --git a/spring-all/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-all/src/main/webapp/WEB-INF/mvc-servlet.xml index 4c74be891219..4ba96424480e 100644 --- a/spring-all/src/main/webapp/WEB-INF/mvc-servlet.xml +++ b/spring-all/src/main/webapp/WEB-INF/mvc-servlet.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" > \ No newline at end of file diff --git a/spring-data-mongodb/.project b/spring-data-mongodb/.project index bfe02478f556..e928c256a475 100644 --- a/spring-data-mongodb/.project +++ b/spring-data-mongodb/.project @@ -11,12 +11,12 @@ - org.eclipse.m2e.core.maven2Builder + org.springframework.ide.eclipse.core.springbuilder - org.springframework.ide.eclipse.core.springbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml index 5b7c83482aea..23ac3533507c 100644 --- a/spring-data-mongodb/pom.xml +++ b/spring-data-mongodb/pom.xml @@ -119,7 +119,7 @@ UTF-8 1.7.1.RELEASE - 4.2.0.RELEASE + 4.2.2.RELEASE 1.3 4.11 2.4.1 diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml index 46210f2fa761..f4c0acec857a 100644 --- a/spring-exceptions/pom.xml +++ b/spring-exceptions/pom.xml @@ -203,7 +203,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE 3.20.0-GA 1.2 diff --git a/spring-exceptions/src/main/resources/beancreationexception_cause4.xml b/spring-exceptions/src/main/resources/beancreationexception_cause4.xml index 6569788db618..ad7edc376328 100644 --- a/spring-exceptions/src/main/resources/beancreationexception_cause4.xml +++ b/spring-exceptions/src/main/resources/beancreationexception_cause4.xml @@ -2,9 +2,9 @@ + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/spring-exceptions/src/main/resources/beancreationexception_cause6.xml b/spring-exceptions/src/main/resources/beancreationexception_cause6.xml index 4600a0ed5507..fe60786151e2 100644 --- a/spring-exceptions/src/main/resources/beancreationexception_cause6.xml +++ b/spring-exceptions/src/main/resources/beancreationexception_cause6.xml @@ -2,9 +2,9 @@ + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/spring-exceptions/src/main/resources/beancreationexception_cause7.xml b/spring-exceptions/src/main/resources/beancreationexception_cause7.xml index b11a35442abe..d8ef7dd18c05 100644 --- a/spring-exceptions/src/main/resources/beancreationexception_cause7.xml +++ b/spring-exceptions/src/main/resources/beancreationexception_cause7.xml @@ -2,9 +2,9 @@ + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/spring-exceptions/src/main/resources/beancreationexception_cause9.xml b/spring-exceptions/src/main/resources/beancreationexception_cause9.xml index 7585e6c38a45..5d658f819f4a 100644 --- a/spring-exceptions/src/main/resources/beancreationexception_cause9.xml +++ b/spring-exceptions/src/main/resources/beancreationexception_cause9.xml @@ -2,9 +2,9 @@ + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.2.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/spring-exceptions/src/main/resources/configForProperties.xml b/spring-exceptions/src/main/resources/configForProperties.xml index 69939e0e4ece..0f766665eb7d 100644 --- a/spring-exceptions/src/main/resources/configForProperties.xml +++ b/spring-exceptions/src/main/resources/configForProperties.xml @@ -2,9 +2,9 @@ diff --git a/spring-exceptions/src/main/resources/configForPropertiesOne.xml b/spring-exceptions/src/main/resources/configForPropertiesOne.xml index c92c63392fff..068c86a84082 100644 --- a/spring-exceptions/src/main/resources/configForPropertiesOne.xml +++ b/spring-exceptions/src/main/resources/configForPropertiesOne.xml @@ -2,9 +2,9 @@ diff --git a/spring-exceptions/src/main/resources/configForPropertiesTwo.xml b/spring-exceptions/src/main/resources/configForPropertiesTwo.xml index b1b5c4a66bd9..bd6588104fcb 100644 --- a/spring-exceptions/src/main/resources/configForPropertiesTwo.xml +++ b/spring-exceptions/src/main/resources/configForPropertiesTwo.xml @@ -2,9 +2,9 @@ diff --git a/spring-exceptions/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-exceptions/src/main/webapp/WEB-INF/mvc-servlet.xml index 4c74be891219..4ba96424480e 100644 --- a/spring-exceptions/src/main/webapp/WEB-INF/mvc-servlet.xml +++ b/spring-exceptions/src/main/webapp/WEB-INF/mvc-servlet.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" > \ No newline at end of file diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml index 653626bab025..29682a97c398 100644 --- a/spring-hibernate3/pom.xml +++ b/spring-hibernate3/pom.xml @@ -162,7 +162,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE 3.20.0-GA diff --git a/spring-hibernate3/src/main/resources/persistenceConfig.xml b/spring-hibernate3/src/main/resources/persistenceConfig.xml index 1f2f6130a670..347e85ee512a 100644 --- a/spring-hibernate3/src/main/resources/persistenceConfig.xml +++ b/spring-hibernate3/src/main/resources/persistenceConfig.xml @@ -1,8 +1,8 @@ diff --git a/spring-hibernate4/pom.xml b/spring-hibernate4/pom.xml index 0f74e9603ada..3b0e3b6a0073 100644 --- a/spring-hibernate4/pom.xml +++ b/spring-hibernate4/pom.xml @@ -169,7 +169,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE 3.20.0-GA diff --git a/spring-hibernate4/src/main/resources/hibernate4Config.xml b/spring-hibernate4/src/main/resources/hibernate4Config.xml index 6e7c5d7f11f8..aa419a19f7cd 100644 --- a/spring-hibernate4/src/main/resources/hibernate4Config.xml +++ b/spring-hibernate4/src/main/resources/hibernate4Config.xml @@ -1,8 +1,8 @@ diff --git a/spring-hibernate4/src/main/resources/webSecurityConfig.xml b/spring-hibernate4/src/main/resources/webSecurityConfig.xml index 779a24ba39a1..88af78dabc9c 100644 --- a/spring-hibernate4/src/main/resources/webSecurityConfig.xml +++ b/spring-hibernate4/src/main/resources/webSecurityConfig.xml @@ -1,8 +1,8 @@ diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml index b3b08167f1bb..f065fe1a81f9 100644 --- a/spring-jpa/pom.xml +++ b/spring-jpa/pom.xml @@ -174,7 +174,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE 3.20.0-GA diff --git a/spring-jpa/src/main/resources/jpaConfig.xml b/spring-jpa/src/main/resources/jpaConfig.xml index 982f569840c5..1f0b8d899f77 100644 --- a/spring-jpa/src/main/resources/jpaConfig.xml +++ b/spring-jpa/src/main/resources/jpaConfig.xml @@ -2,9 +2,9 @@ diff --git a/spring-jpa/src/main/resources/webSecurityConfig.xml b/spring-jpa/src/main/resources/webSecurityConfig.xml index 779a24ba39a1..88af78dabc9c 100644 --- a/spring-jpa/src/main/resources/webSecurityConfig.xml +++ b/spring-jpa/src/main/resources/webSecurityConfig.xml @@ -1,8 +1,8 @@ diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml index 20248107a315..5875af56316e 100644 --- a/spring-mvc-java/pom.xml +++ b/spring-mvc-java/pom.xml @@ -140,7 +140,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE diff --git a/spring-mvc-java/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-mvc-java/src/main/webapp/WEB-INF/mvc-servlet.xml index 4c74be891219..4ba96424480e 100644 --- a/spring-mvc-java/src/main/webapp/WEB-INF/mvc-servlet.xml +++ b/spring-mvc-java/src/main/webapp/WEB-INF/mvc-servlet.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" > \ No newline at end of file diff --git a/spring-mvc-no-xml/pom.xml b/spring-mvc-no-xml/pom.xml index fdaee3b13346..ecb159f82e8c 100644 --- a/spring-mvc-no-xml/pom.xml +++ b/spring-mvc-no-xml/pom.xml @@ -144,7 +144,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 1.7.12 diff --git a/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml b/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml index 779a24ba39a1..88af78dabc9c 100644 --- a/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml +++ b/spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml @@ -1,8 +1,8 @@ diff --git a/spring-mvc-no-xml/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-mvc-no-xml/src/main/webapp/WEB-INF/mvc-servlet.xml index 4c74be891219..4ba96424480e 100644 --- a/spring-mvc-no-xml/src/main/webapp/WEB-INF/mvc-servlet.xml +++ b/spring-mvc-no-xml/src/main/webapp/WEB-INF/mvc-servlet.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" > \ No newline at end of file diff --git a/spring-mvc-xml/pom.xml b/spring-mvc-xml/pom.xml index 6d62927d6345..378d2be339bd 100644 --- a/spring-mvc-xml/pom.xml +++ b/spring-mvc-xml/pom.xml @@ -146,7 +146,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 1.7.12 diff --git a/spring-mvc-xml/src/main/resources/webMvcConfig.xml b/spring-mvc-xml/src/main/resources/webMvcConfig.xml index 46825235c65e..a7aa252c08a1 100644 --- a/spring-mvc-xml/src/main/resources/webMvcConfig.xml +++ b/spring-mvc-xml/src/main/resources/webMvcConfig.xml @@ -3,11 +3,11 @@ xmlns:mvc="http://www.springframework.org/schema/mvc" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.1.xsd + http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-4.1.xsd + http://www.springframework.org/schema/context/spring-context-4.2.xsd http://www.springframework.org/schema/mvc - http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd" + http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd" > diff --git a/spring-mvc-xml/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-mvc-xml/src/main/webapp/WEB-INF/mvc-servlet.xml index 4c74be891219..4ba96424480e 100644 --- a/spring-mvc-xml/src/main/webapp/WEB-INF/mvc-servlet.xml +++ b/spring-mvc-xml/src/main/webapp/WEB-INF/mvc-servlet.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" > \ No newline at end of file diff --git a/spring-rest/pom.xml b/spring-rest/pom.xml index ceede90c2edb..7bc09055422f 100644 --- a/spring-rest/pom.xml +++ b/spring-rest/pom.xml @@ -229,7 +229,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE diff --git a/spring-security-basic-auth/pom.xml b/spring-security-basic-auth/pom.xml index 754a2c600b98..72914dd0d599 100644 --- a/spring-security-basic-auth/pom.xml +++ b/spring-security-basic-auth/pom.xml @@ -225,7 +225,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE diff --git a/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml b/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml index 40ad96c29e7b..48302e8e9382 100644 --- a/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml +++ b/spring-security-basic-auth/src/main/resources/webSecurityConfig.xml @@ -1,8 +1,8 @@ diff --git a/spring-security-basic-auth/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-security-basic-auth/src/main/webapp/WEB-INF/mvc-servlet.xml index d6e8f7549aff..eb7ce7b5f8a3 100644 --- a/spring-security-basic-auth/src/main/webapp/WEB-INF/mvc-servlet.xml +++ b/spring-security-basic-auth/src/main/webapp/WEB-INF/mvc-servlet.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd"> \ No newline at end of file diff --git a/spring-security-login-and-registration/src/main/resources/webSecurityConfig.xml b/spring-security-login-and-registration/src/main/resources/webSecurityConfig.xml index d852307ab5b0..677b0864c440 100644 --- a/spring-security-login-and-registration/src/main/resources/webSecurityConfig.xml +++ b/spring-security-login-and-registration/src/main/resources/webSecurityConfig.xml @@ -2,8 +2,8 @@ diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-security-login-and-registration/src/main/webapp/WEB-INF/mvc-servlet.xml index fe527bd4e8bc..99e19b05583b 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/mvc-servlet.xml +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/mvc-servlet.xml @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/spring-security-mvc-custom/pom.xml b/spring-security-mvc-custom/pom.xml index 0e620d1d7ad9..d6ac323104cc 100644 --- a/spring-security-mvc-custom/pom.xml +++ b/spring-security-mvc-custom/pom.xml @@ -230,7 +230,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE diff --git a/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml index 618db1243333..bbb22c11cb11 100644 --- a/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml +++ b/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml @@ -2,9 +2,9 @@ diff --git a/spring-security-mvc-custom/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-security-mvc-custom/src/main/webapp/WEB-INF/mvc-servlet.xml index 4c74be891219..4ba96424480e 100644 --- a/spring-security-mvc-custom/src/main/webapp/WEB-INF/mvc-servlet.xml +++ b/spring-security-mvc-custom/src/main/webapp/WEB-INF/mvc-servlet.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" > \ No newline at end of file diff --git a/spring-security-mvc-digest-auth/pom.xml b/spring-security-mvc-digest-auth/pom.xml index f01eccbe2aac..f7ca0868812f 100644 --- a/spring-security-mvc-digest-auth/pom.xml +++ b/spring-security-mvc-digest-auth/pom.xml @@ -225,7 +225,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE diff --git a/spring-security-mvc-digest-auth/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-digest-auth/src/main/resources/webSecurityConfig.xml index be31d4404936..0706267b77b8 100644 --- a/spring-security-mvc-digest-auth/src/main/resources/webSecurityConfig.xml +++ b/spring-security-mvc-digest-auth/src/main/resources/webSecurityConfig.xml @@ -1,8 +1,8 @@ diff --git a/spring-security-mvc-digest-auth/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-security-mvc-digest-auth/src/main/webapp/WEB-INF/mvc-servlet.xml index 4c74be891219..4ba96424480e 100644 --- a/spring-security-mvc-digest-auth/src/main/webapp/WEB-INF/mvc-servlet.xml +++ b/spring-security-mvc-digest-auth/src/main/webapp/WEB-INF/mvc-servlet.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" > \ No newline at end of file diff --git a/spring-security-mvc-ldap/pom.xml b/spring-security-mvc-ldap/pom.xml index f20ceef06667..a11bc4c374a8 100644 --- a/spring-security-mvc-ldap/pom.xml +++ b/spring-security-mvc-ldap/pom.xml @@ -87,7 +87,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE diff --git a/spring-security-mvc-login/pom.xml b/spring-security-mvc-login/pom.xml index 17a4df513caa..1f824f50034f 100644 --- a/spring-security-mvc-login/pom.xml +++ b/spring-security-mvc-login/pom.xml @@ -222,7 +222,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE diff --git a/spring-security-mvc-login/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-login/src/main/resources/webSecurityConfig.xml index ca7dac9a5177..2bac3024c72a 100644 --- a/spring-security-mvc-login/src/main/resources/webSecurityConfig.xml +++ b/spring-security-mvc-login/src/main/resources/webSecurityConfig.xml @@ -2,9 +2,9 @@ diff --git a/spring-security-mvc-login/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-security-mvc-login/src/main/webapp/WEB-INF/mvc-servlet.xml index 4c74be891219..4ba96424480e 100644 --- a/spring-security-mvc-login/src/main/webapp/WEB-INF/mvc-servlet.xml +++ b/spring-security-mvc-login/src/main/webapp/WEB-INF/mvc-servlet.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" > \ No newline at end of file diff --git a/spring-security-mvc-session/pom.xml b/spring-security-mvc-session/pom.xml index be41375f49a3..f6cd575d57ad 100644 --- a/spring-security-mvc-session/pom.xml +++ b/spring-security-mvc-session/pom.xml @@ -230,7 +230,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE diff --git a/spring-security-mvc-session/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-session/src/main/resources/webSecurityConfig.xml index ca5048aa64c0..a9b0019fbd0f 100644 --- a/spring-security-mvc-session/src/main/resources/webSecurityConfig.xml +++ b/spring-security-mvc-session/src/main/resources/webSecurityConfig.xml @@ -2,9 +2,9 @@ diff --git a/spring-security-mvc-session/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-security-mvc-session/src/main/webapp/WEB-INF/mvc-servlet.xml index 4c74be891219..4ba96424480e 100644 --- a/spring-security-mvc-session/src/main/webapp/WEB-INF/mvc-servlet.xml +++ b/spring-security-mvc-session/src/main/webapp/WEB-INF/mvc-servlet.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" > \ No newline at end of file diff --git a/spring-security-rest-basic-auth/src/main/webapp/WEB-INF/api-servlet.xml b/spring-security-rest-basic-auth/src/main/webapp/WEB-INF/api-servlet.xml index 4c74be891219..4ba96424480e 100644 --- a/spring-security-rest-basic-auth/src/main/webapp/WEB-INF/api-servlet.xml +++ b/spring-security-rest-basic-auth/src/main/webapp/WEB-INF/api-servlet.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" > \ No newline at end of file diff --git a/spring-security-rest-custom/pom.xml b/spring-security-rest-custom/pom.xml index 9f756ff09a15..cfe3afbc54b7 100644 --- a/spring-security-rest-custom/pom.xml +++ b/spring-security-rest-custom/pom.xml @@ -258,7 +258,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE diff --git a/spring-security-rest-custom/src/main/resources/prop.xml b/spring-security-rest-custom/src/main/resources/prop.xml index 75e386894efb..b853d939d630 100644 --- a/spring-security-rest-custom/src/main/resources/prop.xml +++ b/spring-security-rest-custom/src/main/resources/prop.xml @@ -4,9 +4,9 @@ xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.1.xsd + http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-4.1.xsd"> + http://www.springframework.org/schema/context/spring-context-4.2.xsd"> diff --git a/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml b/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml index 3e90d34f6882..98fe24f9b94b 100644 --- a/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml +++ b/spring-security-rest-custom/src/main/resources/webSecurityConfig.xml @@ -2,9 +2,9 @@ diff --git a/spring-security-rest-digest-auth/pom.xml b/spring-security-rest-digest-auth/pom.xml index bc5582b78ce3..1bc107dda268 100644 --- a/spring-security-rest-digest-auth/pom.xml +++ b/spring-security-rest-digest-auth/pom.xml @@ -274,7 +274,7 @@ - 4.1.6.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE @@ -282,8 +282,8 @@ 5.1.36 - 4.4.1 - 4.5 + 4.4.3 + 4.5.1 1.7.12 @@ -304,13 +304,13 @@ 4.11 1.10.19 - 2.4.1 + 2.6.0 3.3 2.6 - 2.18.1 - 1.4.15 + 2.19 + 1.4.16 diff --git a/spring-security-rest-digest-auth/src/main/resources/webSecurityConfig.xml b/spring-security-rest-digest-auth/src/main/resources/webSecurityConfig.xml index 9a0c909eee23..695efa8047a4 100644 --- a/spring-security-rest-digest-auth/src/main/resources/webSecurityConfig.xml +++ b/spring-security-rest-digest-auth/src/main/resources/webSecurityConfig.xml @@ -2,9 +2,9 @@ diff --git a/spring-security-rest-digest-auth/src/main/webapp/WEB-INF/api-servlet.xml b/spring-security-rest-digest-auth/src/main/webapp/WEB-INF/api-servlet.xml index 4c74be891219..4ba96424480e 100644 --- a/spring-security-rest-digest-auth/src/main/webapp/WEB-INF/api-servlet.xml +++ b/spring-security-rest-digest-auth/src/main/webapp/WEB-INF/api-servlet.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" > \ No newline at end of file diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml index 596efb756976..f5c86a816e61 100644 --- a/spring-security-rest-full/pom.xml +++ b/spring-security-rest-full/pom.xml @@ -419,7 +419,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE diff --git a/spring-security-rest-full/src/main/resources/springDataPersistenceConfig.xml b/spring-security-rest-full/src/main/resources/springDataPersistenceConfig.xml index b115448e7d50..5c971d975d0f 100644 --- a/spring-security-rest-full/src/main/resources/springDataPersistenceConfig.xml +++ b/spring-security-rest-full/src/main/resources/springDataPersistenceConfig.xml @@ -1,6 +1,6 @@ diff --git a/spring-security-rest-full/src/main/resources/webSecurityConfig.xml b/spring-security-rest-full/src/main/resources/webSecurityConfig.xml index 6b2ca8237760..8ebd645adb02 100644 --- a/spring-security-rest-full/src/main/resources/webSecurityConfig.xml +++ b/spring-security-rest-full/src/main/resources/webSecurityConfig.xml @@ -2,9 +2,9 @@ diff --git a/spring-security-rest-full/src/main/webapp/WEB-INF/api-servlet.xml b/spring-security-rest-full/src/main/webapp/WEB-INF/api-servlet.xml index 4c74be891219..4ba96424480e 100644 --- a/spring-security-rest-full/src/main/webapp/WEB-INF/api-servlet.xml +++ b/spring-security-rest-full/src/main/webapp/WEB-INF/api-servlet.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" > \ No newline at end of file diff --git a/spring-security-rest/pom.xml b/spring-security-rest/pom.xml index 1b1f2a23c582..2f9855d05ca0 100644 --- a/spring-security-rest/pom.xml +++ b/spring-security-rest/pom.xml @@ -237,7 +237,7 @@ - 4.2.0.RELEASE + 4.2.2.RELEASE 4.0.2.RELEASE diff --git a/spring-security-rest/src/main/resources/webSecurityConfig.xml b/spring-security-rest/src/main/resources/webSecurityConfig.xml index 9bd95730a0f1..20651c458cbf 100644 --- a/spring-security-rest/src/main/resources/webSecurityConfig.xml +++ b/spring-security-rest/src/main/resources/webSecurityConfig.xml @@ -3,9 +3,9 @@ xmlns:sec="http://www.springframework.org/schema/security" xsi:schemaLocation=" http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.2.xsd + http://www.springframework.org/schema/security/spring-security-4.0.xsd http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.1.xsd" + http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" > diff --git a/spring-security-rest/src/main/webapp/WEB-INF/api-servlet.xml b/spring-security-rest/src/main/webapp/WEB-INF/api-servlet.xml index 4c74be891219..4ba96424480e 100644 --- a/spring-security-rest/src/main/webapp/WEB-INF/api-servlet.xml +++ b/spring-security-rest/src/main/webapp/WEB-INF/api-servlet.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" > \ No newline at end of file