From 4392c38ee6f92872d78bdc3d82c3fe13b508bbf8 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 1 Mar 2011 09:24:47 -0500 Subject: [PATCH 1/4] INT-1821 updated samples POMs to use 2.0.3.RELEASE of SI --- applications/cafe/pom.xml | 2 +- .../integration/samples/cafe/xml/CafeDemoApp.java | 1 - applications/loan-broker/pom.xml | 2 +- applications/loanshark/pom.xml | 2 +- basic/control-bus/pom.xml | 2 +- basic/feed/pom.xml | 2 +- basic/ftp/pom.xml | 2 +- basic/helloworld/pom.xml | 2 +- basic/http/pom.xml | 2 +- basic/jms/pom.xml | 2 +- basic/jmx/pom.xml | 2 +- basic/mail/pom.xml | 2 +- basic/oddeven/pom.xml | 2 +- basic/quote/pom.xml | 2 +- basic/sftp/pom.xml | 2 +- basic/tcp-client-server/pom.xml | 2 +- basic/testing-examples/.classpath | 1 - 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 +- intermediate/async-gateway/pom.xml | 2 +- intermediate/errorhandling/pom.xml | 2 +- intermediate/file-processing/pom.xml | 2 +- intermediate/multipart-http/pom.xml | 2 +- intermediate/travel/pom.xml | 2 +- 28 files changed, 26 insertions(+), 28 deletions(-) diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index 54b23d6d..679e90fe 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -7,7 +7,7 @@ 2.0.0 Spring Integration Cafe Sample - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoApp.java b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoApp.java index d05e4a21..b1d555a5 100644 --- a/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoApp.java +++ b/applications/cafe/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoApp.java @@ -16,7 +16,6 @@ package org.springframework.integration.samples.cafe.xml; -import org.junit.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.samples.cafe.Cafe; diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 530166d7..065d9f85 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -7,7 +7,7 @@ 2.0.0 Spring Integration Loan Broker Sample - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.1.1 1.2.16 4.7 diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index f9ddae13..83f2701d 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -361,7 +361,7 @@ org.springframework.integration spring-integration-ip - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index fcc1c1bf..d782532e 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -8,7 +8,7 @@ Spring Integration Hello World Sample jar - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 1543e75c..17f77258 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -6,7 +6,7 @@ Feed Demo (RSS/ATOM) jar - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 9efd287d..cb6914a6 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -6,7 +6,7 @@ FTP Demo jar - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 746c713f..c0e69772 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -8,7 +8,7 @@ Spring Integration Hello World Sample jar - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 6f5bd023..d7f96bc3 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -7,7 +7,7 @@ Spring Integration HTTP Demo war - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 3.0.5.RELEASE 1.2 1.3.2 diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index b09b19a8..69b0ea54 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -8,7 +8,7 @@ Spring Integration JMS Sample jar - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 5.2.0 diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 5c71a843..d5ca24e2 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -8,7 +8,7 @@ 2.0.0 jar - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index fe04e4c8..821432b8 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -6,7 +6,7 @@ Spring Integration IMAP IDLE Sample 2.0.0 - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index ab644702..d21e5a2a 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -8,7 +8,7 @@ 2.0.0 jar - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 131708bd..d7e58077 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -8,7 +8,7 @@ 2.0.0 jar - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index d0be0f6a..1b04d219 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -7,7 +7,7 @@ SFTP Demo jar - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index eda1117d..92b6e888 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -9,7 +9,7 @@ jar 3.0.5.RELEASE - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/basic/testing-examples/.classpath b/basic/testing-examples/.classpath index dde3100b..da16818b 100644 --- a/basic/testing-examples/.classpath +++ b/basic/testing-examples/.classpath @@ -3,7 +3,6 @@ - diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 409874a0..a3e05b10 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -8,7 +8,7 @@ Spring Integration Testing Examples jar - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 3.0.5.RELEASE 1.2.16 4.7 diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 07d41e8e..20d65ecb 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -6,7 +6,7 @@ Twitter Demo jar - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index f86bc00b..f16b661b 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -8,7 +8,7 @@ 2.0.0 war - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 3.0.5.RELEASE 1.2.16 4.7 diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 59ff703d..26a52609 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -8,7 +8,7 @@ 2.0.0 jar - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 1.3 diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 5495d1ca..1e581d6a 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -8,7 +8,7 @@ 2.0.0 jar - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index fd1dee13..e38c216f 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -6,7 +6,7 @@ XMPP Demo jar - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 640bf979..f8a8b069 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -7,7 +7,7 @@ Async Gateway Demo jar - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 5eaba58d..e5237447 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -7,7 +7,7 @@ Spring Integration Error Handling Sample 2.0.0 - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 704a2145..b7470b68 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -4,7 +4,7 @@ file-processing 2.0.0 - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 381819b0..edf98b77 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -7,7 +7,7 @@ Spring Integration HTTP Multipart Demo war - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 3.0.5.RELEASE 1.2 1.3.2 diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 6082f20b..616af883 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -6,7 +6,7 @@ Spring Integration Travel Services Sample 2.0.0 - 2.0.2.BUILD-SNAPSHOT + 2.0.3.RELEASE 1.2.16 4.7 3.0.5.RELEASE From f8033b4533ea4bbb652ac88b887f5313a3cd3fe1 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 4 Mar 2011 16:03:01 -0500 Subject: [PATCH 2/4] changed activemq logging to 'error' level --- basic/jms/src/test/resources/log4j.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basic/jms/src/test/resources/log4j.xml b/basic/jms/src/test/resources/log4j.xml index 5144c9ea..dc3bb774 100644 --- a/basic/jms/src/test/resources/log4j.xml +++ b/basic/jms/src/test/resources/log4j.xml @@ -24,7 +24,7 @@ - + From ace8935c7ee417945e168b4f6546478816e3871b Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 18 Jul 2011 18:15:32 -0400 Subject: [PATCH 3/4] upgraded samples to Spring Integration 2.0.5.RELEASE --- applications/cafe/.classpath | 2 +- applications/cafe/pom.xml | 2 +- applications/loan-broker/.classpath | 2 +- applications/loan-broker/pom.xml | 2 +- applications/loanshark/pom.xml | 2 +- basic/control-bus/.classpath | 2 +- basic/control-bus/pom.xml | 2 +- basic/feed/.classpath | 2 +- basic/feed/pom.xml | 2 +- basic/file/.classpath | 2 +- basic/file/pom.xml | 2 +- basic/ftp/.classpath | 2 +- basic/ftp/pom.xml | 2 +- basic/helloworld/.classpath | 2 +- basic/helloworld/pom.xml | 2 +- basic/http/.classpath | 2 +- basic/http/pom.xml | 2 +- basic/jms/.classpath | 2 +- basic/jms/.springBeans | 3 ++- basic/jms/pom.xml | 15 +++++++++++++-- basic/jmx/.classpath | 2 +- basic/jmx/pom.xml | 2 +- basic/mail/.classpath | 2 +- basic/mail/pom.xml | 2 +- basic/oddeven/.classpath | 2 +- basic/oddeven/pom.xml | 2 +- basic/quote/.classpath | 2 +- basic/quote/pom.xml | 2 +- basic/sftp/.classpath | 2 +- basic/sftp/pom.xml | 2 +- basic/tcp-client-server/.classpath | 2 +- basic/tcp-client-server/pom.xml | 2 +- basic/testing-examples/.classpath | 2 +- basic/testing-examples/pom.xml | 2 +- basic/twitter/.classpath | 2 +- basic/twitter/pom.xml | 2 +- basic/ws-inbound-gateway/pom.xml | 2 +- basic/ws-outbound-gateway/.classpath | 2 +- basic/ws-outbound-gateway/pom.xml | 2 +- basic/xml/.classpath | 2 +- basic/xml/pom.xml | 2 +- basic/xmpp/.classpath | 2 +- basic/xmpp/pom.xml | 2 +- intermediate/async-gateway/.classpath | 2 +- intermediate/async-gateway/pom.xml | 2 +- intermediate/errorhandling/.classpath | 2 +- intermediate/errorhandling/pom.xml | 2 +- intermediate/file-processing/.classpath | 2 +- intermediate/file-processing/pom.xml | 2 +- intermediate/multipart-http/.classpath | 2 +- intermediate/multipart-http/pom.xml | 21 +++++++++++++++++++-- intermediate/travel/.classpath | 2 +- intermediate/travel/pom.xml | 2 +- 53 files changed, 84 insertions(+), 55 deletions(-) diff --git a/applications/cafe/.classpath b/applications/cafe/.classpath index 6d3fb35a..dd384e4f 100644 --- a/applications/cafe/.classpath +++ b/applications/cafe/.classpath @@ -3,7 +3,7 @@ - + diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index 679e90fe..aa0dbf58 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -7,7 +7,7 @@ 2.0.0 Spring Integration Cafe Sample - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/applications/loan-broker/.classpath b/applications/loan-broker/.classpath index 67883136..9241e358 100644 --- a/applications/loan-broker/.classpath +++ b/applications/loan-broker/.classpath @@ -3,7 +3,7 @@ - + diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 065d9f85..7d6f928e 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -7,7 +7,7 @@ 2.0.0 Spring Integration Loan Broker Sample - 2.0.3.RELEASE + 2.0.5.RELEASE 1.1.1 1.2.16 4.7 diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 83f2701d..5c0ef607 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -361,7 +361,7 @@ org.springframework.integration spring-integration-ip - 2.0.3.RELEASE + 2.0.5.RELEASE diff --git a/basic/control-bus/.classpath b/basic/control-bus/.classpath index 96489ff1..2e2b757d 100644 --- a/basic/control-bus/.classpath +++ b/basic/control-bus/.classpath @@ -4,7 +4,7 @@ - + diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index d782532e..46965739 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -8,7 +8,7 @@ Spring Integration Hello World Sample jar - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/basic/feed/.classpath b/basic/feed/.classpath index caf88e10..9fcb3c05 100644 --- a/basic/feed/.classpath +++ b/basic/feed/.classpath @@ -2,7 +2,7 @@ - + diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 17f77258..9df267b0 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -6,7 +6,7 @@ Feed Demo (RSS/ATOM) jar - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/basic/file/.classpath b/basic/file/.classpath index dde3100b..3a8350c2 100644 --- a/basic/file/.classpath +++ b/basic/file/.classpath @@ -4,7 +4,7 @@ - + diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 138bb834..c562776d 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -8,7 +8,7 @@ Spring Integration File Copy Sample jar - 2.0.2.BUILD-SNAPSHOT + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/basic/ftp/.classpath b/basic/ftp/.classpath index caf88e10..9fcb3c05 100644 --- a/basic/ftp/.classpath +++ b/basic/ftp/.classpath @@ -2,7 +2,7 @@ - + diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index cb6914a6..354d3d15 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -6,7 +6,7 @@ FTP Demo jar - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/basic/helloworld/.classpath b/basic/helloworld/.classpath index 9fdc701a..96540801 100644 --- a/basic/helloworld/.classpath +++ b/basic/helloworld/.classpath @@ -2,7 +2,7 @@ - + diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index c0e69772..4f765020 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -8,7 +8,7 @@ Spring Integration Hello World Sample jar - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/basic/http/.classpath b/basic/http/.classpath index 3ebbe5d5..24d86769 100644 --- a/basic/http/.classpath +++ b/basic/http/.classpath @@ -3,7 +3,7 @@ - + diff --git a/basic/http/pom.xml b/basic/http/pom.xml index d7f96bc3..9ec59b9d 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -7,7 +7,7 @@ Spring Integration HTTP Demo war - 2.0.3.RELEASE + 2.0.5.RELEASE 3.0.5.RELEASE 1.2 1.3.2 diff --git a/basic/jms/.classpath b/basic/jms/.classpath index dde3100b..3a8350c2 100644 --- a/basic/jms/.classpath +++ b/basic/jms/.classpath @@ -4,7 +4,7 @@ - + diff --git a/basic/jms/.springBeans b/basic/jms/.springBeans index 915bb7ad..99b84d84 100644 --- a/basic/jms/.springBeans +++ b/basic/jms/.springBeans @@ -1,7 +1,7 @@ 1 - + @@ -12,6 +12,7 @@ src/main/resources/META-INF/spring/integration/inboundGateway.xml src/main/resources/META-INF/spring/integration/outboundChannelAdapter.xml src/main/resources/META-INF/spring/integration/outboundGateway.xml + src/main/resources/META-INF/spring/integration/joris-config.xml diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 69b0ea54..153136d2 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -8,7 +8,7 @@ Spring Integration JMS Sample jar - 2.0.3.RELEASE + 2.0.5.RELEASE 5.2.0 @@ -17,9 +17,20 @@ activemq-core ${activemq.version} + + + + + + + org.springframework + spring-jms + 3.0.5.RELEASE + compile + org.springframework.integration - spring-integration-jms + spring-integration-core ${spring.integration.version} diff --git a/basic/jmx/.classpath b/basic/jmx/.classpath index 6331965e..e10080ad 100644 --- a/basic/jmx/.classpath +++ b/basic/jmx/.classpath @@ -4,7 +4,7 @@ - + diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index d5ca24e2..8aa8f732 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -8,7 +8,7 @@ 2.0.0 jar - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/basic/mail/.classpath b/basic/mail/.classpath index b7b1a75a..7343643a 100644 --- a/basic/mail/.classpath +++ b/basic/mail/.classpath @@ -3,7 +3,7 @@ - + diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 821432b8..10a5e2c5 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -6,7 +6,7 @@ Spring Integration IMAP IDLE Sample 2.0.0 - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/basic/oddeven/.classpath b/basic/oddeven/.classpath index 9fdc701a..96540801 100644 --- a/basic/oddeven/.classpath +++ b/basic/oddeven/.classpath @@ -2,7 +2,7 @@ - + diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index d21e5a2a..a327caba 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -8,7 +8,7 @@ 2.0.0 jar - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/basic/quote/.classpath b/basic/quote/.classpath index 0ce7eaab..3a0192be 100644 --- a/basic/quote/.classpath +++ b/basic/quote/.classpath @@ -4,7 +4,7 @@ - + diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index d7e58077..a1c88ed7 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -8,7 +8,7 @@ 2.0.0 jar - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/basic/sftp/.classpath b/basic/sftp/.classpath index caf88e10..9fcb3c05 100644 --- a/basic/sftp/.classpath +++ b/basic/sftp/.classpath @@ -2,7 +2,7 @@ - + diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 1b04d219..b181b351 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -7,7 +7,7 @@ SFTP Demo jar - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/basic/tcp-client-server/.classpath b/basic/tcp-client-server/.classpath index dde3100b..3a8350c2 100644 --- a/basic/tcp-client-server/.classpath +++ b/basic/tcp-client-server/.classpath @@ -4,7 +4,7 @@ - + diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 92b6e888..937c82a2 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -9,7 +9,7 @@ jar 3.0.5.RELEASE - 2.0.3.RELEASE + 2.0.4.BUILD-SNAPSHOT 1.2.16 4.7 diff --git a/basic/testing-examples/.classpath b/basic/testing-examples/.classpath index da16818b..a9146e7a 100644 --- a/basic/testing-examples/.classpath +++ b/basic/testing-examples/.classpath @@ -3,7 +3,7 @@ - + diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index a3e05b10..b744af93 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -8,7 +8,7 @@ Spring Integration Testing Examples jar - 2.0.3.RELEASE + 2.0.5.RELEASE 3.0.5.RELEASE 1.2.16 4.7 diff --git a/basic/twitter/.classpath b/basic/twitter/.classpath index caf88e10..9fcb3c05 100644 --- a/basic/twitter/.classpath +++ b/basic/twitter/.classpath @@ -2,7 +2,7 @@ - + diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 20d65ecb..3335ac06 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -6,7 +6,7 @@ Twitter Demo jar - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index f16b661b..8b4b6a33 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -8,7 +8,7 @@ 2.0.0 war - 2.0.3.RELEASE + 2.0.5.RELEASE 3.0.5.RELEASE 1.2.16 4.7 diff --git a/basic/ws-outbound-gateway/.classpath b/basic/ws-outbound-gateway/.classpath index e000b381..c16585b7 100644 --- a/basic/ws-outbound-gateway/.classpath +++ b/basic/ws-outbound-gateway/.classpath @@ -2,7 +2,7 @@ - + diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 26a52609..55ca5f21 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -8,7 +8,7 @@ 2.0.0 jar - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 1.3 diff --git a/basic/xml/.classpath b/basic/xml/.classpath index 9fdc701a..96540801 100644 --- a/basic/xml/.classpath +++ b/basic/xml/.classpath @@ -2,7 +2,7 @@ - + diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 1e581d6a..8f746479 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -8,7 +8,7 @@ 2.0.0 jar - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/basic/xmpp/.classpath b/basic/xmpp/.classpath index caf88e10..9fcb3c05 100644 --- a/basic/xmpp/.classpath +++ b/basic/xmpp/.classpath @@ -2,7 +2,7 @@ - + diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index e38c216f..e31fe6f5 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -6,7 +6,7 @@ XMPP Demo jar - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/intermediate/async-gateway/.classpath b/intermediate/async-gateway/.classpath index a9b8d563..7411fdc9 100644 --- a/intermediate/async-gateway/.classpath +++ b/intermediate/async-gateway/.classpath @@ -4,7 +4,7 @@ - + diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index f8a8b069..94e21c95 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -7,7 +7,7 @@ Async Gateway Demo jar - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/intermediate/errorhandling/.classpath b/intermediate/errorhandling/.classpath index 0ce7eaab..3a0192be 100644 --- a/intermediate/errorhandling/.classpath +++ b/intermediate/errorhandling/.classpath @@ -4,7 +4,7 @@ - + diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index e5237447..1066d3df 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -7,7 +7,7 @@ Spring Integration Error Handling Sample 2.0.0 - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/intermediate/file-processing/.classpath b/intermediate/file-processing/.classpath index 96489ff1..2e2b757d 100644 --- a/intermediate/file-processing/.classpath +++ b/intermediate/file-processing/.classpath @@ -4,7 +4,7 @@ - + diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index b7470b68..e6d10d63 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -4,7 +4,7 @@ file-processing 2.0.0 - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 diff --git a/intermediate/multipart-http/.classpath b/intermediate/multipart-http/.classpath index 90680aeb..97cadcc2 100644 --- a/intermediate/multipart-http/.classpath +++ b/intermediate/multipart-http/.classpath @@ -10,7 +10,7 @@ - + diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index edf98b77..2437b5b7 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -7,7 +7,7 @@ Spring Integration HTTP Multipart Demo war - 2.0.3.RELEASE + 2.0.5.RELEASE 3.0.5.RELEASE 1.2 1.3.2 @@ -19,6 +19,23 @@ spring-integration-http ${spring.integration.version} + + + + + + + org.codehaus.jackson + jackson-mapper-asl + 1.4.3 + compile + true + + + org.springframework.integration + spring-integration-core + ${spring.integration.version} + org.springframework spring-webmvc @@ -55,7 +72,7 @@ - + repository.springframework.maven.release Spring Framework Maven Release Repository diff --git a/intermediate/travel/.classpath b/intermediate/travel/.classpath index 96489ff1..2e2b757d 100644 --- a/intermediate/travel/.classpath +++ b/intermediate/travel/.classpath @@ -4,7 +4,7 @@ - + diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 616af883..70b089d6 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -6,7 +6,7 @@ Spring Integration Travel Services Sample 2.0.0 - 2.0.3.RELEASE + 2.0.5.RELEASE 1.2.16 4.7 3.0.5.RELEASE From de10204e6e3286b8ed0f15e6c4b68fc017ae486f Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Mon, 18 Jul 2011 20:00:38 -0400 Subject: [PATCH 4/4] polishing, removed warning markers --- .../samples/tcpclientserver/TelnetServer.java | 1 - .../src/test/resources/log4j.xml | 28 ------------------- .../externalgateway/TrafficHttpConverter.java | 1 - 3 files changed, 30 deletions(-) delete mode 100644 basic/tcp-client-server/src/test/resources/log4j.xml diff --git a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/TelnetServer.java b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/TelnetServer.java index 721d352c..99d97e5e 100644 --- a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/TelnetServer.java +++ b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/TelnetServer.java @@ -15,7 +15,6 @@ */ package org.springframework.integration.samples.tcpclientserver; -import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; /** diff --git a/basic/tcp-client-server/src/test/resources/log4j.xml b/basic/tcp-client-server/src/test/resources/log4j.xml deleted file mode 100644 index f391e2ed..00000000 --- a/basic/tcp-client-server/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/TrafficHttpConverter.java b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/TrafficHttpConverter.java index 9e41426c..a6ef52f2 100644 --- a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/TrafficHttpConverter.java +++ b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/TrafficHttpConverter.java @@ -57,7 +57,6 @@ public class TrafficHttpConverter implements HttpMessageConverter { return supportedMediaTypes; } - @SuppressWarnings("unchecked") @Override public Traffic read(Class clazz, HttpInputMessage inputMessage) throws IOException, HttpMessageNotReadableException {