diff --git a/build.gradle b/build.gradle index c888dffea8..572b3769b7 100644 --- a/build.gradle +++ b/build.gradle @@ -127,7 +127,7 @@ configure(javaprojects) { springDataMongoVersion = '1.0.0.RC1' springDataRedisVersion = '1.0.0.RC1' springGemfireVersion = '1.1.0.M3' - springSecurityVersion = '3.0.6.RELEASE' + springSecurityVersion = '3.1.0.RELEASE' springWsVersion = '2.0.3.RELEASE' sourceSets { @@ -465,7 +465,7 @@ project('spring-integration-twitter') { compile project(":spring-integration-core") compile "org.springframework:spring-context-support:$springVersion" compile "org.springframework.social:spring-social-twitter:1.0.0.RELEASE" - compile "org.springframework.security:spring-security-crypto:3.1.0.RC3" + compile "org.springframework.security:spring-security-crypto:3.1.0.RELEASE" compile("javax.activation:activation:$javaxActivationVersion") { optional = true } testCompile project(":spring-integration-test") } diff --git a/spring-integration-twitter/pom.xml b/spring-integration-twitter/pom.xml index b518280175..aefbaa60fe 100644 --- a/spring-integration-twitter/pom.xml +++ b/spring-integration-twitter/pom.xml @@ -89,15 +89,15 @@ - org.springframework - spring-context-support - 3.0.6.RELEASE + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT compile - org.springframework.security - spring-security-crypto - 3.1.0.RC3 + org.springframework + spring-context-support + 3.0.6.RELEASE compile @@ -106,6 +106,12 @@ 3.0.6.RELEASE test + + org.springframework.security + spring-security-crypto + 3.1.0.RELEASE + compile + cglib cglib-nodep @@ -124,18 +130,18 @@ 1.0.0.RELEASE compile - - org.easymock - easymock - 2.3 - test - org.springframework.integration spring-integration-test 2.1.0.BUILD-SNAPSHOT test + + org.easymock + easymock + 2.3 + test + org.easymock easymockclassextension @@ -155,12 +161,6 @@ 1.1 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.mockito mockito-all diff --git a/spring-integration-ws/pom.xml b/spring-integration-ws/pom.xml index 68827fa547..3862f89567 100644 --- a/spring-integration-ws/pom.xml +++ b/spring-integration-ws/pom.xml @@ -184,9 +184,9 @@ org.springframework.integration - spring-integration-test + spring-integration-core 2.1.0.BUILD-SNAPSHOT - test + compile stax @@ -207,18 +207,18 @@ 1.1 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.mockito mockito-all 1.8.4 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - junit junit-dep