diff --git a/.gitignore b/.gitignore index 24d5744265..ebde708128 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +lib target .springBeans .settings diff --git a/pom.xml b/pom.xml index 420e22e85a..72026ca00b 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,17 @@ spring-integration-stream spring-integration-ws spring-integration-xml + + spring-integration-samples UTF-8 2.2 + 1.1.1 4.7 1.2.12 + 1.8.0.10 1.6.5 2.3 3.4.2.v_883_R34x @@ -87,8 +91,7 @@ - ${project.basedir}/src/main/java - + ${project.basedir}/src/main/java **/* @@ -97,8 +100,7 @@ - ${project.basedir}/src/main/resources - + ${project.basedir}/src/main/resources **/* @@ -355,7 +357,7 @@ commons-logging commons-logging - 1.1.1 + ${commons-logging.version} org.apache.ws.commons.schema diff --git a/spring-integration-core/.project b/spring-integration-core/.project index bb91dc7cf7..3e9ddcae9a 100644 --- a/spring-integration-core/.project +++ b/spring-integration-core/.project @@ -5,6 +5,11 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder @@ -25,5 +30,6 @@ org.maven.ide.eclipse.maven2Nature org.springframework.ide.eclipse.core.springnature org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature diff --git a/spring-integration-jdbc/pom.xml b/spring-integration-jdbc/pom.xml index 9ba3c57708..b15f144d24 100644 --- a/spring-integration-jdbc/pom.xml +++ b/spring-integration-jdbc/pom.xml @@ -52,7 +52,7 @@ hsqldb hsqldb - 1.8.0.7 + ${hsqldb.version} test diff --git a/spring-integration-samples/README.txt b/spring-integration-samples/README.txt index 11f1e5cb6e..1b34c49ccb 100644 --- a/spring-integration-samples/README.txt +++ b/spring-integration-samples/README.txt @@ -1,38 +1,40 @@ Instructions for building the samples using Maven (http://maven.apache.org) -NOTE: this requires Maven 2.0.9 or later +NOTE: this requires Maven 2.1.0 or later ------------------------------------------------------------------------------- 1. Open a command prompt and navigate to the 'samples' directory within the root of the project distribution: - #> cd samples - + #> cd spring-integration-samples + 2. Build the samples and install them into your local Maven repository: #> mvn install - + You should see output similar to the following: . . . . +[INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] ------------------------------------------------------------------------ -[INFO] Spring Integration Samples ............................ SUCCESS [2.910s] -[INFO] Unnamed - cafe:cafe:jar:2.0.0 ......................... SUCCESS [2.750s] -[INFO] Unnamed - errorhandling:errorhandling:jar:2.0.0 ....... SUCCESS [1.427s] -[INFO] Unnamed - filecopy:filecopy:jar:2.0.0 ................. SUCCESS [1.257s] -[INFO] Unnamed - helloworld:helloworld:jar:2.0.0 ............. SUCCESS [0.943s] -[INFO] Unnamed - jms:jms:jar:2.0.0 ........................... SUCCESS [0.801s] -[INFO] Unnamed - oddeven:oddeven:jar:2.0.0 ................... SUCCESS [1.009s] -[INFO] Unnamed - quote:quote:jar:2.0.0 ....................... SUCCESS [0.697s] -[INFO] Unnamed - ws:ws:jar:2.0.0 ............................. SUCCESS [0.714s] -[INFO] Unnamed - xml:xml:jar:2.0.0 ........................... SUCCESS [0.690s] +[INFO] Spring Integration Samples ............................ SUCCESS [2.765s] +[INFO] Spring Integration Cafe Sample ........................ SUCCESS [19.351s] +[INFO] Spring Integration Error Handling Sample .............. SUCCESS [1.149s] +[INFO] Spring Integration File Copy Sample ................... SUCCESS [0.829s] +[INFO] Spring Integration Hello World Sample ................. SUCCESS [0.838s] +[INFO] Spring Integration JMS Sample ......................... SUCCESS [0.853s] +[INFO] Spring Integration Odd-Even Sample .................... SUCCESS [1.026s] +[INFO] Spring Integration Quote Sample ....................... SUCCESS [0.753s] +[INFO] Spring Integration WS Inbound Gateway Sample .......... SUCCESS [5.017s] +[INFO] Spring Integration WS Outbound Gateway Sample ......... SUCCESS [1.135s] +[INFO] Spring Integration XML Sample ......................... SUCCESS [0.823s] [INFO] ------------------------------------------------------------------------ [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESSFUL [INFO] ------------------------------------------------------------------------ -[INFO] Total time: 13 seconds +[INFO] Total time: 35 seconds . . . . -Once you see BUILD SUCCESSFUL, you are ready to start working with samples. +Once you see BUILD SUCCESSFUL, you are ready to start working with the samples. You can do so in one of two ways: @@ -51,7 +53,7 @@ Maven profile which will copy all project dependencies (JARs) in the 'lib' directory of each project: #> mvn install -P classpath - + Open any project and you will see the 'lib' directory with all of the JARs required to run the demos. Now you can configure your IDE to point to those directories. diff --git a/spring-integration-samples/cafe/pom.xml b/spring-integration-samples/cafe/pom.xml index 32ca825625..a90850bfb3 100644 --- a/spring-integration-samples/cafe/pom.xml +++ b/spring-integration-samples/cafe/pom.xml @@ -1,14 +1,12 @@ + 4.0.0 + org.springframework.integration.samples 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 diff --git a/spring-integration-samples/errorhandling/pom.xml b/spring-integration-samples/errorhandling/pom.xml index 1c9a42f1dd..fbe0d95550 100644 --- a/spring-integration-samples/errorhandling/pom.xml +++ b/spring-integration-samples/errorhandling/pom.xml @@ -1,13 +1,11 @@ + 4.0.0 + org.springframework.integration.samples 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 894175c59e..5116678e0b 100644 --- a/spring-integration-samples/filecopy/pom.xml +++ b/spring-integration-samples/filecopy/pom.xml @@ -1,13 +1,11 @@ + 4.0.0 + org.springframework.integration.samples 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/README.txt b/spring-integration-samples/helloworld/README.txt index f5233d2584..f46df4fa66 100644 --- a/spring-integration-samples/helloworld/README.txt +++ b/spring-integration-samples/helloworld/README.txt @@ -5,5 +5,5 @@ Instructions for running the HelloWorldDemo sample 2. To run this sample as a standalone application simply execute the HelloWorldDemo class that is located within the org.springframework.integration.samples.helloworld package. - -Happy integration :-) \ No newline at end of file + +Happy integration :-) diff --git a/spring-integration-samples/helloworld/pom.xml b/spring-integration-samples/helloworld/pom.xml index 9eac4b750e..522a88db46 100644 --- a/spring-integration-samples/helloworld/pom.xml +++ b/spring-integration-samples/helloworld/pom.xml @@ -1,11 +1,11 @@ + 4.0.0 + org.springframework.integration.samples spring-integration-samples - org.springframework.integration 2.0.0.BUILD-SNAPSHOT - 4.0.0 helloworld helloworld 2.0.0.BUILD-SNAPSHOT @@ -18,18 +18,6 @@ - - - org.apache.maven.plugins - maven-jar-plugin - 2.2 - - - src/main/resources/META-INF/MANIFEST.MF - - - - ${basedir}/src/main/java diff --git a/spring-integration-samples/jms/pom.xml b/spring-integration-samples/jms/pom.xml index 06aea4e9f7..b83e790dfd 100644 --- a/spring-integration-samples/jms/pom.xml +++ b/spring-integration-samples/jms/pom.xml @@ -1,30 +1,18 @@ + 4.0.0 + org.springframework.integration.samples spring-integration-samples - org.springframework.integration 2.0.0.BUILD-SNAPSHOT - 4.0.0 - jms jms - 2.0.0.BUILD-SNAPSHOT Spring Integration JMS Sample - - javax.jms - com.springsource.javax.jms - 1.1.0 - org.apache.activemq - com.springsource.org.apache.activemq + activemq-core 5.2.0 - - org.apache.geronimo.specs - com.springsource.javax.management.j2ee - 1.0.1 - diff --git a/spring-integration-samples/jmx/pom.xml b/spring-integration-samples/jmx/pom.xml index 586321fac2..e613b44da4 100644 --- a/spring-integration-samples/jmx/pom.xml +++ b/spring-integration-samples/jmx/pom.xml @@ -1,20 +1,11 @@ + 4.0.0 + org.springframework.integration.samples spring-integration-samples - org.springframework.integration 2.0.0.BUILD-SNAPSHOT - 4.0.0 - jmx jmx - 2.0.0.BUILD-SNAPSHOT Spring Integration JMX Sample - - - org.springframework.integration - org.springframework.integration.jmx - 2.0.0.BUILD-SNAPSHOT - - diff --git a/spring-integration-samples/loan-broker/pom.xml b/spring-integration-samples/loan-broker/pom.xml index e0e626dbfd..607a7e042e 100644 --- a/spring-integration-samples/loan-broker/pom.xml +++ b/spring-integration-samples/loan-broker/pom.xml @@ -1,66 +1,27 @@ 4.0.0 - org.springframework.integration.samples + + org.springframework.integration.samples + spring-integration-samples + 2.0.0.BUILD-SNAPSHOT + loan-broker - 1.0 Spring Integration Loan Broker Sample - org.springframework.integration - org.springframework.integration - 2.0.0.BUILD-SNAPSHOT - - - org.springframework.integration - org.springframework.integration.ip - 2.0.0.BUILD-SNAPSHOT - - - org.springframework - org.springframework.spring-library - libd - ${org.springframework.version} - - - junit - junit - ${junit.version} - - - org.apache.commons - com.springsource.org.apache.commons.logging - 1.1.1 + commons-logging + commons-logging + ${commons-logging.version} org.mockito mockito-all ${org.mockito.version} - - log4j - log4j - ${log4j.version} - - - org.apache.maven.plugins - maven-surefire-plugin - - org.junit:com.springsource.org.junit - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.5 - 1.5 - - org.apache.maven.plugins maven-surefire-plugin @@ -72,46 +33,4 @@ - - - com.springsource.repository.bundles.release - EBR Spring Release Repository - http://repository.springsource.com/maven/bundles/release - - - com.springsource.repository.bundles.external - EBR External Release Repository - http://repository.springsource.com/maven/bundles/external - - - org.springframework.maven.milestone - Maven Central Compatible Spring Milestone Repository - http://maven.springframework.org/milestone - - - com.springsource.repository.bundles.milestone - EBR Spring Milestone Repository - http://repository.springsource.com/maven/bundles/milestone - - - org.springframework.maven.snapshot - Maven Central Compatible Spring Snapshot Repository - http://maven.springframework.org/snapshot - - - com.springsource.repository.bundles.snapshot - EBR Spring Snapshot Repository - http://repository.springsource.com/maven/bundles/snapshot - - - com.springsource.repository.libraries.release - 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 - - diff --git a/spring-integration-samples/loanshark/pom.xml b/spring-integration-samples/loanshark/pom.xml index bb636b24d7..210cbc0d1d 100644 --- a/spring-integration-samples/loanshark/pom.xml +++ b/spring-integration-samples/loanshark/pom.xml @@ -1,167 +1,128 @@ 4.0.0 - com.springframework.integration.loanbroker.loanshark + + org.springframework.integration.samples + spring-integration-samples + 2.0.0.BUILD-SNAPSHOT + loanshark - war - 0.1.0-SNAPSHOT Spring Integration Loan Shark Sample - - 3.0.2.RELEASE - 2.0.0.M3 - 1.6.6.RELEASE - - - - com.springsource.repository.bundles.release - SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases - http://repository.springsource.com/maven/bundles/release - - - com.springsource.repository.bundles.external - SpringSource Enterprise Bundle Repository - External Bundle Releases - http://repository.springsource.com/maven/bundles/external - - - com.springsource.repository.bundles.milestone - SpringSource Enterprise Bundle Repository - External Bundle Milestones - http://repository.springsource.com/maven/bundles/milestone - - - - com.springsource.repository.bundles.snapshot - SpringSource Enterprise Bundle Repository - External Bundle Snapshots - http://repository.springsource.com/maven/bundles/snapshot - - - - - com.springsource.repository.bundles.release - SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases - http://repository.springsource.com/maven/bundles/release - - - com.springsource.repository.bundles.external - SpringSource Enterprise Bundle Repository - External Bundle Releases - http://repository.springsource.com/maven/bundles/external - - - com.springsource.repository.bundles.milestone - SpringSource Enterprise Bundle Repository - External Bundle Milestones - http://repository.springsource.com/maven/bundles/milestone - - + war - - org.junit - com.springsource.org.junit - 4.7.0 - test - - - log4j - log4j - ${log4j.version} - - - org.apache.commons - com.springsource.org.apache.commons.logging - 1.1.1 + commons-logging + commons-logging + ${commons-logging.version} org.aspectj - com.springsource.org.aspectj.runtime + aspectjrt ${org.aspectj.version} javax.servlet - com.springsource.javax.servlet - 2.5.0 + servlet-api + 2.5 provided - + org.springframework.roo org.springframework.roo.annotations 1.0.2.RELEASE provided - org.springframework - org.springframework.core + spring-core ${org.springframework.version} org.springframework - org.springframework.test + spring-aspects + ${org.springframework.version} + + + org.springframework + spring-test ${org.springframework.version} test org.springframework - org.springframework.context + spring-context ${org.springframework.version} org.springframework - org.springframework.aop + spring-aop ${org.springframework.version} org.springframework - org.springframework.aspects + spring-tx ${org.springframework.version} org.springframework - org.springframework.transaction + spring-jdbc ${org.springframework.version} - org.hsqldb - com.springsource.org.hsqldb - 1.8.0.9 + org.springframework + spring-orm + ${org.springframework.version} + + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + + + hsqldb + hsqldb + ${hsqldb.version} org.hibernate - com.springsource.org.hibernate.annotations - 3.3.2.GA + 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 + net.sf.ehcache + ehcache 1.4.1 - edu.emory.mathcs.backport - com.springsource.edu.emory.mathcs.backport - 3.1.0 + backport-util-concurrent + backport-util-concurrent + 3.1 org.slf4j - com.springsource.slf4j.log4j + slf4j-api + 1.5.6 + + + org.slf4j + slf4j-log4j12 1.5.6 javax.persistence - com.springsource.javax.persistence - 1.0.0 - - - org.slf4j - com.springsource.slf4j.api - 1.5.6 + persistence-api + 1.0 + org.hibernate - com.springsource.org.hibernate.validator + hibernate-validator 4.0.0.GA @@ -172,104 +133,84 @@ javax.validation - com.springsource.javax.validation + validation-api 1.0.0.GA javax.transaction - com.springsource.javax.transaction - 1.1.0 + transaction-api + 1.1 - 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} + commons-dbcp + commons-dbcp + 1.2.2 org.springframework.webflow org.springframework.js 2.0.8.RELEASE + + + org.springframework + org.springframework.context + + + org.springframework + org.springframework.web + + + org.apache.commons + com.springsource.org.apache.commons.logging + + - org.apache.commons - com.springsource.org.apache.commons.fileupload - 1.2.0 + commons-fileupload + commons-fileupload + 1.2 org.tuckey - com.springsource.org.tuckey.web.filters.urlrewrite + urlrewritefilter 3.1.0 - javax.servlet - com.springsource.javax.servlet.jsp.jstl - 1.2.0 + + javax.servlet.jsp.jstl + jstl-api + 1.2 - org.apache.el - com.springsource.org.apache.el + org.apache.tomcat + el-api 6.0.20 - org.joda - com.springsource.org.joda.time - 1.6.0 + joda-time + joda-time + 1.6 org.apache.tiles - com.springsource.org.apache.tiles + tiles-api 2.1.3 org.apache.tiles - com.springsource.org.apache.tiles.jsp + tiles-jsp 2.1.3 org.apache.tiles - com.springsource.org.apache.tiles.core + tiles-core 2.1.3 org.springframework - org.springframework.expression + spring-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} - @@ -277,9 +218,6 @@ org.apache.maven.plugins maven-war-plugin 2.0.2 - org.apache.maven.plugins @@ -298,12 +236,12 @@ org.aspectj - com.springsource.org.aspectj.runtime + aspectjrt ${org.aspectj.version} org.aspectj - com.springsource.org.aspectj.tools + aspectjtools ${org.aspectj.version} @@ -320,7 +258,7 @@ org.springframework - org.springframework.aspects + spring-aspects 1.6 @@ -332,7 +270,6 @@ maven-surefire-plugin 2.4.3 - org.junit:com.springsource.org.junit **/*_Roo_* @@ -403,4 +340,27 @@ + + + + repository.springsource.release + SpringSource EBR + http://repository.springsource.com/maven/bundles/release + + + + repository.jboss + JBoss Repository + http://repository.jboss.org/maven2 + true + false + + + + repository.glassfish + Glassfish Repository + http://download.java.net/maven/glassfish + false + + diff --git a/spring-integration-samples/oddeven/pom.xml b/spring-integration-samples/oddeven/pom.xml index bc124535aa..f8477d1d18 100644 --- a/spring-integration-samples/oddeven/pom.xml +++ b/spring-integration-samples/oddeven/pom.xml @@ -1,13 +1,11 @@ + 4.0.0 + org.springframework.integration.samples 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 40b735977d..a9a3004255 100644 --- a/spring-integration-samples/pom.xml +++ b/spring-integration-samples/pom.xml @@ -3,25 +3,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - org.springframework.integration + + org.springframework.integration + spring-integration + 2.0.0.BUILD-SNAPSHOT + + org.springframework.integration.samples spring-integration-samples - 2.0.0.BUILD-SNAPSHOT pom Spring Integration Samples - - UTF-8 - - 2.0.0.BUILD-SNAPSHOT - 4.7 - 1.2.12 - 3.0.2.RELEASE - cafe errorhandling filecopy helloworld jms + jmx + loan-broker + loanshark oddeven quote ws-inbound-gateway @@ -31,63 +30,73 @@ org.springframework.integration - org.springframework.integration - ${release.version} + spring-integration-core + ${project.version} org.springframework.integration - org.springframework.integration.event - ${release.version} + spring-integration-event + ${project.version} org.springframework.integration - org.springframework.integration.file - ${release.version} + spring-integration-file + ${project.version} org.springframework.integration - org.springframework.integration.http - ${release.version} + spring-integration-http + ${project.version} org.springframework.integration - org.springframework.integration.httpinvoker - ${release.version} + spring-integration-httpinvoker + ${project.version} org.springframework.integration - org.springframework.integration.jms - ${release.version} + spring-integration-ip + ${project.version} org.springframework.integration - org.springframework.integration.mail - ${release.version} + spring-integration-jms + ${project.version} org.springframework.integration - org.springframework.integration.rmi - ${release.version} + spring-integration-mail + ${project.version} org.springframework.integration - org.springframework.integration.security - ${release.version} + spring-integration-rmi + ${project.version} org.springframework.integration - org.springframework.integration.stream - ${release.version} + spring-integration-security + ${project.version} org.springframework.integration - org.springframework.integration.ws - ${release.version} + spring-integration-stream + ${project.version} org.springframework.integration - org.springframework.integration.xml - ${release.version} + spring-integration-test + ${project.version} + + + org.springframework.integration + spring-integration-ws + ${project.version} + + + org.springframework.integration + spring-integration-xml + ${project.version} log4j @@ -95,48 +104,6 @@ ${log4j.version} - - - - src/main/java - - **/*.xml - **/*.xsl - **/*.dtd - - - - - - org.apache.maven.plugins - maven-reactor-plugin - 1.0 - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - **/*Tests.java - - - **/Abstract*.java - - junit:junit - - - - classpath @@ -165,26 +132,4 @@ - - - com.springsource.repository.bundles.release - SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases - http://repository.springsource.com/maven/bundles/release - - - com.springsource.repository.bundles.external - SpringSource Enterprise Bundle Repository - External Bundle Releases - http://repository.springsource.com/maven/bundles/external - - - com.springsource.repository.bundles.milestone - SpringSource Enterprise Bundle Repository - External Bundle Milestones - http://repository.springsource.com/maven/bundles/milestone - - - com.springsource.repository.bundles.snapshot - SpringSource Enterprise Bundle Repository - External Bundle Snapshots - http://repository.springsource.com/maven/bundles/snapshot - - diff --git a/spring-integration-samples/quote/pom.xml b/spring-integration-samples/quote/pom.xml index c358c84431..8a219f597a 100644 --- a/spring-integration-samples/quote/pom.xml +++ b/spring-integration-samples/quote/pom.xml @@ -1,13 +1,11 @@ + 4.0.0 + org.springframework.integration.samples 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 ae150b321f..0bfed08fea 100644 --- a/spring-integration-samples/ws-inbound-gateway/pom.xml +++ b/spring-integration-samples/ws-inbound-gateway/pom.xml @@ -1,17 +1,15 @@ + 4.0.0 + org.springframework.integration.samples spring-integration-samples - org.springframework.integration 2.0.0.BUILD-SNAPSHOT - 4.0.0 - ws-inbound-gateway ws-inbound-gateway - 2.0.0.BUILD-SNAPSHOT - war Spring Integration WS Inbound Gateway Sample + war org.springframework @@ -24,12 +22,6 @@ smackx 3.1.0 - - junit - junit - ${junit.version} - test - diff --git a/spring-integration-samples/ws-outbound-gateway/pom.xml b/spring-integration-samples/ws-outbound-gateway/pom.xml index 7e6d03da40..c5f4112ced 100644 --- a/spring-integration-samples/ws-outbound-gateway/pom.xml +++ b/spring-integration-samples/ws-outbound-gateway/pom.xml @@ -1,29 +1,22 @@ + 4.0.0 + org.springframework.integration.samples spring-integration-samples - org.springframework.integration 2.0.0.BUILD-SNAPSHOT - 4.0.0 - ws-outbound-gateway ws-outbound-gateway - 2.0.0.BUILD-SNAPSHOT Spring Integration WS Outbound Gateway Sample - javax.xml.soap - com.springsource.javax.xml.soap - 1.3.0 - - - com.sun.xml - com.springsource.com.sun.xml.messaging.saaj - 1.3.0 + com.sun.xml.messaging.saaj + saaj-impl + 1.3 javax.activation - com.springsource.javax.activation + activation 1.1.1 diff --git a/spring-integration-samples/xml/pom.xml b/spring-integration-samples/xml/pom.xml index a44522e30e..c006623dfb 100644 --- a/spring-integration-samples/xml/pom.xml +++ b/spring-integration-samples/xml/pom.xml @@ -1,13 +1,11 @@ + 4.0.0 + org.springframework.integration.samples 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