From 1db61882a8ab51ad27cb63691de0dc170bbf3faa Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Mon, 12 May 2014 00:17:51 +0200 Subject: [PATCH 1/2] bumped Spring major version 3.2.5 -> 4.0.4 (+ JUnit 4.10->4.11) --- mifosng-provider/build.gradle | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mifosng-provider/build.gradle b/mifosng-provider/build.gradle index 51afd01c6..92bab1fc1 100644 --- a/mifosng-provider/build.gradle +++ b/mifosng-provider/build.gradle @@ -28,8 +28,8 @@ sourceCompatibility = JavaVersion.VERSION_1_6 /* define binary compatiblity version */ targetCompatibility = JavaVersion.VERSION_1_6 -project.ext.springVersion = '3.2.5.RELEASE' -project.ext.springSecurityVersion = '3.1.4.RELEASE' +project.ext.springVersion = '4.0.4.RELEASE' +project.ext.springSecurityVersion = '3.2.3.RELEASE' project.ext.hibernateCoreVersion = '4.1.9.Final' project.ext.jerseyVersion = '1.17' project.ext.springDataJpaVersion = '1.4.1.RELEASE' @@ -69,6 +69,7 @@ dependencies { compile( [group: 'org.springframework', name: 'spring-core', version: springVersion], + [group: 'org.springframework', name: 'spring-context-support', version: springVersion], [group: 'org.springframework', name: 'spring-aspects', version: springVersion], [group: 'org.springframework', name: 'spring-web', version: springVersion], [group: 'org.springframework', name: 'spring-test', version: springVersion], @@ -139,8 +140,8 @@ dependencies { [group: 'com.github.spullara.mustache.java', name: 'compiler', version: '0.8.12'] ) - testCompile 'junit:junit:4.10', - 'junit:junit-dep:4.10', + testCompile 'junit:junit:4.11', + 'junit:junit-dep:4.11', 'org.mockito:mockito-all:1.9.5', 'com.jayway.restassured:rest-assured:1.7.2' From ece576e27505acbe8c6ee6778a1accfb1c337818 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Mon, 12 May 2014 03:17:36 +0200 Subject: [PATCH 2/2] Fixed startup error following upgrade (spring-security-3.2.xsd) --- .../src/main/resources/META-INF/spring/appContext.xml | 4 ++-- .../src/main/resources/META-INF/spring/securityContext.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml b/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml index 157d7912c..d8b17c00b 100644 --- a/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml +++ b/mifosng-provider/src/main/resources/META-INF/spring/appContext.xml @@ -8,7 +8,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:cache="http://www.springframework.org/schema/cache" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd - http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd + http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-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/cache http://www.springframework.org/schema/cache/spring-cache.xsd"> @@ -59,4 +59,4 @@ - \ No newline at end of file + diff --git a/mifosng-provider/src/main/resources/META-INF/spring/securityContext.xml b/mifosng-provider/src/main/resources/META-INF/spring/securityContext.xml index 7918b2531..827a21be1 100644 --- a/mifosng-provider/src/main/resources/META-INF/spring/securityContext.xml +++ b/mifosng-provider/src/main/resources/META-INF/spring/securityContext.xml @@ -6,7 +6,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" xsi:schemaLocation=" http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.1.xsd + http://www.springframework.org/schema/security/spring-security-3.2.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">