CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 46 Packages Projects Releases Wiki Activity

Merge pull request #906 from vorburger/SpringMajorJUnitMinorVersionsBump

Browse Source 
bumped Spring major version 3.2.5 -> 4.0.4 (+ JUnit 4.10->4.11)
This commit is contained in:
Vishwas Babu A J
2014-07-17 16:41:19 -07:00
parent 241a02bf0f ece576e275
commit 3f35a3e4cf
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/build.gradle
+5 -4
View File
@@ -28,8 +28,8 @@ sourceCompatibility = JavaVersion.VERSION_1_7
/* define binary compatiblity version */ /* define binary compatiblity version */
targetCompatibility = JavaVersion.VERSION_1_7 targetCompatibility = JavaVersion.VERSION_1_7
project.ext.springVersion = '3.2.5.RELEASE' project.ext.springVersion = '4.0.4.RELEASE'
project.ext.springSecurityVersion = '3.1.4.RELEASE' project.ext.springSecurityVersion = '3.2.3.RELEASE'
project.ext.hibernateCoreVersion = '4.1.9.Final' project.ext.hibernateCoreVersion = '4.1.9.Final'
project.ext.jerseyVersion = '1.17' project.ext.jerseyVersion = '1.17'
project.ext.springDataJpaVersion = '1.4.1.RELEASE' project.ext.springDataJpaVersion = '1.4.1.RELEASE'
@@ -69,6 +69,7 @@ dependencies {
compile( compile(
[group: 'org.springframework', name: 'spring-core', version: springVersion], [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-aspects', version: springVersion],
[group: 'org.springframework', name: 'spring-web', version: springVersion], [group: 'org.springframework', name: 'spring-web', version: springVersion],
[group: 'org.springframework', name: 'spring-test', 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'], [group: 'com.github.spullara.mustache.java', name: 'compiler', version: '0.8.12'],
[group: 'com.jayway.jsonpath', name: 'json-path', version: '0.9.1']) [group: 'com.jayway.jsonpath', name: 'json-path', version: '0.9.1'])
testCompile 'junit:junit:4.10', testCompile 'junit:junit:4.11',
'junit:junit-dep:4.10', 'junit:junit-dep:4.11',
'org.mockito:mockito-all:1.9.5', 'org.mockito:mockito-all:1.9.5',
'com.jayway.restassured:rest-assured:1.7.2' 'com.jayway.restassured:rest-assured:1.7.2'
mifosng-provider/src/main/resources/META-INF/spring/appContext.xml
+2 -2
View File
@@ -8,7 +8,7 @@
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:cache="http://www.springframework.org/schema/cache" 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 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/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/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/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"> http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd">
@@ -60,4 +60,4 @@
<import resource="cache.xml" /> <import resource="cache.xml" />
</beans> </beans>
mifosng-provider/src/main/resources/META-INF/spring/securityContext.xml
+1 -1
View File
@@ -6,7 +6,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
xsi:schemaLocation=" xsi:schemaLocation="
http://www.springframework.org/schema/security 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
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd"> http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">