diff --git a/gradle.properties b/gradle.properties index 9bbac3238a..0ed664faff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,7 @@ # version to be applied to all projects in this multi-project build. this is # the one and only location version changes need to be made. # ------------------------------------------------------------------------------ -springIntegrationVersion=2.1.0.M1 +springIntegrationVersion=2.1.0.BUILD-SNAPSHOT # ------------------------------------------------------------------------------ # build system user roles diff --git a/pom.xml b/pom.xml index 8584a94408..76076b0006 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT pom Spring Integration diff --git a/spring-integration-amqp/pom.xml b/spring-integration-amqp/pom.xml index cdacb01d16..858c697231 100644 --- a/spring-integration-amqp/pom.xml +++ b/spring-integration-amqp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-amqp - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration AMQP Support @@ -91,7 +91,7 @@ org.springframework.integration spring-integration-test - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT test @@ -100,12 +100,6 @@ 3.0.6.RELEASE test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - org.springframework.amqp spring-rabbit @@ -138,12 +132,6 @@ - - org.springframework.integration - spring-integration-stream - 2.1.0.M1 - test - cglib cglib-nodep @@ -168,6 +156,18 @@ 2.3 test + + org.springframework.integration + spring-integration-stream + 2.1.0.BUILD-SNAPSHOT + test + + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension diff --git a/spring-integration-core/pom.xml b/spring-integration-core/pom.xml index ead2748b9e..d188bc880e 100644 --- a/spring-integration-core/pom.xml +++ b/spring-integration-core/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-core - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration Core diff --git a/spring-integration-event/pom.xml b/spring-integration-event/pom.xml index 3a503383c1..b4a0bb23ad 100644 --- a/spring-integration-event/pom.xml +++ b/spring-integration-event/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-event - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration Event Support @@ -94,6 +94,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension @@ -113,15 +119,15 @@ test - org.springframework - spring-test - 3.0.6.RELEASE + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test - org.springframework.integration - spring-integration-test - 2.1.0.M1 + org.springframework + spring-test + 3.0.6.RELEASE test @@ -130,12 +136,6 @@ 1.8.4 test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - log4j log4j diff --git a/spring-integration-feed/pom.xml b/spring-integration-feed/pom.xml index 944b3aadfb..d41ad51ed6 100644 --- a/spring-integration-feed/pom.xml +++ b/spring-integration-feed/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-feed - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration RSS Feed Support @@ -103,7 +103,7 @@ org.springframework.integration spring-integration-test - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT test @@ -112,12 +112,6 @@ 3.0.6.RELEASE test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - cglib cglib-nodep @@ -136,6 +130,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension diff --git a/spring-integration-file/pom.xml b/spring-integration-file/pom.xml index 3ad4806c73..ed5b6bb0ce 100644 --- a/spring-integration-file/pom.xml +++ b/spring-integration-file/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-file - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration File Support @@ -94,6 +94,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension @@ -113,15 +119,15 @@ test - org.springframework - spring-test - 3.0.6.RELEASE + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test - org.springframework.integration - spring-integration-test - 2.1.0.M1 + org.springframework + spring-test + 3.0.6.RELEASE test @@ -130,12 +136,6 @@ 1.8.4 test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - log4j log4j diff --git a/spring-integration-ftp/pom.xml b/spring-integration-ftp/pom.xml index 2b2198888f..2ff436dbbe 100644 --- a/spring-integration-ftp/pom.xml +++ b/spring-integration-ftp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-ftp - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration FTP Support @@ -88,6 +88,12 @@ + + org.springframework.integration + spring-integration-file + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-context-support @@ -97,7 +103,7 @@ org.springframework.integration spring-integration-test - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT test @@ -149,12 +155,6 @@ 1.1 test - - org.springframework.integration - spring-integration-file - 2.1.0.M1 - compile - org.mockito mockito-all diff --git a/spring-integration-gemfire/pom.xml b/spring-integration-gemfire/pom.xml index 516ed0aa76..eb50a391d1 100644 --- a/spring-integration-gemfire/pom.xml +++ b/spring-integration-gemfire/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-gemfire - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration GemFire Support @@ -101,7 +101,7 @@ org.springframework.integration spring-integration-test - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT test @@ -110,18 +110,6 @@ 3.0.6.RELEASE test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - - - org.springframework.integration - spring-integration-stream - 2.1.0.M1 - test - cglib cglib-nodep @@ -140,6 +128,18 @@ 2.3 test + + org.springframework.integration + spring-integration-stream + 2.1.0.BUILD-SNAPSHOT + test + + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension diff --git a/spring-integration-groovy/pom.xml b/spring-integration-groovy/pom.xml index 3d2b3df0de..da44195c33 100644 --- a/spring-integration-groovy/pom.xml +++ b/spring-integration-groovy/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-groovy - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration Groovy Support @@ -94,6 +94,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension @@ -130,12 +136,6 @@ 1.8.4 test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - log4j log4j diff --git a/spring-integration-http/pom.xml b/spring-integration-http/pom.xml index 1208caea32..ee2a32ed17 100644 --- a/spring-integration-http/pom.xml +++ b/spring-integration-http/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-http - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration HTTP Support @@ -91,7 +91,7 @@ org.springframework.integration spring-integration-test - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT test @@ -100,12 +100,6 @@ 3.0.6.RELEASE test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - javax.servlet servlet-api @@ -130,6 +124,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + commons-httpclient commons-httpclient diff --git a/spring-integration-ip/pom.xml b/spring-integration-ip/pom.xml index 55c6787799..e7c3aa1003 100644 --- a/spring-integration-ip/pom.xml +++ b/spring-integration-ip/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-ip - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration IP Support @@ -94,6 +94,18 @@ 2.3 test + + org.springframework.integration + spring-integration-stream + 2.1.0.BUILD-SNAPSHOT + runtime + + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension @@ -113,15 +125,15 @@ test - org.springframework - spring-test - 3.0.6.RELEASE + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test - org.springframework.integration - spring-integration-test - 2.1.0.M1 + org.springframework + spring-test + 3.0.6.RELEASE test @@ -130,12 +142,6 @@ 1.8.4 test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - log4j log4j @@ -148,12 +154,6 @@ 2.2 test - - org.springframework.integration - spring-integration-stream - 2.1.0.M1 - runtime - junit junit-dep diff --git a/spring-integration-jdbc/pom.xml b/spring-integration-jdbc/pom.xml index 2baca8111f..a3180adcd5 100644 --- a/spring-integration-jdbc/pom.xml +++ b/spring-integration-jdbc/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-jdbc - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration JDBC Support @@ -107,7 +107,7 @@ org.springframework.integration spring-integration-test - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT test @@ -116,12 +116,6 @@ 3.0.6.RELEASE test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - log4j log4j @@ -152,6 +146,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-aop diff --git a/spring-integration-jms/pom.xml b/spring-integration-jms/pom.xml index 103e3457f7..9ae7f63d55 100644 --- a/spring-integration-jms/pom.xml +++ b/spring-integration-jms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-jms - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration JMS Support @@ -95,15 +95,15 @@ test - org.springframework - spring-oxm - 3.0.6.RELEASE + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test - org.springframework.integration - spring-integration-test - 2.1.0.M1 + org.springframework + spring-oxm + 3.0.6.RELEASE test @@ -112,12 +112,6 @@ 3.0.6.RELEASE test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - org.apache.geronimo.specs geronimo-jms_1.1_spec @@ -154,6 +148,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension diff --git a/spring-integration-jmx/pom.xml b/spring-integration-jmx/pom.xml index 00d825c826..086f7c2d2a 100644 --- a/spring-integration-jmx/pom.xml +++ b/spring-integration-jmx/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-jmx - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration JMX Support @@ -88,30 +88,24 @@ + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.aspectj aspectjweaver 1.6.8 compile - - org.springframework.integration - spring-integration-test - 2.1.0.M1 - test - org.springframework spring-test 3.0.6.RELEASE test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - cglib cglib-nodep @@ -130,6 +124,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension diff --git a/spring-integration-mail/pom.xml b/spring-integration-mail/pom.xml index 24a3f21916..f88d3afb07 100644 --- a/spring-integration-mail/pom.xml +++ b/spring-integration-mail/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-mail - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration Mail Support @@ -97,7 +97,7 @@ org.springframework.integration spring-integration-test - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT test @@ -106,12 +106,6 @@ 3.0.6.RELEASE test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - cglib cglib-nodep @@ -130,6 +124,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension diff --git a/spring-integration-mongodb/pom.xml b/spring-integration-mongodb/pom.xml index 3ddabb59b0..54c526a73a 100644 --- a/spring-integration-mongodb/pom.xml +++ b/spring-integration-mongodb/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-mongodb - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration MongoDB Support @@ -94,6 +94,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension @@ -119,15 +125,15 @@ test - org.springframework - spring-test - 3.0.6.RELEASE + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test - org.springframework.integration - spring-integration-test - 2.1.0.M1 + org.springframework + spring-test + 3.0.6.RELEASE test @@ -136,12 +142,6 @@ 1.8.4 test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - log4j log4j diff --git a/spring-integration-redis/pom.xml b/spring-integration-redis/pom.xml index 02d4f9b3d3..fe6c6f13e2 100644 --- a/spring-integration-redis/pom.xml +++ b/spring-integration-redis/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-redis - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration Redis Support @@ -113,7 +113,7 @@ org.springframework.integration spring-integration-test - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT test @@ -122,12 +122,6 @@ 3.0.6.RELEASE test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - log4j log4j @@ -152,6 +146,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension diff --git a/spring-integration-rmi/pom.xml b/spring-integration-rmi/pom.xml index 5788911948..f8e1092e41 100644 --- a/spring-integration-rmi/pom.xml +++ b/spring-integration-rmi/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-rmi - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration RMI Support @@ -100,6 +100,12 @@ 3.0.6.RELEASE compile + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension @@ -119,15 +125,15 @@ test - org.springframework - spring-test - 3.0.6.RELEASE + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test - org.springframework.integration - spring-integration-test - 2.1.0.M1 + org.springframework + spring-test + 3.0.6.RELEASE test @@ -136,12 +142,6 @@ 1.8.4 test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - log4j log4j diff --git a/spring-integration-scripting/pom.xml b/spring-integration-scripting/pom.xml index 2a6e4615b4..05739b6427 100644 --- a/spring-integration-scripting/pom.xml +++ b/spring-integration-scripting/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-scripting - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration Scripting Support @@ -94,6 +94,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension @@ -107,15 +113,15 @@ test - org.springframework - spring-test - 3.0.6.RELEASE + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test - org.springframework.integration - spring-integration-test - 2.1.0.M1 + org.springframework + spring-test + 3.0.6.RELEASE test @@ -130,12 +136,6 @@ 1.7.5 test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - log4j log4j diff --git a/spring-integration-security/pom.xml b/spring-integration-security/pom.xml index 38988e5ced..91425a8bfe 100644 --- a/spring-integration-security/pom.xml +++ b/spring-integration-security/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-security - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration Security Support @@ -106,12 +106,6 @@ 3.0.6.RELEASE test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - cglib cglib-nodep @@ -148,6 +142,12 @@ + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-aop diff --git a/spring-integration-sftp/pom.xml b/spring-integration-sftp/pom.xml index 5fddd58a46..3779cecce1 100644 --- a/spring-integration-sftp/pom.xml +++ b/spring-integration-sftp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-sftp - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration SFTP Support @@ -94,6 +94,12 @@ 0.1.42 compile + + org.springframework.integration + spring-integration-file + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-context-support @@ -103,7 +109,7 @@ org.springframework.integration spring-integration-test - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT test @@ -112,24 +118,12 @@ 3.0.6.RELEASE test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - log4j log4j 1.2.12 test - - org.springframework.integration - spring-integration-stream - 2.1.0.M1 - compile - cglib cglib-nodep @@ -142,6 +136,18 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + + + org.springframework.integration + spring-integration-stream + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension @@ -161,12 +167,6 @@ 1.1 test - - org.springframework.integration - spring-integration-file - 2.1.0.M1 - compile - org.mockito mockito-all diff --git a/spring-integration-stream/pom.xml b/spring-integration-stream/pom.xml index 254bfb3360..eafbe2192a 100644 --- a/spring-integration-stream/pom.xml +++ b/spring-integration-stream/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-stream - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration Stream Support @@ -94,6 +94,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension @@ -124,12 +130,6 @@ 1.8.4 test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - log4j log4j diff --git a/spring-integration-test/pom.xml b/spring-integration-test/pom.xml index 3a3034f13c..635cf28d43 100644 --- a/spring-integration-test/pom.xml +++ b/spring-integration-test/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-test - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration Test Support @@ -94,6 +94,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension @@ -124,12 +130,6 @@ 1.8.4 compile - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - log4j log4j diff --git a/spring-integration-twitter/pom.xml b/spring-integration-twitter/pom.xml index d2c94394a7..677e26592d 100644 --- a/spring-integration-twitter/pom.xml +++ b/spring-integration-twitter/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-twitter - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration Twitter Support @@ -94,30 +94,24 @@ 3.0.6.RELEASE compile + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.twitter4j twitter4j-core 2.1.12 compile - - org.springframework.integration - spring-integration-test - 2.1.0.M1 - test - org.springframework spring-test 3.0.6.RELEASE test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - cglib cglib-nodep @@ -136,6 +130,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension diff --git a/spring-integration-ws/pom.xml b/spring-integration-ws/pom.xml index 7df804a1ad..a0eb2407e8 100644 --- a/spring-integration-ws/pom.xml +++ b/spring-integration-ws/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-ws - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration Web Services Support @@ -98,7 +98,7 @@ org.springframework.integration spring-integration-test - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT test @@ -113,12 +113,6 @@ 3.0.6.RELEASE compile - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - log4j log4j @@ -176,6 +170,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension diff --git a/spring-integration-xml/pom.xml b/spring-integration-xml/pom.xml index 42e27e7dc7..fe6fe77053 100644 --- a/spring-integration-xml/pom.xml +++ b/spring-integration-xml/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-xml - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration XML Support @@ -113,7 +113,7 @@ org.springframework.integration spring-integration-test - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT test @@ -128,12 +128,6 @@ 3.0.6.RELEASE compile - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - javax.xml jaxb-impl @@ -164,6 +158,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension diff --git a/spring-integration-xmpp/pom.xml b/spring-integration-xmpp/pom.xml index 3fe1587aff..f4ec435e8e 100644 --- a/spring-integration-xmpp/pom.xml +++ b/spring-integration-xmpp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration spring-integration-xmpp - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT Spring Integration XMPP Support @@ -97,7 +97,7 @@ org.springframework.integration spring-integration-test - 2.1.0.M1 + 2.1.0.BUILD-SNAPSHOT test @@ -106,18 +106,6 @@ 3.0.6.RELEASE test - - org.springframework.integration - spring-integration-core - 2.1.0.M1 - compile - - - org.springframework.integration - spring-integration-stream - 2.1.0.M1 - test - cglib cglib-nodep @@ -136,6 +124,18 @@ 2.3 test + + org.springframework.integration + spring-integration-stream + 2.1.0.BUILD-SNAPSHOT + test + + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.easymock easymockclassextension