diff --git a/build.gradle b/build.gradle index 668fca831c..ee8c6d0e91 100644 --- a/build.gradle +++ b/build.gradle @@ -128,6 +128,7 @@ configure(javaprojects) { springDataRedisVersion = '1.0.0.RELEASE' springGemfireVersion = '1.1.0.RELEASE' springSecurityVersion = '3.1.0.RELEASE' + springSocialTwitterVersion = '1.0.1.RELEASE' springWsVersion = '2.0.3.RELEASE' sourceSets { @@ -463,9 +464,16 @@ project('spring-integration-twitter') { description = 'Spring Integration Twitter Support' dependencies { 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.RELEASE" + compile "org.springframework:spring-web:$springVersion" + compile("org.springframework.social:spring-social-twitter:$springSocialTwitterVersion") { + exclude group: 'org.springframework', module: 'spring-aop' + exclude group: 'org.springframework', module: 'spring-asm' + exclude group: 'org.springframework', module: 'spring-beans' + exclude group: 'org.springframework', module: 'spring-context' + exclude group: 'org.springframework', module: 'spring-core' + exclude group: 'org.springframework', module: 'spring-expression' + exclude group: 'org.springframework', module: 'spring-web' + } 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 aefbaa60fe..d6f7c1dab1 100644 --- a/spring-integration-twitter/pom.xml +++ b/spring-integration-twitter/pom.xml @@ -90,15 +90,9 @@ org.springframework.integration - spring-integration-core + spring-integration-test 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-context-support - 3.0.6.RELEASE - compile + test org.springframework @@ -106,12 +100,6 @@ 3.0.6.RELEASE test - - org.springframework.security - spring-security-crypto - 3.1.0.RELEASE - compile - cglib cglib-nodep @@ -125,17 +113,11 @@ test - org.springframework.social - spring-social-twitter - 1.0.0.RELEASE + org.springframework + spring-web + 3.0.6.RELEASE compile - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock @@ -155,6 +137,12 @@ compile true + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.hamcrest hamcrest-all @@ -167,6 +155,42 @@ 1.8.4 test + + org.springframework.social + spring-social-twitter + 1.0.1.RELEASE + compile + + + spring-context + org.springframework + + + spring-asm + org.springframework + + + spring-web + org.springframework + + + spring-expression + org.springframework + + + spring-aop + org.springframework + + + spring-core + org.springframework + + + spring-beans + org.springframework + + + junit junit-dep