From fc705ef422f25ff95ed571af4724f1ab866cd06f Mon Sep 17 00:00:00 2001 From: Gunnar Hillert Date: Tue, 4 Dec 2012 14:31:00 -0500 Subject: [PATCH] INTSAMPLES-99 Upgrade samples to SI 2.2.0.RELEASE For reference see: https://jira.springsource.org/browse/INTSAMPLES-99 --- advanced/advanced-testing-examples/pom.xml | 2 +- advanced/dynamic-ftp/pom.xml | 2 +- advanced/pom.xml | 6 +-- applications/cafe-scripted/pom.xml | 2 +- applications/cafe/pom.xml | 2 +- applications/loan-broker/pom.xml | 2 +- applications/pom.xml | 8 +-- basic/amqp/pom.xml | 2 +- basic/control-bus/pom.xml | 2 +- basic/enricher/pom.xml | 2 +- basic/file/pom.xml | 2 +- basic/ftp/pom.xml | 2 +- basic/helloworld/pom.xml | 2 +- basic/http/pom.xml | 2 +- basic/jdbc/pom.xml | 2 +- basic/jms/pom.xml | 2 +- basic/jmx/pom.xml | 2 +- basic/jpa/pom.xml | 2 +- basic/mail/pom.xml | 2 +- basic/mongodb/pom.xml | 2 +- basic/oddeven/pom.xml | 2 +- basic/quote/pom.xml | 2 +- basic/sftp/pom.xml | 2 +- basic/tcp-amqp/pom.xml | 2 +- basic/tcp-client-server/pom.xml | 2 +- basic/testing-examples/pom.xml | 2 +- basic/twitter/pom.xml | 2 +- basic/ws-inbound-gateway/pom.xml | 2 +- basic/ws-outbound-gateway/pom.xml | 2 +- basic/xml/pom.xml | 2 +- basic/xmpp/pom.xml | 2 +- basic/xquery/pom.xml | 2 +- intermediate/async-gateway/pom.xml | 2 +- intermediate/dynamic-poller/pom.xml | 2 +- intermediate/errorhandling/pom.xml | 2 +- intermediate/file-processing/pom.xml | 2 +- intermediate/mail-attachments/pom.xml | 2 +- intermediate/monitoring/pom.xml | 2 +- intermediate/multipart-http/pom.xml | 2 +- intermediate/pom.xml | 20 +++---- intermediate/rest-http/pom.xml | 2 +- intermediate/retry-and-more/pom.xml | 2 +- intermediate/stored-procedures-derby/pom.xml | 2 +- intermediate/stored-procedures-ms/pom.xml | 2 +- intermediate/stored-procedures-oracle/pom.xml | 2 +- .../stored-procedures-postgresql/pom.xml | 2 +- .../tcp-client-server-multiplex/pom.xml | 2 +- intermediate/travel/pom.xml | 2 +- intermediate/tx-synch/pom.xml | 2 +- pom.xml | 54 +++++++++---------- 50 files changed, 90 insertions(+), 90 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 449eed81..82f31be3 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -9,7 +9,7 @@ jar UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 3.1.3.RELEASE 1.2.16 4.10 diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 6d268038..fa288599 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -8,7 +8,7 @@ UTF-8 3.1.3.RELEASE - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/advanced/pom.xml b/advanced/pom.xml index ac62d465..1d199369 100644 --- a/advanced/pom.xml +++ b/advanced/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.springframework.integration.samples + org.springframework.integration.samples advanced-samples 2.2.0.BUILD-SNAPSHOT Spring Integration Samples - Advanced pom - advanced-testing-examples - dynamic-ftp + advanced-testing-examples + dynamic-ftp diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 1f124684..a304949e 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -8,7 +8,7 @@ Samples (Applications) - Cafe Sample (Scripted Implementation) UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 3.1.3.RELEASE 1.2.17 4.10 diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index fe0d9eb2..da23dd45 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -21,7 +21,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 3.1.3.RELEASE 1.2.17 4.10 diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index a2a30010..fec7051c 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -8,7 +8,7 @@ Samples (Applications) - Loan Broker UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.1.1 1.2.17 4.10 diff --git a/applications/pom.xml b/applications/pom.xml index 7dcb6c70..0c9b8e90 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -3,16 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.springframework.integration.samples + org.springframework.integration.samples applications 2.2.0.BUILD-SNAPSHOT Spring Integration Samples - Applications pom - cafe - loan-broker - loanshark + cafe + loan-broker + loanshark diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index becb2293..32ea4a8d 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 8a05d34f..5add2bf4 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index b71b8bc6..6f13427d 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/basic/file/pom.xml b/basic/file/pom.xml index a67b8240..652345d4 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index f1d24bdd..1d8dff9f 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index b9a3e6de..e8242a6f 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 org.springframework.integration.samples.helloworld.HelloWorldApp diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 8c5b372e..bdd5efcc 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 3.1.3.RELEASE 1.2.2 1.3.2 diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index be4bf4d5..33b83351 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index a40604f4..60a2d4bb 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 5.7.0 1.7.2 4.10 diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index a1996a28..748f71a5 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index fa35797d..44eed9ce 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 2.2.0 diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 366c51e5..b0393ef7 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index a7edfd93..81b4cf8b 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 7361fd5c..82c21086 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 3d540851..1cd5874c 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 7b499358..ac63f5b8 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -11,7 +11,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 33f9eef2..d0938b16 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -17,7 +17,7 @@ UTF-8 1.1.3.RELEASE - 2.2.0.RC3 + 2.2.0.RELEASE 1.6.4 4.10 diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 21d095a4..5d89671f 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -13,7 +13,7 @@ UTF-8 3.1.3.RELEASE - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 1f7fee22..6ba46876 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 3.1.3.RELEASE 1.2.17 4.10 diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 82c214bc..0430989e 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index dae07fc4..336c7ab1 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 3.1.3.RELEASE 1.2.17 4.10 diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index ae44809f..e9842cb1 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 1.3.19 diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index dbb10446..a83b69be 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 0f024b5b..9d093588 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/basic/xquery/pom.xml b/basic/xquery/pom.xml index 0e5a62a3..62a650ea 100644 --- a/basic/xquery/pom.xml +++ b/basic/xquery/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 180dbd68..ce645239 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index f04e39d5..ca3dfd83 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 org.springframework.integration.samples.poller.Main diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index ea71d7be..ff033201 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 5e668193..2e61f767 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -7,7 +7,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 510dfd84..55dafebe 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -8,7 +8,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index cc421cf9..b242e73c 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 3.1.3.RELEASE 1.2.17 4.10 diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 802ef534..7df44625 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -8,7 +8,7 @@ war UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 3.1.3.RELEASE 1.2.2 1.3.2 diff --git a/intermediate/pom.xml b/intermediate/pom.xml index 2a9798e3..c4317719 100644 --- a/intermediate/pom.xml +++ b/intermediate/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.springframework.integration.samples + org.springframework.integration.samples intermediate-samples 2.2.0.BUILD-SNAPSHOT Spring Integration Samples - Intermediate @@ -14,15 +14,15 @@ - async-gateway - errorhandling - file-processing - multipart-http - splitter-aggregator-reaper - stored-procedures-derby - tcp-client-server-multiplex - travel - mail-attachments + async-gateway + errorhandling + file-processing + multipart-http + splitter-aggregator-reaper + stored-procedures-derby + tcp-client-server-multiplex + travel + mail-attachments diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index eff582d3..13874926 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -13,7 +13,7 @@ - 2.2.0.RC3 + 2.2.0.RELEASE 3.1.3.RELEASE 3.1.3.RELEASE 1.2 diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index be6dd3e6..729f16d9 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -15,7 +15,7 @@ UTF-8 3.1.3.RELEASE - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 693dd784..46eb9e3d 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index ac3845aa..6d22b31e 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -17,7 +17,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 54e700e4..ca923cfe 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 3c8951ea..7df13e44 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 3255a97a..84b456e1 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -15,7 +15,7 @@ UTF-8 3.1.3.RELEASE - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 4a17bbfa..6aab1d5b 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 3.1.3.RELEASE diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index b1e02760..1dec353d 100755 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -15,7 +15,7 @@ UTF-8 3.1.3.RELEASE - 2.2.0.RC3 + 2.2.0.RELEASE 1.2.17 4.10 diff --git a/pom.xml b/pom.xml index e49a29ea..86208e71 100644 --- a/pom.xml +++ b/pom.xml @@ -1,40 +1,40 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - 4.0.0 - org.springframework.integration.samples - samples-root - 2.2.0.BUILD-SNAPSHOT - Spring Integration Samples Root - http://www.springsource.org/spring-integration - pom + 4.0.0 + org.springframework.integration.samples + samples-root + 2.2.0.BUILD-SNAPSHOT + Spring Integration Samples Root + http://www.springsource.org/spring-integration + pom 2.2.1 - - basic - intermediate - advanced - applications - + + basic + intermediate + advanced + applications + - - Bamboo - https://build.springsource.org/browse/INTSAMPLES - + + Bamboo + https://build.springsource.org/browse/INTSAMPLES + - - JIRA - https://jira.springsource.org/browse/INTSAMPLES - + + JIRA + https://jira.springsource.org/browse/INTSAMPLES + - - https://github.com/SpringSource/spring-integration-samples - scm:git:git://github.com/SpringSource/spring-integration-samples.git - scm:git:ssh://git@github.com:SpringSource/spring-integration-samples.git - + + https://github.com/SpringSource/spring-integration-samples + scm:git:git://github.com/SpringSource/spring-integration-samples.git + scm:git:ssh://git@github.com:SpringSource/spring-integration-samples.git +