diff --git a/.gitignore b/.gitignore index 1e87323be7..1e131f1e5c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ spring-build bin .springBeans .settings +spring-integration-samples/loanshark/application.log* diff --git a/build-spring-integration/pom.xml b/build-spring-integration/pom.xml index e007c3ee1f..f609768070 100644 --- a/build-spring-integration/pom.xml +++ b/build-spring-integration/pom.xml @@ -12,11 +12,11 @@ systems via simple adapters. Those adapters provide a higher-level of abstraction over Spring's support for remoting, messaging, and scheduling. Spring Integration's primary goal is to provide a simple model for building enterprise integration solutions while maintaining the separation of - concerns that is essential for producing maintainable, testable code. + concerns that is essential for producing maintainable, testable code. 2.0.0.BUILD-SNAPSHOT pom - + ../spring-integration-parent ../org.springframework.integration ../org.springframework.integration.security @@ -31,7 +31,7 @@ ../org.springframework.integration.stream ../org.springframework.integration.ip ../org.springframework.integration.ws - ../org.springframework.integration.xml + ../org.springframework.integration.xml http://www.springsource.org/spring-integration @@ -66,7 +66,6 @@ http://www.apache.org/licenses/LICENSE-2.0.txt - staging @@ -126,5 +125,4 @@ - diff --git a/org.springframework.integration.event/pom.xml b/org.springframework.integration.event/pom.xml index cf55b34e74..799bc191aa 100644 --- a/org.springframework.integration.event/pom.xml +++ b/org.springframework.integration.event/pom.xml @@ -1,34 +1,36 @@ - - 4.0.0 - org.springframework.integration - spring-integration-event - jar - Spring Integration Event Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-context - ${spring.version} - compile - - - org.springframework.integration - spring-integration-core - ${project.version} - compile - - + + 4.0.0 + org.springframework.integration + spring-integration-event + jar + Spring Integration Event Support + + org.springframework.integration + spring-integration-parent + 2.0.0.BUILD-SNAPSHOT + ../spring-integration-parent + + + + junit + junit + ${junit.version} + test + + + org.springframework + spring-context + ${org.springframework.version} + compile + + + org.springframework.integration + spring-integration-core + ${project.version} + compile + + diff --git a/org.springframework.integration.file/pom.xml b/org.springframework.integration.file/pom.xml index c09343387b..15b28f1392 100644 --- a/org.springframework.integration.file/pom.xml +++ b/org.springframework.integration.file/pom.xml @@ -1,70 +1,72 @@ - - 4.0.0 - org.springframework.integration - spring-integration-file - jar - Spring Integration File Adapters - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - - - - cglib - cglib-nodep - 2.1_3 - test - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-context - ${spring.version} - compile - - - org.springframework - spring-test - ${spring.version} - test - - - org.springframework.integration - spring-integration-core - ${project.version} - compile - - - org.springframework.integration - spring-integration-test - ${project.version} - test - - - org.mockito - mockito-all - 1.8.0 - test - - + + 4.0.0 + org.springframework.integration + spring-integration-file + jar + Spring Integration File Adapters + + org.springframework.integration + spring-integration-parent + 2.0.0.BUILD-SNAPSHOT + ../spring-integration-parent + + + + cglib + cglib-nodep + ${cglib.version} + test + + + org.easymock + easymock + ${org.easymock.version} + test + + + org.easymock + easymockclassextension + ${org.easymock.version} + test + + + junit + junit + ${junit.version} + test + + + org.springframework + spring-context + ${org.springframework.version} + compile + + + org.springframework + spring-test + ${org.springframework.version} + test + + + org.springframework.integration + spring-integration-core + ${project.version} + compile + + + org.springframework.integration + spring-integration-test + ${project.version} + test + + + org.mockito + mockito-all + ${org.mockito.version} + test + + diff --git a/org.springframework.integration.http/pom.xml b/org.springframework.integration.http/pom.xml index a067c2b480..1f78ebd628 100644 --- a/org.springframework.integration.http/pom.xml +++ b/org.springframework.integration.http/pom.xml @@ -1,76 +1,78 @@ - - 4.0.0 - org.springframework.integration - spring-integration-http - jar - Spring Integration HTTP Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - - - - javax.servlet - servlet-api - 2.4 - provided - - - commons-httpclient - commons-httpclient - 3.1 - true - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-test - ${spring.version} - test - - - org.mockito - mockito-all - 1.8.0 - test - - - org.springframework - spring-webmvc - ${spring.version} - compile - - - org.springframework.integration - spring-integration-core - ${project.version} - compile - - - org.springframework.integration - spring-integration-test - ${project.version} - test - - + + 4.0.0 + org.springframework.integration + spring-integration-http + jar + Spring Integration HTTP Support + + org.springframework.integration + spring-integration-parent + 2.0.0.BUILD-SNAPSHOT + ../spring-integration-parent + + + + javax.servlet + servlet-api + 2.4 + provided + + + commons-httpclient + commons-httpclient + 3.1 + true + + + org.easymock + easymock + ${org.easymock.version} + test + + + org.easymock + easymockclassextension + ${org.easymock.version} + test + + + junit + junit + ${junit.version} + test + + + org.springframework + spring-test + ${org.springframework.version} + test + + + org.mockito + mockito-all + ${org.mockito.version} + test + + + org.springframework + spring-webmvc + ${org.springframework.version} + compile + + + org.springframework.integration + spring-integration-core + ${project.version} + compile + + + org.springframework.integration + spring-integration-test + ${project.version} + test + + diff --git a/org.springframework.integration.httpinvoker/pom.xml b/org.springframework.integration.httpinvoker/pom.xml index a1b2888ff6..249bdc08c0 100644 --- a/org.springframework.integration.httpinvoker/pom.xml +++ b/org.springframework.integration.httpinvoker/pom.xml @@ -1,52 +1,54 @@ - - 4.0.0 - org.springframework.integration - spring-integration-httpinvoker - jar - Spring Integration HttpInvoker Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - - - - javax.servlet - servlet-api - 2.4 - provided - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-aop - ${spring.version} - compile - - - org.springframework - spring-test - ${spring.version} - test - - - org.springframework - spring-web - ${spring.version} - compile - - - org.springframework.integration - spring-integration-core - ${project.version} - compile - - + + 4.0.0 + org.springframework.integration + spring-integration-httpinvoker + jar + Spring Integration HttpInvoker Support + + org.springframework.integration + spring-integration-parent + 2.0.0.BUILD-SNAPSHOT + ../spring-integration-parent + + + + javax.servlet + servlet-api + 2.4 + provided + + + junit + junit + ${junit.version} + test + + + org.springframework + spring-aop + ${org.springframework.version} + compile + + + org.springframework + spring-test + ${org.springframework.version} + test + + + org.springframework + spring-web + ${org.springframework.version} + compile + + + org.springframework.integration + spring-integration-core + ${project.version} + compile + + diff --git a/org.springframework.integration.ip/pom.xml b/org.springframework.integration.ip/pom.xml index eabb8ed434..e765e6450b 100644 --- a/org.springframework.integration.ip/pom.xml +++ b/org.springframework.integration.ip/pom.xml @@ -1,76 +1,78 @@ - - 4.0.0 - org.springframework.integration - spring-integration-ip - jar - Spring Integration UDP Adapters - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - - - - cglib - cglib-nodep - 2.1_3 - test - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-context - ${spring.version} - compile - - - org.springframework - spring-test - ${spring.version} - test - - - org.springframework.integration - spring-integration-core - ${project.version} - compile - - - org.springframework.integration - spring-integration-stream - ${project.version} - runtime - - - org.springframework.integration - spring-integration-test - ${project.version} - test - - - org.mockito - mockito-all - 1.6 - test - - + + 4.0.0 + org.springframework.integration + spring-integration-ip + jar + Spring Integration UDP Adapters + + org.springframework.integration + spring-integration-parent + 2.0.0.BUILD-SNAPSHOT + ../spring-integration-parent + + + + cglib + cglib-nodep + ${cglib.version} + test + + + org.easymock + easymock + ${org.easymock.version} + test + + + org.easymock + easymockclassextension + ${org.easymock.version} + test + + + junit + junit + ${junit.version} + test + + + org.springframework + spring-context + ${org.springframework.version} + compile + + + org.springframework + spring-test + ${org.springframework.version} + test + + + org.springframework.integration + spring-integration-core + ${project.version} + compile + + + org.springframework.integration + spring-integration-stream + ${project.version} + runtime + + + org.springframework.integration + spring-integration-test + ${project.version} + test + + + org.mockito + mockito-all + ${org.mockito.version} + test + + diff --git a/org.springframework.integration.jdbc/pom.xml b/org.springframework.integration.jdbc/pom.xml index 7b7b9770e8..09d3d4a549 100644 --- a/org.springframework.integration.jdbc/pom.xml +++ b/org.springframework.integration.jdbc/pom.xml @@ -14,8 +14,8 @@ cglib - cglib - 2.1_3 + cglib-nodep + ${cglib.version} test @@ -27,20 +27,20 @@ org.easymock easymock - 2.3 + ${org.easymock.version} test org.aspectj aspectjrt - 1.6.5 + ${org.aspectj.version} test true org.aspectj aspectjweaver - 1.6.5 + ${org.aspectj.version} test true @@ -70,39 +70,33 @@ org.springframework spring-aop - ${spring.version} + ${org.springframework.version} org.springframework spring-context - ${spring.version} + ${org.springframework.version} org.springframework spring-jdbc - ${spring.version} + ${org.springframework.version} org.springframework spring-tx - ${spring.version} + ${org.springframework.version} org.springframework spring-test - ${spring.version} + ${org.springframework.version} test org.mockito mockito-all - 1.8.0 - test - - - log4j - log4j - 1.2.14 + ${org.mockito.version} test diff --git a/org.springframework.integration.jms/pom.xml b/org.springframework.integration.jms/pom.xml index e9ed8f21b7..30d0047ba5 100644 --- a/org.springframework.integration.jms/pom.xml +++ b/org.springframework.integration.jms/pom.xml @@ -1,64 +1,66 @@ - - 4.0.0 - org.springframework.integration - spring-integration-jms - jar - Spring Integration JMS Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - 1.1 - true - - - javax.jms - jms - 1.1 - provided - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-jms - ${spring.version} - compile - - - org.springframework - spring-tx - ${spring.version} - compile - - - org.springframework - spring-test - ${spring.version} - test - - - org.springframework.integration - spring-integration-core - ${project.version} - compile - - - org.apache.activemq - activemq-core - 5.3.0 - test - - + + 4.0.0 + org.springframework.integration + spring-integration-jms + jar + Spring Integration JMS Support + + org.springframework.integration + spring-integration-parent + 2.0.0.BUILD-SNAPSHOT + ../spring-integration-parent + + + + org.apache.geronimo.specs + geronimo-jms_1.1_spec + 1.1 + true + + + javax.jms + jms + 1.1 + provided + + + junit + junit + ${junit.version} + test + + + org.springframework + spring-jms + ${org.springframework.version} + compile + + + org.springframework + spring-tx + ${org.springframework.version} + compile + + + org.springframework + spring-test + ${org.springframework.version} + test + + + org.springframework.integration + spring-integration-core + ${project.version} + compile + + + org.apache.activemq + activemq-core + 5.3.0 + test + + diff --git a/org.springframework.integration.jmx/pom.xml b/org.springframework.integration.jmx/pom.xml index d8ee8a2b09..e53ac943cb 100644 --- a/org.springframework.integration.jmx/pom.xml +++ b/org.springframework.integration.jmx/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 org.springframework.integration @@ -22,13 +23,13 @@ org.springframework spring-context - ${spring.version} + ${org.springframework.version} compile org.springframework spring-test - ${spring.version} + ${org.springframework.version} test diff --git a/org.springframework.integration.mail/pom.xml b/org.springframework.integration.mail/pom.xml index 72c7e75c53..cd0f6abe3f 100644 --- a/org.springframework.integration.mail/pom.xml +++ b/org.springframework.integration.mail/pom.xml @@ -1,70 +1,72 @@ - - 4.0.0 - org.springframework.integration - spring-integration-mail - jar - Spring Integration Mail Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - - - - javax.activation - activation - 1.1.1 - true - - - javax.mail - mail - 1.4.1 - provided - - - cglib - cglib-nodep - 2.1_3 - test - - - org.easymock - easymock - 2.3 - test - - - org.easymock - easymockclassextension - 2.3 - test - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-context-support - ${spring.version} - compile - - - org.springframework - spring-test - ${spring.version} - test - - - org.springframework.integration - spring-integration-core - ${project.version} - compile - - + + 4.0.0 + org.springframework.integration + spring-integration-mail + jar + Spring Integration Mail Support + + org.springframework.integration + spring-integration-parent + 2.0.0.BUILD-SNAPSHOT + ../spring-integration-parent + + + + javax.activation + activation + 1.1.1 + true + + + javax.mail + mail + 1.4.1 + provided + + + cglib + cglib-nodep + ${cglib.version} + test + + + org.easymock + easymock + ${org.easymock.version} + test + + + org.easymock + easymockclassextension + ${org.easymock.version} + test + + + junit + junit + ${junit.version} + test + + + org.springframework + spring-context-support + ${org.springframework.version} + compile + + + org.springframework + spring-test + ${org.springframework.version} + test + + + org.springframework.integration + spring-integration-core + ${project.version} + compile + + diff --git a/org.springframework.integration.rmi/pom.xml b/org.springframework.integration.rmi/pom.xml index e40f009218..bc8c5bcced 100644 --- a/org.springframework.integration.rmi/pom.xml +++ b/org.springframework.integration.rmi/pom.xml @@ -1,46 +1,48 @@ - - 4.0.0 - org.springframework.integration - spring-integration-rmi - jar - Spring Integration RMI Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-aop - ${spring.version} - compile - - - org.springframework - spring-context - ${spring.version} - compile - - - org.springframework - spring-test - ${spring.version} - test - - - org.springframework.integration - spring-integration-core - ${project.version} - compile - - + + 4.0.0 + org.springframework.integration + spring-integration-rmi + jar + Spring Integration RMI Support + + org.springframework.integration + spring-integration-parent + 2.0.0.BUILD-SNAPSHOT + ../spring-integration-parent + + + + junit + junit + ${junit.version} + test + + + org.springframework + spring-aop + ${org.springframework.version} + compile + + + org.springframework + spring-context + ${org.springframework.version} + compile + + + org.springframework + spring-test + ${org.springframework.version} + test + + + org.springframework.integration + spring-integration-core + ${project.version} + compile + + diff --git a/org.springframework.integration.security/pom.xml b/org.springframework.integration.security/pom.xml index 0ef54c4bfb..b89db4e71a 100644 --- a/org.springframework.integration.security/pom.xml +++ b/org.springframework.integration.security/pom.xml @@ -1,58 +1,60 @@ - - 4.0.0 - org.springframework.integration - spring-integration-security - jar - Spring Integration Security Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - - - - org.easymock - easymock - 2.3 - test - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-aop - ${spring.version} - compile - - - org.springframework - spring-test - ${spring.version} - test - - - org.springframework - spring-tx - ${spring.version} - test - - - org.springframework.integration - spring-integration-core - ${project.version} - compile - - - org.springframework.security - spring-security-core - 2.0.5.RELEASE - compile - - + + 4.0.0 + org.springframework.integration + spring-integration-security + jar + Spring Integration Security Support + + org.springframework.integration + spring-integration-parent + 2.0.0.BUILD-SNAPSHOT + ../spring-integration-parent + + + + org.easymock + easymock + ${org.easymock.version} + test + + + junit + junit + ${junit.version} + test + + + org.springframework + spring-aop + ${org.springframework.version} + compile + + + org.springframework + spring-test + ${org.springframework.version} + test + + + org.springframework + spring-tx + ${org.springframework.version} + test + + + org.springframework.integration + spring-integration-core + ${project.version} + compile + + + org.springframework.security + spring-security-core + 2.0.5.RELEASE + compile + + diff --git a/org.springframework.integration.stream/pom.xml b/org.springframework.integration.stream/pom.xml index 8a0a0325c6..eea8c4d609 100644 --- a/org.springframework.integration.stream/pom.xml +++ b/org.springframework.integration.stream/pom.xml @@ -1,40 +1,42 @@ - - 4.0.0 - org.springframework.integration - spring-integration-stream - jar - Spring Integration Stream Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-core - ${spring.version} - compile - - - org.springframework - spring-test - ${spring.version} - test - - - org.springframework.integration - spring-integration-core - ${project.version} - compile - - + + 4.0.0 + org.springframework.integration + spring-integration-stream + jar + Spring Integration Stream Support + + org.springframework.integration + spring-integration-parent + 2.0.0.BUILD-SNAPSHOT + ../spring-integration-parent + + + + junit + junit + ${junit.version} + test + + + org.springframework + spring-core + ${org.springframework.version} + compile + + + org.springframework + spring-test + ${org.springframework.version} + test + + + org.springframework.integration + spring-integration-core + ${project.version} + compile + + diff --git a/org.springframework.integration.test/pom.xml b/org.springframework.integration.test/pom.xml index 49882fb243..b6b4c72cdb 100644 --- a/org.springframework.integration.test/pom.xml +++ b/org.springframework.integration.test/pom.xml @@ -1,51 +1,53 @@ - - 4.0.0 - org.springframework.integration - spring-integration-test - jar - Spring Integration Testing Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - - - - org.mockito - mockito-all - 1.8.0 - compile - - - org.hamcrest - hamcrest-all - 1.1 - - - org.easymock - easymock - 2.3 - test - - - junit - junit - ${junit.version} - compile - - - org.springframework - spring-test - ${spring.version} - test - - - org.springframework.integration - spring-integration-core - ${project.version} - compile - - + + 4.0.0 + org.springframework.integration + spring-integration-test + jar + Spring Integration Testing Support + + org.springframework.integration + spring-integration-parent + 2.0.0.BUILD-SNAPSHOT + ../spring-integration-parent + + + + org.mockito + mockito-all + ${org.mockito.version} + compile + + + org.hamcrest + hamcrest-all + 1.1 + + + org.easymock + easymock + ${org.easymock.version} + test + + + junit + junit + ${junit.version} + compile + + + org.springframework + spring-test + ${org.springframework.version} + test + + + org.springframework.integration + spring-integration-core + ${project.version} + compile + + diff --git a/org.springframework.integration.ws/pom.xml b/org.springframework.integration.ws/pom.xml index 025465633a..b205c9db71 100644 --- a/org.springframework.integration.ws/pom.xml +++ b/org.springframework.integration.ws/pom.xml @@ -1,76 +1,78 @@ - - 4.0.0 - org.springframework.integration - spring-integration-ws - jar - Spring Integration Web Services Support - - org.springframework.integration - spring-integration-parent - 2.0.0.BUILD-SNAPSHOT - ../spring-integration-parent - - - - com.sun.xml.messaging.saaj - saaj-impl - 1.3 - provided - - - javax.xml.soap - saaj-api - 1.3 - provided - - - stax - stax - 1.2.0 - provided - - - org.springframework.integration - spring-integration-core - ${project.version} - compile - - - org.springframework - spring-oxm - ${spring.version} - compile - - - org.springframework.ws - spring-ws-core - 1.5.8 - compile - - - org.springframework - spring-expression - ${spring.version} - compile - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-test - ${spring.version} - test - - - org.mockito - mockito-all - 1.6 - test - - + + 4.0.0 + org.springframework.integration + spring-integration-ws + jar + Spring Integration Web Services Support + + org.springframework.integration + spring-integration-parent + 2.0.0.BUILD-SNAPSHOT + ../spring-integration-parent + + + + com.sun.xml.messaging.saaj + saaj-impl + 1.3 + provided + + + javax.xml.soap + saaj-api + 1.3 + provided + + + stax + stax + 1.2.0 + provided + + + org.springframework.integration + spring-integration-core + ${project.version} + compile + + + org.springframework + spring-oxm + ${org.springframework.version} + compile + + + org.springframework.ws + spring-ws-core + 1.5.8 + compile + + + org.springframework + spring-expression + ${org.springframework.version} + compile + + + junit + junit + ${junit.version} + test + + + org.springframework + spring-test + ${org.springframework.version} + test + + + org.mockito + mockito-all + ${org.mockito.version} + test + + diff --git a/org.springframework.integration.xml/pom.xml b/org.springframework.integration.xml/pom.xml index 15de80bd8b..914af2ecef 100644 --- a/org.springframework.integration.xml/pom.xml +++ b/org.springframework.integration.xml/pom.xml @@ -63,13 +63,13 @@ org.springframework spring-context - ${spring.version} + ${org.springframework.version} compile org.springframework spring-test - ${spring.version} + ${org.springframework.version} test @@ -81,7 +81,7 @@ org.springframework spring-oxm - ${spring.version} + ${org.springframework.version} compile diff --git a/org.springframework.integration/pom.xml b/org.springframework.integration/pom.xml index cc622eca5e..9348d7d1a7 100644 --- a/org.springframework.integration/pom.xml +++ b/org.springframework.integration/pom.xml @@ -12,16 +12,16 @@ ../spring-integration-parent - + ${project.version} provided + cglib - cglib - 2.1_3 + cglib-nodep + ${cglib.version} test @@ -33,13 +33,13 @@ org.easymock easymock - 2.3 + ${org.easymock.version} test org.aspectj aspectjrt - 1.6.5 + ${org.aspectj.version} test true @@ -58,28 +58,28 @@ org.springframework spring-aop - ${spring.version} + ${org.springframework.version} org.springframework spring-context - ${spring.version} + ${org.springframework.version} org.springframework spring-tx - ${spring.version} + ${org.springframework.version} org.springframework spring-test - ${spring.version} + ${org.springframework.version} test org.mockito mockito-all - 1.8.0 + ${org.mockito.version} test diff --git a/spring-integration-parent/pom.xml b/spring-integration-parent/pom.xml index e5ac4df6b9..1586639ee2 100644 --- a/spring-integration-parent/pom.xml +++ b/spring-integration-parent/pom.xml @@ -4,16 +4,23 @@ org.springframework.integration spring-integration-parent 2.0.0.BUILD-SNAPSHOT - Spring Integration Parent + Spring Integration Parent http://www.springsource.org/spring-integration Spring Integration parent project. Defines dependencies and common configuration for the build process. pom UTF-8 - 3.4.2.v_883_R34x + + 2.2 4.7 - 3.0.2.RELEASE + 1.2.12 + 1.6.5 + 2.3 + 3.4.2.v_883_R34x + 1.8.4 + 1.5.10 + 3.0.2.RELEASE @@ -263,7 +270,7 @@ log4j log4j - 1.2.12 + ${log4j.version} test diff --git a/spring-integration-reference/src/spring-integration-reference.xml b/spring-integration-reference/src/spring-integration-reference.xml index daf1ee5ea2..63183d58a5 100644 --- a/spring-integration-reference/src/spring-integration-reference.xml +++ b/spring-integration-reference/src/spring-integration-reference.xml @@ -3,9 +3,7 @@ Spring Integration Reference Manual - Spring Integration 2.0.0 M4 - - + Spring Integration 2.0.0 M4 Spring Integration 2.0.0 Milestone 4 diff --git a/spring-integration-samples/cafe/pom.xml b/spring-integration-samples/cafe/pom.xml index 5ecb6766fd..32ca825625 100644 --- a/spring-integration-samples/cafe/pom.xml +++ b/spring-integration-samples/cafe/pom.xml @@ -1,14 +1,16 @@ - - - spring-integration-samples - org.springframework.integration - 2.0.0.BUILD-SNAPSHOT - - 4.0.0 - cafe - cafe - 2.0.0.BUILD-SNAPSHOT - + + + spring-integration-samples + org.springframework.integration + 2.0.0.BUILD-SNAPSHOT + + 4.0.0 + cafe + cafe + 2.0.0.BUILD-SNAPSHOT + Spring Integration Cafe Sample + org.eclipse.osgi org.eclipse.osgi @@ -44,4 +46,4 @@ - \ No newline at end of file + diff --git a/spring-integration-samples/errorhandling/pom.xml b/spring-integration-samples/errorhandling/pom.xml index 707acf1321..1c9a42f1dd 100644 --- a/spring-integration-samples/errorhandling/pom.xml +++ b/spring-integration-samples/errorhandling/pom.xml @@ -1,11 +1,13 @@ - - - spring-integration-samples - org.springframework.integration - 2.0.0.BUILD-SNAPSHOT - - 4.0.0 - errorhandling - errorhandling - 2.0.0.BUILD-SNAPSHOT - \ No newline at end of file + + + spring-integration-samples + org.springframework.integration + 2.0.0.BUILD-SNAPSHOT + + 4.0.0 + errorhandling + errorhandling + 2.0.0.BUILD-SNAPSHOT + Spring Integration Error Handling Sample + diff --git a/spring-integration-samples/filecopy/pom.xml b/spring-integration-samples/filecopy/pom.xml index 2243224adb..894175c59e 100644 --- a/spring-integration-samples/filecopy/pom.xml +++ b/spring-integration-samples/filecopy/pom.xml @@ -1,11 +1,13 @@ - - - spring-integration-samples - org.springframework.integration - 2.0.0.BUILD-SNAPSHOT - - 4.0.0 - filecopy - filecopy - 2.0.0.BUILD-SNAPSHOT - \ No newline at end of file + + + spring-integration-samples + org.springframework.integration + 2.0.0.BUILD-SNAPSHOT + + 4.0.0 + filecopy + filecopy + 2.0.0.BUILD-SNAPSHOT + Spring Integration File Copy Sample + diff --git a/spring-integration-samples/helloworld/pom.xml b/spring-integration-samples/helloworld/pom.xml index 1e4ac4cd4e..9eac4b750e 100644 --- a/spring-integration-samples/helloworld/pom.xml +++ b/spring-integration-samples/helloworld/pom.xml @@ -9,6 +9,7 @@ helloworld helloworld 2.0.0.BUILD-SNAPSHOT + Spring Integration Hello World Sample org.eclipse.osgi @@ -45,7 +46,4 @@ - - - - \ No newline at end of file + diff --git a/spring-integration-samples/jms/pom.xml b/spring-integration-samples/jms/pom.xml index 6efe473df7..06aea4e9f7 100644 --- a/spring-integration-samples/jms/pom.xml +++ b/spring-integration-samples/jms/pom.xml @@ -9,6 +9,7 @@ jms jms 2.0.0.BUILD-SNAPSHOT + Spring Integration JMS Sample javax.jms @@ -26,4 +27,4 @@ 1.0.1 - \ No newline at end of file + diff --git a/spring-integration-samples/jmx/pom.xml b/spring-integration-samples/jmx/pom.xml index e1b8781282..586321fac2 100644 --- a/spring-integration-samples/jmx/pom.xml +++ b/spring-integration-samples/jmx/pom.xml @@ -9,6 +9,7 @@ jmx jmx 2.0.0.BUILD-SNAPSHOT + Spring Integration JMX Sample org.springframework.integration @@ -16,4 +17,4 @@ 2.0.0.BUILD-SNAPSHOT - \ No newline at end of file + diff --git a/spring-integration-samples/loan-broker/pom.xml b/spring-integration-samples/loan-broker/pom.xml index e1e051c65e..e0e626dbfd 100644 --- a/spring-integration-samples/loan-broker/pom.xml +++ b/spring-integration-samples/loan-broker/pom.xml @@ -4,6 +4,7 @@ org.springframework.integration.samples loan-broker 1.0 + Spring Integration Loan Broker Sample org.springframework.integration @@ -19,12 +20,12 @@ org.springframework org.springframework.spring-library libd - 3.0.2.RELEASE + ${org.springframework.version} - org.junit - com.springsource.org.junit - 4.7.0 + junit + junit + ${junit.version} org.apache.commons @@ -33,16 +34,15 @@ org.mockito - com.springsource.org.mockito - 1.8.0 + mockito-all + ${org.mockito.version} - org.apache.log4j - com.springsource.org.apache.log4j - 1.2.15 + log4j + log4j + ${log4j.version} - @@ -72,8 +72,6 @@ - - com.springsource.repository.bundles.release @@ -110,11 +108,10 @@ SpringSource Enterprise Bundle Repository - SpringSource Library Releases http://repository.springsource.com/maven/libraries/release - com.springsource.repository.libraries.external SpringSource Enterprise Bundle Repository - External Library Releases http://repository.springsource.com/maven/libraries/external - \ No newline at end of file + diff --git a/spring-integration-samples/loanshark/pom.xml b/spring-integration-samples/loanshark/pom.xml index 229dcd7c08..bb636b24d7 100644 --- a/spring-integration-samples/loanshark/pom.xml +++ b/spring-integration-samples/loanshark/pom.xml @@ -5,8 +5,12 @@ loanshark war 0.1.0-SNAPSHOT - loanshark - + Spring Integration Loan Shark Sample + + 3.0.2.RELEASE + 2.0.0.M3 + 1.6.6.RELEASE + com.springsource.repository.bundles.release @@ -30,7 +34,6 @@ http://repository.springsource.com/maven/bundles/snapshot - com.springsource.repository.bundles.release @@ -46,9 +49,8 @@ com.springsource.repository.bundles.milestone SpringSource Enterprise Bundle Repository - External Bundle Milestones http://repository.springsource.com/maven/bundles/milestone - + - @@ -58,9 +60,9 @@ test - org.apache.log4j - com.springsource.org.apache.log4j - 1.2.15 + log4j + log4j + ${log4j.version} org.apache.commons @@ -70,7 +72,7 @@ org.aspectj com.springsource.org.aspectj.runtime - ${aspectj.version} + ${org.aspectj.version} javax.servlet @@ -89,187 +91,186 @@ org.springframework org.springframework.core - ${spring.version} + ${org.springframework.version} org.springframework org.springframework.test - ${spring.version} + ${org.springframework.version} test org.springframework org.springframework.context - ${spring.version} + ${org.springframework.version} org.springframework org.springframework.aop - ${spring.version} + ${org.springframework.version} org.springframework org.springframework.aspects - ${spring.version} + ${org.springframework.version} org.springframework org.springframework.transaction - ${spring.version} + ${org.springframework.version} - - org.hsqldb - com.springsource.org.hsqldb - 1.8.0.9 - - - org.hibernate - com.springsource.org.hibernate.annotations - 3.3.1.ga - - - org.hibernate - com.springsource.org.hibernate.ejb - 3.3.2.GA - - - net.sourceforge.ehcache - com.springsource.net.sf.ehcache - 1.4.1 - - - edu.emory.mathcs.backport - com.springsource.edu.emory.mathcs.backport - 3.1.0 - - - org.slf4j - com.springsource.slf4j.log4j - 1.5.6 - - - javax.persistence - com.springsource.javax.persistence - 1.0.0 - - - org.slf4j - com.springsource.slf4j.api - 1.5.6 - - - org.hibernate - com.springsource.org.hibernate.validator - 4.0.0.GA - - - org.slf4j - slf4j-api - - - - - javax.validation - com.springsource.javax.validation - 1.0.0.GA - - - javax.transaction - com.springsource.javax.transaction - 1.1.0 - - - org.apache.commons - com.springsource.org.apache.commons.dbcp - 1.2.2.osgi - - - org.springframework - org.springframework.jdbc - ${spring.version} - - - org.springframework - org.springframework.orm - ${spring.version} - - - org.springframework - org.springframework.web - ${spring.version} - - - org.springframework - org.springframework.web.servlet - ${spring.version} - - - org.springframework.webflow - org.springframework.js - 2.0.8.RELEASE - - - org.apache.commons - com.springsource.org.apache.commons.fileupload - 1.2.0 - - - org.tuckey - com.springsource.org.tuckey.web.filters.urlrewrite - 3.1.0 - - - javax.servlet - com.springsource.javax.servlet.jsp.jstl - 1.2.0 - - - org.apache.el - com.springsource.org.apache.el - 6.0.20 - - - org.joda - com.springsource.org.joda.time - 1.6.0 - - - org.apache.tiles - com.springsource.org.apache.tiles - 2.1.3 - - - org.apache.tiles - com.springsource.org.apache.tiles.jsp - 2.1.3 - - - org.apache.tiles - com.springsource.org.apache.tiles.core - 2.1.3 - - - org.springframework - org.springframework.expression - ${spring.version} - - - org.springframework.integration - org.springframework.integration - 2.0.0.M3 - - - org.springframework.integration - org.springframework.integration.ip - 2.0.0.M3 - - - org.springframework.integration - org.springframework.integration.adapter - 2.0.0.M3 - - - + + org.hsqldb + com.springsource.org.hsqldb + 1.8.0.9 + + + org.hibernate + com.springsource.org.hibernate.annotations + 3.3.2.GA + + + org.hibernate + com.springsource.org.hibernate.ejb + 3.3.2.GA + + + net.sourceforge.ehcache + com.springsource.net.sf.ehcache + 1.4.1 + + + edu.emory.mathcs.backport + com.springsource.edu.emory.mathcs.backport + 3.1.0 + + + org.slf4j + com.springsource.slf4j.log4j + 1.5.6 + + + javax.persistence + com.springsource.javax.persistence + 1.0.0 + + + org.slf4j + com.springsource.slf4j.api + 1.5.6 + + + org.hibernate + com.springsource.org.hibernate.validator + 4.0.0.GA + + + org.slf4j + slf4j-api + + + + + javax.validation + com.springsource.javax.validation + 1.0.0.GA + + + javax.transaction + com.springsource.javax.transaction + 1.1.0 + + + org.apache.commons + com.springsource.org.apache.commons.dbcp + 1.2.2.osgi + + + org.springframework + org.springframework.jdbc + ${org.springframework.version} + + + org.springframework + org.springframework.orm + ${org.springframework.version} + + + org.springframework + org.springframework.web + ${org.springframework.version} + + + org.springframework + org.springframework.web.servlet + ${org.springframework.version} + + + org.springframework.webflow + org.springframework.js + 2.0.8.RELEASE + + + org.apache.commons + com.springsource.org.apache.commons.fileupload + 1.2.0 + + + org.tuckey + com.springsource.org.tuckey.web.filters.urlrewrite + 3.1.0 + + + javax.servlet + com.springsource.javax.servlet.jsp.jstl + 1.2.0 + + + org.apache.el + com.springsource.org.apache.el + 6.0.20 + + + org.joda + com.springsource.org.joda.time + 1.6.0 + + + org.apache.tiles + com.springsource.org.apache.tiles + 2.1.3 + + + org.apache.tiles + com.springsource.org.apache.tiles.jsp + 2.1.3 + + + org.apache.tiles + com.springsource.org.apache.tiles.core + 2.1.3 + + + org.springframework + org.springframework.expression + ${org.springframework.version} + + + org.springframework.integration + org.springframework.integration + ${org.springframework.integration.version} + + + org.springframework.integration + org.springframework.integration.ip + ${org.springframework.integration.version} + + + org.springframework.integration + org.springframework.integration.adapter + ${org.springframework.integration.version} + + @@ -298,12 +299,12 @@ org.aspectj com.springsource.org.aspectj.runtime - ${aspectj.version} + ${org.aspectj.version} org.aspectj com.springsource.org.aspectj.tools - ${aspectj.version} + ${org.aspectj.version} @@ -402,9 +403,4 @@ - - - 3.0.2.RELEASE - 1.6.6.RELEASE - diff --git a/spring-integration-samples/oddeven/pom.xml b/spring-integration-samples/oddeven/pom.xml index 57c61adc69..bc124535aa 100644 --- a/spring-integration-samples/oddeven/pom.xml +++ b/spring-integration-samples/oddeven/pom.xml @@ -1,11 +1,13 @@ - - - spring-integration-samples - org.springframework.integration - 2.0.0.BUILD-SNAPSHOT - - 4.0.0 - oddeven - oddeven - 2.0.0.BUILD-SNAPSHOT - \ No newline at end of file + + + spring-integration-samples + org.springframework.integration + 2.0.0.BUILD-SNAPSHOT + + 4.0.0 + oddeven + oddeven + 2.0.0.BUILD-SNAPSHOT + Spring Integration Odd-Even Sample + diff --git a/spring-integration-samples/pom.xml b/spring-integration-samples/pom.xml index 39f0a11618..40b735977d 100644 --- a/spring-integration-samples/pom.xml +++ b/spring-integration-samples/pom.xml @@ -9,8 +9,12 @@ pom Spring Integration Samples + UTF-8 + 2.0.0.BUILD-SNAPSHOT - 3.0.2.RELEASE + 4.7 + 1.2.12 + 3.0.2.RELEASE cafe @@ -20,10 +24,10 @@ jms oddeven quote + ws-inbound-gateway ws-outbound-gateway xml - org.springframework.integration @@ -86,9 +90,9 @@ ${release.version} - org.apache.log4j - com.springsource.org.apache.log4j - 1.2.15 + log4j + log4j + ${log4j.version} @@ -117,6 +121,20 @@ 1.5 + + org.apache.maven.plugins + maven-surefire-plugin + + false + + **/*Tests.java + + + **/Abstract*.java + + junit:junit + + @@ -147,7 +165,6 @@ - com.springsource.repository.bundles.release @@ -170,5 +187,4 @@ http://repository.springsource.com/maven/bundles/snapshot - diff --git a/spring-integration-samples/quote/pom.xml b/spring-integration-samples/quote/pom.xml index d6cce12f02..c358c84431 100644 --- a/spring-integration-samples/quote/pom.xml +++ b/spring-integration-samples/quote/pom.xml @@ -1,11 +1,13 @@ - - - spring-integration-samples - org.springframework.integration - 2.0.0.BUILD-SNAPSHOT - - 4.0.0 - quote - quote - 2.0.0.BUILD-SNAPSHOT - \ No newline at end of file + + + spring-integration-samples + org.springframework.integration + 2.0.0.BUILD-SNAPSHOT + + 4.0.0 + quote + quote + 2.0.0.BUILD-SNAPSHOT + Spring Integration Quote Sample + diff --git a/spring-integration-samples/ws-inbound-gateway/pom.xml b/spring-integration-samples/ws-inbound-gateway/pom.xml index 7e3572f707..d2250f265a 100644 --- a/spring-integration-samples/ws-inbound-gateway/pom.xml +++ b/spring-integration-samples/ws-inbound-gateway/pom.xml @@ -11,11 +11,12 @@ ws-inbound-gateway 2.0.0.BUILD-SNAPSHOT war + Spring Integration WS Inbound Gateway Sample org.springframework spring-test - ${spring.framework.version} + ${org.springframework.version} test @@ -26,7 +27,7 @@ junit junit - 4.7 + ${junit.version} test diff --git a/spring-integration-samples/ws-outbound-gateway/pom.xml b/spring-integration-samples/ws-outbound-gateway/pom.xml index f59ec1a239..7e6d03da40 100644 --- a/spring-integration-samples/ws-outbound-gateway/pom.xml +++ b/spring-integration-samples/ws-outbound-gateway/pom.xml @@ -9,6 +9,7 @@ ws-outbound-gateway ws-outbound-gateway 2.0.0.BUILD-SNAPSHOT + Spring Integration WS Outbound Gateway Sample javax.xml.soap @@ -26,5 +27,4 @@ 1.1.1 - - \ No newline at end of file + diff --git a/spring-integration-samples/xml/pom.xml b/spring-integration-samples/xml/pom.xml index 6fc74998fb..a44522e30e 100644 --- a/spring-integration-samples/xml/pom.xml +++ b/spring-integration-samples/xml/pom.xml @@ -1,11 +1,13 @@ - - - spring-integration-samples - org.springframework.integration - 2.0.0.BUILD-SNAPSHOT - - 4.0.0 - xml - xml - 2.0.0.BUILD-SNAPSHOT - \ No newline at end of file + + + spring-integration-samples + org.springframework.integration + 2.0.0.BUILD-SNAPSHOT + + 4.0.0 + xml + xml + 2.0.0.BUILD-SNAPSHOT + Spring Integration XML Sample +