diff --git a/build.gradle b/build.gradle index b602f8d3d1..b96868ac9c 100644 --- a/build.gradle +++ b/build.gradle @@ -85,8 +85,8 @@ def clientTestsModule = project(':cuba-client-tests') apply from: "$rootProject.projectDir/lib.gradle" -def springVersion = '4.2.5.RELEASE' -def springSecurityVersion = '4.0.4.RELEASE' +def springVersion = '4.3.1.RELEASE' +def springSecurityVersion = '4.1.1.RELEASE' def servletApi = 'org.apache.tomcat:tomcat-servlet-api:8.0.26' def groovyArtifact = 'org.codehaus.groovy:groovy-all:2.4.4' diff --git a/modules/core/src/cuba-remoting-spring.xml b/modules/core/src/cuba-remoting-spring.xml index 3da605caa5..2445826375 100644 --- a/modules/core/src/cuba-remoting-spring.xml +++ b/modules/core/src/cuba-remoting-spring.xml @@ -19,8 +19,8 @@ diff --git a/modules/core/src/cuba-spring.xml b/modules/core/src/cuba-spring.xml index 89665cd7e6..6d3b339e8f 100644 --- a/modules/core/src/cuba-spring.xml +++ b/modules/core/src/cuba-spring.xml @@ -22,12 +22,11 @@ xmlns:aop="http://www.springframework.org/schema/aop" xmlns:task="http://www.springframework.org/schema/task" xmlns:tx="http://www.springframework.org/schema/tx" - xsi:schemaLocation="http://www.springframework.org/schema/beans 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.2.xsd - http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.1.xsd - http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.2.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd - "> + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd + http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.3.xsd + http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.3.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.3.xsd"> @@ -66,13 +65,15 @@ - + - + @@ -184,8 +185,10 @@ - - + + diff --git a/modules/core/test/test-spring.xml b/modules/core/test/test-spring.xml index 964280b02b..92a313a0d3 100644 --- a/modules/core/test/test-spring.xml +++ b/modules/core/test/test-spring.xml @@ -19,7 +19,7 @@ + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"> diff --git a/modules/desktop/src/cuba-desktop-spring.xml b/modules/desktop/src/cuba-desktop-spring.xml index d4ffed1a3a..a94889fdb9 100644 --- a/modules/desktop/src/cuba-desktop-spring.xml +++ b/modules/desktop/src/cuba-desktop-spring.xml @@ -20,9 +20,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:task="http://www.springframework.org/schema/task" - xsi:schemaLocation="http://www.springframework.org/schema/beans 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.2.xsd - http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.2.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd + http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.3.xsd"> diff --git a/modules/portal/src/cuba-portal-dispatcher-spring.xml b/modules/portal/src/cuba-portal-dispatcher-spring.xml index 920d986f5f..40e9a09db6 100644 --- a/modules/portal/src/cuba-portal-dispatcher-spring.xml +++ b/modules/portal/src/cuba-portal-dispatcher-spring.xml @@ -18,12 +18,10 @@ + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd + http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd"> diff --git a/modules/portal/src/cuba-portal-security-spring.xml b/modules/portal/src/cuba-portal-security-spring.xml index b104794c4b..fa9f85f1a3 100644 --- a/modules/portal/src/cuba-portal-security-spring.xml +++ b/modules/portal/src/cuba-portal-security-spring.xml @@ -20,8 +20,8 @@ xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.2.xsd + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-4.0.xsd"> + http://www.springframework.org/schema/security/spring-security-4.1.xsd"> diff --git a/modules/portal/src/cuba-portal-spring.xml b/modules/portal/src/cuba-portal-spring.xml index 7f26997c09..729b94431d 100644 --- a/modules/portal/src/cuba-portal-spring.xml +++ b/modules/portal/src/cuba-portal-spring.xml @@ -19,9 +19,9 @@ diff --git a/modules/rest-api/src/com/haulmont/restapi/auth/CubaUserAuthenticationProvider.java b/modules/rest-api/src/com/haulmont/restapi/auth/CubaUserAuthenticationProvider.java index 2f433e6cfb..79290c48b0 100644 --- a/modules/rest-api/src/com/haulmont/restapi/auth/CubaUserAuthenticationProvider.java +++ b/modules/rest-api/src/com/haulmont/restapi/auth/CubaUserAuthenticationProvider.java @@ -47,6 +47,9 @@ public class CubaUserAuthenticationProvider implements AuthenticationProvider, S protected Logger log = LoggerFactory.getLogger(getClass()); + public CubaUserAuthenticationProvider() { + } + @Inject protected LoginService loginService; diff --git a/modules/rest-api/src/rest-api-dispatcher-spring.xml b/modules/rest-api/src/rest-api-dispatcher-spring.xml index 9045a0c90c..a0bdece70b 100644 --- a/modules/rest-api/src/rest-api-dispatcher-spring.xml +++ b/modules/rest-api/src/rest-api-dispatcher-spring.xml @@ -21,9 +21,9 @@ 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.2.xsd + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-4.2.xsd + http://www.springframework.org/schema/context/spring-context-4.3.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"> diff --git a/modules/rest-api/src/rest-api-security-spring.xml b/modules/rest-api/src/rest-api-security-spring.xml index 9697ab2fc6..5a664d690e 100644 --- a/modules/rest-api/src/rest-api-security-spring.xml +++ b/modules/rest-api/src/rest-api-security-spring.xml @@ -24,11 +24,11 @@ xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2.xsd http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-4.0.xsd + http://www.springframework.org/schema/security/spring-security-4.1.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-4.2.xsd"> + http://www.springframework.org/schema/context/spring-context-4.3.xsd"> @@ -80,7 +80,7 @@ - + diff --git a/modules/web/src/cuba-dispatcher-spring.xml b/modules/web/src/cuba-dispatcher-spring.xml index 8b36ecc4b7..c12e11fad8 100644 --- a/modules/web/src/cuba-dispatcher-spring.xml +++ b/modules/web/src/cuba-dispatcher-spring.xml @@ -22,9 +22,9 @@ 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.2.xsd + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-4.2.xsd + http://www.springframework.org/schema/context/spring-context-4.3.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd"> diff --git a/modules/web/src/cuba-web-spring.xml b/modules/web/src/cuba-web-spring.xml index 5b35318185..821e4b9ad8 100644 --- a/modules/web/src/cuba-web-spring.xml +++ b/modules/web/src/cuba-web-spring.xml @@ -21,10 +21,10 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:task="http://www.springframework.org/schema/task" 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.2.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.2.xsd - http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.2.xsd - http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd"> + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.3.xsd + http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.3.xsd + http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd">