From 21c727b6fe3620cd050b8667986c81f1b55f1656 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Thu, 22 Dec 2011 14:55:41 -0500 Subject: [PATCH] INT-2329 upgrading to Spring 3.0.7 --- build.gradle | 2 +- spring-integration-amqp/pom.xml | 50 +++++++++++----------- spring-integration-core/pom.xml | 36 ++++++++-------- spring-integration-event/pom.xml | 42 +++++++++--------- spring-integration-feed/pom.xml | 40 ++++++++--------- spring-integration-file/pom.xml | 42 +++++++++--------- spring-integration-ftp/pom.xml | 40 ++++++++--------- spring-integration-gemfire/pom.xml | 42 +++++++++--------- spring-integration-groovy/pom.xml | 38 ++++++++--------- spring-integration-http/pom.xml | 44 +++++++++---------- spring-integration-ip/pom.xml | 50 +++++++++++----------- spring-integration-jdbc/pom.xml | 64 ++++++++++++++-------------- spring-integration-jms/pom.xml | 60 +++++++++++++------------- spring-integration-jmx/pom.xml | 40 ++++++++--------- spring-integration-mail/pom.xml | 28 ++++++------ spring-integration-mongodb/pom.xml | 36 ++++++++-------- spring-integration-redis/pom.xml | 42 +++++++++--------- spring-integration-rmi/pom.xml | 46 ++++++++++---------- spring-integration-scripting/pom.xml | 26 +++++------ spring-integration-security/pom.xml | 36 ++++++++-------- spring-integration-sftp/pom.xml | 42 +++++++++--------- spring-integration-stream/pom.xml | 36 ++++++++-------- spring-integration-test/pom.xml | 36 ++++++++-------- spring-integration-twitter/pom.xml | 38 ++++++++--------- spring-integration-ws/pom.xml | 60 +++++++++++++------------- spring-integration-xml/pom.xml | 38 ++++++++--------- spring-integration-xmpp/pom.xml | 28 ++++++------ 27 files changed, 541 insertions(+), 541 deletions(-) diff --git a/build.gradle b/build.gradle index 43224b46bd..80cff0f6a1 100644 --- a/build.gradle +++ b/build.gradle @@ -123,7 +123,7 @@ configure(javaprojects) { junitVersion = '4.8.2' log4jVersion = '1.2.12' mockitoVersion = '1.8.4' - springVersion = '3.0.6.RELEASE' + springVersion = '3.0.7.RELEASE' springAmqpVersion = '1.0.0.RELEASE' springDataMongoVersion = '1.0.0.RC1' springDataRedisVersion = '1.0.0.RELEASE' diff --git a/spring-integration-amqp/pom.xml b/spring-integration-amqp/pom.xml index 25fac3dce7..20bb8e5989 100644 --- a/spring-integration-amqp/pom.xml +++ b/spring-integration-amqp/pom.xml @@ -88,17 +88,23 @@ + + org.springframework + spring-test + 3.0.7.RELEASE + test + org.springframework.integration - spring-integration-core + spring-integration-stream 2.1.0.BUILD-SNAPSHOT - compile + test org.springframework - spring-test - 3.0.6.RELEASE - test + spring-tx + 3.0.7.RELEASE + compile org.springframework.amqp @@ -132,12 +138,6 @@ - - org.springframework.integration - spring-integration-stream - 2.1.0.BUILD-SNAPSHOT - test - cglib cglib-nodep @@ -152,16 +152,10 @@ org.springframework - spring-tx - 3.0.6.RELEASE + spring-context + 3.0.7.RELEASE compile - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock @@ -174,12 +168,6 @@ 2.3 test - - org.springframework - spring-context - 3.0.6.RELEASE - compile - org.codehaus.jackson jackson-mapper-asl @@ -199,12 +187,24 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + junit junit-dep 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-core/pom.xml b/spring-integration-core/pom.xml index d188bc880e..021aa3e295 100644 --- a/spring-integration-core/pom.xml +++ b/spring-integration-core/pom.xml @@ -88,6 +88,18 @@ + + org.springframework + spring-test + 3.0.7.RELEASE + test + + + org.springframework + spring-aop + 3.0.7.RELEASE + compile + org.aspectj aspectjweaver @@ -96,9 +108,10 @@ org.springframework - spring-test - 3.0.6.RELEASE - test + spring-tx + 3.0.7.RELEASE + compile + true cglib @@ -114,10 +127,9 @@ org.springframework - spring-tx - 3.0.6.RELEASE + spring-context + 3.0.7.RELEASE compile - true org.easymock @@ -125,24 +137,12 @@ 2.3 test - - org.springframework - spring-aop - 3.0.6.RELEASE - compile - org.easymock easymockclassextension 2.3 test - - org.springframework - spring-context - 3.0.6.RELEASE - compile - org.codehaus.jackson jackson-mapper-asl diff --git a/spring-integration-event/pom.xml b/spring-integration-event/pom.xml index 4cbdc9385d..96fbd0598b 100644 --- a/spring-integration-event/pom.xml +++ b/spring-integration-event/pom.xml @@ -88,6 +88,12 @@ + + org.springframework + spring-context + 3.0.7.RELEASE + compile + org.easymock easymock @@ -95,9 +101,9 @@ test - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT + org.springframework + spring-test + 3.0.7.RELEASE test @@ -106,36 +112,24 @@ 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-context - 3.0.6.RELEASE - compile - org.hamcrest hamcrest-all 1.1 test - - org.springframework - spring-test - 3.0.6.RELEASE - test - org.mockito mockito-all 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + log4j log4j @@ -154,6 +148,12 @@ 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-feed/pom.xml b/spring-integration-feed/pom.xml index 4b29bff247..0c9c4d3174 100644 --- a/spring-integration-feed/pom.xml +++ b/spring-integration-feed/pom.xml @@ -89,10 +89,10 @@ - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile + org.springframework + spring-test + 3.0.7.RELEASE + test net.java.dev.rome @@ -106,12 +106,6 @@ - - org.springframework - spring-test - 3.0.6.RELEASE - test - cglib cglib-nodep @@ -125,10 +119,10 @@ test - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test + org.springframework + spring-context + 3.0.7.RELEASE + compile org.easymock @@ -142,12 +136,6 @@ 2.3 test - - org.springframework - spring-context - 3.0.6.RELEASE - compile - org.hamcrest hamcrest-all @@ -160,6 +148,18 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + net.java.dev.rome rome diff --git a/spring-integration-file/pom.xml b/spring-integration-file/pom.xml index 1bbbbf2932..c474c4d417 100644 --- a/spring-integration-file/pom.xml +++ b/spring-integration-file/pom.xml @@ -88,6 +88,12 @@ + + org.springframework + spring-context + 3.0.7.RELEASE + compile + org.easymock easymock @@ -95,9 +101,9 @@ test - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT + org.springframework + spring-test + 3.0.7.RELEASE test @@ -106,36 +112,24 @@ 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-context - 3.0.6.RELEASE - compile - org.hamcrest hamcrest-all 1.1 test - - org.springframework - spring-test - 3.0.6.RELEASE - test - org.mockito mockito-all 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + log4j log4j @@ -154,6 +148,12 @@ 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-ftp/pom.xml b/spring-integration-ftp/pom.xml index 64080dcfcd..c3ac18daab 100644 --- a/spring-integration-ftp/pom.xml +++ b/spring-integration-ftp/pom.xml @@ -88,18 +88,30 @@ + + org.springframework.integration + spring-integration-file + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-context-support - 3.0.6.RELEASE + 3.0.7.RELEASE compile org.springframework spring-test - 3.0.6.RELEASE + 3.0.7.RELEASE test + + commons-net + commons-net + 3.0.1 + compile + cglib cglib-nodep @@ -112,18 +124,6 @@ 1.2.12 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - commons-net - commons-net - 3.0.1 - compile - org.easymock easymock @@ -136,12 +136,6 @@ 2.3 test - - org.springframework.integration - spring-integration-file - 2.1.0.BUILD-SNAPSHOT - compile - javax.activation activation @@ -161,6 +155,12 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + junit junit-dep diff --git a/spring-integration-gemfire/pom.xml b/spring-integration-gemfire/pom.xml index db26c6cb8f..92111cf0b6 100644 --- a/spring-integration-gemfire/pom.xml +++ b/spring-integration-gemfire/pom.xml @@ -92,16 +92,10 @@ - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-test - 3.0.6.RELEASE + 3.0.7.RELEASE test @@ -110,6 +104,12 @@ 2.1.0.BUILD-SNAPSHOT test + + org.springframework + spring-tx + 3.0.7.RELEASE + compile + org.springframework.data spring-data-gemfire @@ -144,16 +144,10 @@ org.springframework - spring-tx - 3.0.6.RELEASE + spring-context + 3.0.7.RELEASE compile - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock @@ -166,12 +160,6 @@ 2.3 test - - org.springframework - spring-context - 3.0.6.RELEASE - compile - org.hamcrest hamcrest-all @@ -184,12 +172,24 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + junit junit-dep 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-groovy/pom.xml b/spring-integration-groovy/pom.xml index b4c3c99c3c..2967190fe1 100644 --- a/spring-integration-groovy/pom.xml +++ b/spring-integration-groovy/pom.xml @@ -88,12 +88,24 @@ + + org.springframework + spring-context-support + 3.0.7.RELEASE + compile + org.easymock easymock 2.3 test + + org.springframework + spring-test + 3.0.7.RELEASE + test + org.easymock easymockclassextension @@ -102,16 +114,10 @@ org.springframework.integration - spring-integration-core + spring-integration-scripting 2.1.0.BUILD-SNAPSHOT compile - - org.springframework - spring-context-support - 3.0.6.RELEASE - compile - org.codehaus.groovy groovy-all @@ -124,24 +130,12 @@ 1.1 test - - org.springframework - spring-test - 3.0.6.RELEASE - test - org.mockito mockito-all 1.8.4 test - - org.springframework.integration - spring-integration-scripting - 2.1.0.BUILD-SNAPSHOT - compile - log4j log4j @@ -160,6 +154,12 @@ 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-http/pom.xml b/spring-integration-http/pom.xml index 9d35c03b04..989f60d5f9 100644 --- a/spring-integration-http/pom.xml +++ b/spring-integration-http/pom.xml @@ -89,10 +89,10 @@ - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile + org.springframework + spring-test + 3.0.7.RELEASE + test net.java.dev.rome @@ -107,12 +107,6 @@ true - - org.springframework - spring-test - 3.0.6.RELEASE - test - javax.servlet servlet-api @@ -125,18 +119,18 @@ 1.2.12 test + + org.springframework + spring-webmvc + 3.0.7.RELEASE + compile + cglib cglib-nodep 2.2 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock @@ -162,12 +156,6 @@ 2.3 test - - org.springframework - spring-webmvc - 3.0.6.RELEASE - compile - org.hamcrest hamcrest-all @@ -180,6 +168,12 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + junit junit-dep @@ -193,6 +187,12 @@ compile true + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-ip/pom.xml b/spring-integration-ip/pom.xml index d2f5fe93c5..fe13247103 100644 --- a/spring-integration-ip/pom.xml +++ b/spring-integration-ip/pom.xml @@ -88,6 +88,12 @@ + + org.springframework + spring-context + 3.0.7.RELEASE + compile + org.easymock easymock @@ -95,9 +101,9 @@ test - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT + org.springframework + spring-test + 3.0.7.RELEASE test @@ -106,18 +112,6 @@ 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-context - 3.0.6.RELEASE - compile - org.hamcrest hamcrest-all @@ -125,10 +119,10 @@ test - org.springframework - spring-test - 3.0.6.RELEASE - test + org.springframework.integration + spring-integration-stream + 2.1.0.BUILD-SNAPSHOT + runtime org.mockito @@ -136,6 +130,12 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + log4j log4j @@ -148,18 +148,18 @@ 2.2 test - - org.springframework.integration - spring-integration-stream - 2.1.0.BUILD-SNAPSHOT - runtime - junit junit-dep 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-jdbc/pom.xml b/spring-integration-jdbc/pom.xml index 1ce7d67036..f623a90772 100644 --- a/spring-integration-jdbc/pom.xml +++ b/spring-integration-jdbc/pom.xml @@ -93,9 +93,21 @@ - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT + org.springframework + spring-jdbc + 3.0.7.RELEASE + compile + + + org.springframework + spring-test + 3.0.7.RELEASE + test + + + org.springframework + spring-aop + 3.0.7.RELEASE compile @@ -118,9 +130,9 @@ org.springframework - spring-test - 3.0.6.RELEASE - test + spring-tx + 3.0.7.RELEASE + compile log4j @@ -136,46 +148,22 @@ org.springframework - spring-tx - 3.0.6.RELEASE + spring-context + 3.0.7.RELEASE compile - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock 2.3 test - - org.springframework - spring-aop - 3.0.6.RELEASE - compile - - - org.springframework - spring-jdbc - 3.0.6.RELEASE - compile - org.easymock easymockclassextension 2.3 test - - org.springframework - spring-context - 3.0.6.RELEASE - compile - org.hamcrest hamcrest-all @@ -194,6 +182,12 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.aspectj aspectjrt @@ -206,6 +200,12 @@ 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-jms/pom.xml b/spring-integration-jms/pom.xml index 0309b9c1a4..92bb320d99 100644 --- a/spring-integration-jms/pom.xml +++ b/spring-integration-jms/pom.xml @@ -94,24 +94,18 @@ 5.3.0 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-oxm - 3.0.6.RELEASE - test - org.springframework spring-test - 3.0.6.RELEASE + 3.0.7.RELEASE test + + org.springframework + spring-tx + 3.0.7.RELEASE + compile + org.apache.geronimo.specs geronimo-jms_1.1_spec @@ -132,22 +126,10 @@ org.springframework - spring-jms - 3.0.6.RELEASE + spring-context + 3.0.7.RELEASE compile - - org.springframework - spring-tx - 3.0.6.RELEASE - compile - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock @@ -162,9 +144,9 @@ org.springframework - spring-context - 3.0.6.RELEASE - compile + spring-oxm + 3.0.7.RELEASE + test org.hamcrest @@ -178,12 +160,30 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + junit junit-dep 4.8.2 test + + org.springframework + spring-jms + 3.0.7.RELEASE + compile + + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-jmx/pom.xml b/spring-integration-jmx/pom.xml index 63f6b3227b..c0c5cd55fb 100644 --- a/spring-integration-jmx/pom.xml +++ b/spring-integration-jmx/pom.xml @@ -89,10 +89,10 @@ - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile + org.springframework + spring-test + 3.0.7.RELEASE + test org.aspectj @@ -100,12 +100,6 @@ 1.6.8 compile - - org.springframework - spring-test - 3.0.6.RELEASE - test - cglib cglib-nodep @@ -119,10 +113,10 @@ test - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test + org.springframework + spring-context + 3.0.7.RELEASE + compile org.easymock @@ -136,12 +130,6 @@ 2.3 test - - org.springframework - spring-context - 3.0.6.RELEASE - compile - org.hamcrest hamcrest-all @@ -154,12 +142,24 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.aspectj aspectjrt 1.6.8 compile + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-mail/pom.xml b/spring-integration-mail/pom.xml index 1e522c4929..f539598ea5 100644 --- a/spring-integration-mail/pom.xml +++ b/spring-integration-mail/pom.xml @@ -88,22 +88,16 @@ - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-context-support - 3.0.6.RELEASE + 3.0.7.RELEASE compile org.springframework spring-test - 3.0.6.RELEASE + 3.0.7.RELEASE test @@ -118,12 +112,6 @@ 1.2.12 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock @@ -155,6 +143,18 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + javax.mail mail diff --git a/spring-integration-mongodb/pom.xml b/spring-integration-mongodb/pom.xml index d8a028a399..8a77e7866f 100644 --- a/spring-integration-mongodb/pom.xml +++ b/spring-integration-mongodb/pom.xml @@ -88,12 +88,24 @@ + + org.springframework + spring-context + 3.0.7.RELEASE + compile + org.easymock easymock 2.3 test + + org.springframework + spring-test + 3.0.7.RELEASE + test + org.easymock easymockclassextension @@ -136,30 +148,24 @@ - - org.springframework - spring-context - 3.0.6.RELEASE - compile - org.hamcrest hamcrest-all 1.1 test - - org.springframework - spring-test - 3.0.6.RELEASE - test - org.mockito mockito-all 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + log4j log4j @@ -172,12 +178,6 @@ 2.2 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - junit junit-dep diff --git a/spring-integration-redis/pom.xml b/spring-integration-redis/pom.xml index c5dbc5327b..cc945f2daf 100644 --- a/spring-integration-redis/pom.xml +++ b/spring-integration-redis/pom.xml @@ -89,16 +89,16 @@ - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile + org.springframework + spring-test + 3.0.7.RELEASE + test org.springframework - spring-test - 3.0.6.RELEASE - test + spring-tx + 3.0.7.RELEASE + compile log4j @@ -120,16 +120,10 @@ org.springframework - spring-tx - 3.0.6.RELEASE + spring-context + 3.0.7.RELEASE compile - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock @@ -166,12 +160,6 @@ 2.3 test - - org.springframework - spring-context - 3.0.6.RELEASE - compile - org.codehaus.jackson jackson-mapper-asl @@ -190,12 +178,24 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + junit junit-dep 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-rmi/pom.xml b/spring-integration-rmi/pom.xml index f4903b7fff..445b23647e 100644 --- a/spring-integration-rmi/pom.xml +++ b/spring-integration-rmi/pom.xml @@ -88,23 +88,23 @@ + + org.springframework + spring-context + 3.0.7.RELEASE + compile + org.easymock easymock 2.3 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.springframework - spring-aop - 3.0.6.RELEASE - compile + spring-test + 3.0.7.RELEASE + test org.easymock @@ -112,16 +112,10 @@ 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework - spring-context - 3.0.6.RELEASE + spring-aop + 3.0.7.RELEASE compile @@ -130,18 +124,18 @@ 1.1 test - - org.springframework - spring-test - 3.0.6.RELEASE - test - org.mockito mockito-all 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + log4j log4j @@ -160,6 +154,12 @@ 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-scripting/pom.xml b/spring-integration-scripting/pom.xml index 6a86afcfd2..fb030a6b2f 100644 --- a/spring-integration-scripting/pom.xml +++ b/spring-integration-scripting/pom.xml @@ -88,16 +88,10 @@ - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-test - 3.0.6.RELEASE + 3.0.7.RELEASE test @@ -124,12 +118,6 @@ 1.6.3 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock @@ -160,6 +148,18 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-security/pom.xml b/spring-integration-security/pom.xml index 7d59875654..9357cba1cd 100644 --- a/spring-integration-security/pom.xml +++ b/spring-integration-security/pom.xml @@ -89,16 +89,22 @@ - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT + org.springframework + spring-test + 3.0.7.RELEASE + test + + + org.springframework + spring-aop + 3.0.7.RELEASE compile org.springframework - spring-test - 3.0.6.RELEASE - test + spring-tx + 3.0.7.RELEASE + compile org.springframework.security @@ -124,24 +130,12 @@ 1.2.12 test - - org.springframework - spring-tx - 3.0.6.RELEASE - compile - org.easymock easymock 2.3 test - - org.springframework - spring-aop - 3.0.6.RELEASE - compile - org.easymock easymockclassextension @@ -172,6 +166,12 @@ + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-sftp/pom.xml b/spring-integration-sftp/pom.xml index c83a90c0fc..9ccb6ae73d 100644 --- a/spring-integration-sftp/pom.xml +++ b/spring-integration-sftp/pom.xml @@ -90,26 +90,20 @@ org.springframework.integration - spring-integration-core + spring-integration-file 2.1.0.BUILD-SNAPSHOT compile org.springframework spring-context-support - 3.0.6.RELEASE + 3.0.7.RELEASE compile org.springframework spring-test - 3.0.6.RELEASE - test - - - log4j - log4j - 1.2.12 + 3.0.7.RELEASE test @@ -119,15 +113,15 @@ compile - cglib - cglib-nodep - 2.2 + log4j + log4j + 1.2.12 test - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT + cglib + cglib-nodep + 2.2 test @@ -142,12 +136,6 @@ 2.3 test - - org.springframework.integration - spring-integration-file - 2.1.0.BUILD-SNAPSHOT - compile - javax.activation activation @@ -167,6 +155,12 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + com.jcraft jsch @@ -179,6 +173,12 @@ 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-stream/pom.xml b/spring-integration-stream/pom.xml index 3f460f6052..e9e93671c9 100644 --- a/spring-integration-stream/pom.xml +++ b/spring-integration-stream/pom.xml @@ -88,42 +88,36 @@ + + org.springframework + spring-context + 3.0.7.RELEASE + compile + org.easymock easymock 2.3 test + + org.springframework + spring-test + 3.0.7.RELEASE + test + org.easymock easymockclassextension 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-context - 3.0.6.RELEASE - compile - org.hamcrest hamcrest-all 1.1 test - - org.springframework - spring-test - 3.0.6.RELEASE - test - org.mockito mockito-all @@ -148,6 +142,12 @@ 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-test/pom.xml b/spring-integration-test/pom.xml index 2e3b44448b..5e36bde8d8 100644 --- a/spring-integration-test/pom.xml +++ b/spring-integration-test/pom.xml @@ -88,42 +88,36 @@ + + org.springframework + spring-context + 3.0.7.RELEASE + compile + org.easymock easymock 2.3 test + + org.springframework + spring-test + 3.0.7.RELEASE + compile + org.easymock easymockclassextension 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-context - 3.0.6.RELEASE - compile - org.hamcrest hamcrest-all 1.1 test - - org.springframework - spring-test - 3.0.6.RELEASE - compile - org.mockito mockito-all @@ -148,6 +142,12 @@ 4.8.2 compile + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-twitter/pom.xml b/spring-integration-twitter/pom.xml index ac97f18a46..5f493a5cde 100644 --- a/spring-integration-twitter/pom.xml +++ b/spring-integration-twitter/pom.xml @@ -89,16 +89,16 @@ - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile + org.springframework + spring-test + 3.0.7.RELEASE + test org.springframework - spring-test - 3.0.6.RELEASE - test + spring-web + 3.0.7.RELEASE + compile cglib @@ -112,18 +112,6 @@ 1.2.12 test - - 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 +143,12 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.springframework.social spring-social-twitter @@ -191,6 +185,12 @@ + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-ws/pom.xml b/spring-integration-ws/pom.xml index 7f00f3f8e9..fba2a769e4 100644 --- a/spring-integration-ws/pom.xml +++ b/spring-integration-ws/pom.xml @@ -89,10 +89,10 @@ - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile + org.springframework + spring-test + 3.0.7.RELEASE + test com.sun.xml.messaging.saaj @@ -103,14 +103,8 @@ org.springframework - spring-test - 3.0.6.RELEASE - test - - - org.springframework - spring-oxm - 3.0.6.RELEASE + spring-web + 3.0.7.RELEASE compile @@ -131,12 +125,6 @@ 1.2.2 test - - org.springframework - spring-web - 3.0.6.RELEASE - compile - javax.xml.soap saaj-api @@ -150,12 +138,6 @@ true - - org.springframework - spring-expression - 3.0.6.RELEASE - compile - org.springframework.ws spring-ws-core @@ -176,12 +158,6 @@ - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock @@ -207,6 +183,18 @@ compile true + + org.springframework + spring-oxm + 3.0.7.RELEASE + compile + + + org.springframework + spring-expression + 3.0.7.RELEASE + compile + org.hamcrest hamcrest-all @@ -219,6 +207,18 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-xml/pom.xml b/spring-integration-xml/pom.xml index dbb69fef8b..a5dcbd1bd1 100644 --- a/spring-integration-xml/pom.xml +++ b/spring-integration-xml/pom.xml @@ -88,24 +88,12 @@ - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-test - 3.0.6.RELEASE + 3.0.7.RELEASE test - - org.springframework - spring-oxm - 3.0.6.RELEASE - compile - xmlunit xmlunit @@ -125,10 +113,10 @@ test - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test + org.springframework + spring-context + 3.0.7.RELEASE + compile org.easymock @@ -167,8 +155,8 @@ org.springframework - spring-context - 3.0.6.RELEASE + spring-oxm + 3.0.7.RELEASE compile @@ -183,12 +171,24 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + junit junit-dep 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8 diff --git a/spring-integration-xmpp/pom.xml b/spring-integration-xmpp/pom.xml index b86d7223fc..02fc4054d6 100644 --- a/spring-integration-xmpp/pom.xml +++ b/spring-integration-xmpp/pom.xml @@ -88,22 +88,16 @@ - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-context-support - 3.0.6.RELEASE + 3.0.7.RELEASE compile org.springframework spring-test - 3.0.6.RELEASE + 3.0.7.RELEASE test @@ -124,12 +118,6 @@ 1.2.12 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock @@ -173,12 +161,24 @@ 1.8.4 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + junit junit-dep 4.8.2 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + UTF8