From 59bc98dbb741d8f83dae9daf602d7db3189b3f37 Mon Sep 17 00:00:00 2001 From: Gunnar Hillert Date: Mon, 10 Jun 2013 15:39:42 -0400 Subject: [PATCH 001/356] INTSAMPLES-114 Twitter Search Requires Authentication * Update Sample to Spring Integration 2.2.4 * In the sample - disallow unauthenticated Twitter Searches - As of Twitter API version 1.1, users must be authenticated to perform searches. For reference see: https://jira.springsource.org/browse/INTSAMPLES-114 --- basic/twitter/README.md | 2 +- basic/twitter/pom.xml | 2 +- ...rchSampleTest.java => TwitterSearchSample.java} | 2 +- .../spring/integration/TwitterSearch-context.xml | 14 ++------------ 4 files changed, 5 insertions(+), 15 deletions(-) rename basic/twitter/src/test/java/org/springframework/integration/samples/twitter/{TwitterSearchSampleTest.java => TwitterSearchSample.java} (96%) diff --git a/basic/twitter/README.md b/basic/twitter/README.md index 3289da751..3e92bf02f 100644 --- a/basic/twitter/README.md +++ b/basic/twitter/README.md @@ -5,7 +5,7 @@ This example demonstrates the following aspects of the Twitter support available 1. Twitter Inbound Channel Adapter - allows you to receive HOME status updates 2. Twitter Inbound Search Channel Adapter - allows you to receive HOME status updates -3. Twitter Outboud Channel Adapter - allows send status updates +3. Twitter Outbound Channel Adapter - allows send status updates In order to run this sample you need to configure [OAuth][] and set the values in the [OAuth][] properties. diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 0430989e4..10444927b 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.4.RELEASE 1.2.17 4.10 diff --git a/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSearchSampleTest.java b/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSearchSample.java similarity index 96% rename from basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSearchSampleTest.java rename to basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSearchSample.java index 76e57839e..282607f45 100644 --- a/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSearchSampleTest.java +++ b/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSearchSample.java @@ -23,7 +23,7 @@ * @author Oleg Zhurakousky * */ -public class TwitterSearchSampleTest { +public class TwitterSearchSample { @Test public void runDemo() throws Exception{ diff --git a/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSearch-context.xml b/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSearch-context.xml index 60f77ba9f..8b9201d43 100644 --- a/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSearch-context.xml +++ b/basic/twitter/src/test/resources/META-INF/spring/integration/TwitterSearch-context.xml @@ -11,9 +11,7 @@ - - @@ -24,15 +22,7 @@ - - - ---> - - - + query="springintegration OR springframework OR #grails" twitter-template="twitterTemplate"> From 8454c9f564c3cb017895fc528e32f3fb44fe8c14 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 15 Oct 2013 09:05:39 -0400 Subject: [PATCH 002/356] Update SI Version 2.2.0 -> 2.2.6 --- advanced/advanced-testing-examples/pom.xml | 2 +- advanced/dynamic-ftp/pom.xml | 2 +- applications/cafe-scripted/pom.xml | 2 +- applications/cafe/pom.xml | 2 +- applications/loan-broker/pom.xml | 2 +- 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/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/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/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-postgresql/pom.xml | 2 +- intermediate/tcp-client-server-multiplex/pom.xml | 2 +- intermediate/travel/pom.xml | 2 +- intermediate/tx-synch/pom.xml | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 50a535fbf..325463b39 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 3.1.3.RELEASE 1.2.17 4.11 diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index fa2885998..fa3dd8780 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.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index d82f06181..7da683fa7 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.RELEASE + 2.2.6.RELEASE 3.1.3.RELEASE 1.2.17 4.10 diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index da23dd456..07f20bc45 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -21,7 +21,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.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 fec7051cc..893d2ef78 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.RELEASE + 2.2.6.RELEASE 1.1.1 1.2.17 4.10 diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 32ea4a8de..40c856146 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 5add2bf49..5fb5da255 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 6f13427dd..50a0b3221 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 652345d4d..7f1d589f0 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 4f8afa63a..8757a4308 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 5345e21d7..98534e922 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.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 bdd5efccf..a6d63ed4d 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 3.1.3.RELEASE 1.2.2 1.3.2 diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 33b833510..3f1cc211a 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 7d09e0952..b3f739919 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 5.7.0 1.2.17 4.10 diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 748f71a59..8d6b45f02 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 44eed9ce4..e01136fd3 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 2.2.0 diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index b0393ef74..be1a9a59d 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 81b4cf8bb..00987c566 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 82c210866..62198c636 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 1cd5874c6..e71c82023 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index ac63f5b8c..69c5944c2 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -11,7 +11,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index d0938b16b..71c040f9f 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.RELEASE + 2.2.6.RELEASE 1.6.4 4.10 diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 2267a568f..bea2f2f63 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.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 org.springframework.integration.samples.tcpclientserver.Main diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 6ba468766..b997e5c25 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 3.1.3.RELEASE 1.2.17 4.10 diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 336c7ab19..0d3ab3de3 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.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 e9842cb12..a7e1a1bfe 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 1.3.19 diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index a83b69be5..d5f4b6774 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 9d093588d..a2a27b436 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index ce6452397..0eaa2e365 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index ca3dfd83b..aa8e5b899 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.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 ff0332016..1e000d64a 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 2e61f7678..44985ef04 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -7,7 +7,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index e29dd4d70..74e51a49c 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -8,7 +8,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index b242e73cb..b9908f4df 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.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 7df44625d..576e74dee 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -8,7 +8,7 @@ war UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 3.1.3.RELEASE 1.2.2 1.3.2 diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index dcd9dffa8..ec0363b21 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -13,7 +13,7 @@ - 2.2.0.RELEASE + 2.2.6.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 729f16d92..278f0417b 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.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 46eb9e3d5..f3d1f8590 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 6d22b31ee..dad86ec2f 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -17,7 +17,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 7df13e445..60da2e154 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.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 ef1d51c02..760ec5c54 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.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 6aab1d5b8..d7fd5c9df 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RELEASE + 2.2.6.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 1dec353dd..223a298a9 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.RELEASE + 2.2.6.RELEASE 1.2.17 4.10 From 630d1cf009e7d1c220ee481186efdeaf964dc47d Mon Sep 17 00:00:00 2001 From: Laurent BILLON Date: Fri, 25 Oct 2013 11:23:27 +0200 Subject: [PATCH 003/356] Fix typo in Basic Mail Sample https://jira.springsource.org/browse/INTSAMPLES-118 --- .../mail/imapidle/GmailInboundImapIdleAdapterTestApp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTestApp.java b/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTestApp.java index e2e5956c1..9a02b3e8d 100644 --- a/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTestApp.java +++ b/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTestApp.java @@ -33,7 +33,7 @@ public class GmailInboundImapIdleAdapterTestApp { public static void main (String[] args) throws Exception { ApplicationContext ac = new ClassPathXmlApplicationContext("/META-INF/spring/integration/gmail-imap-idle-config.xml"); - DirectChannel inputChannel = ac.getBean("recieveChannel", DirectChannel.class); + DirectChannel inputChannel = ac.getBean("receiveChannel", DirectChannel.class); inputChannel.subscribe(new MessageHandler() { public void handleMessage(Message message) throws MessagingException { logger.info("Message: " + message); From e190c160f168935d4632ff9bec779e1291814b4d Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 19 Nov 2013 14:09:55 +0200 Subject: [PATCH 004/356] INTSAMPLES-119 Update Monitor for Twitter OAuth Twitter now requires authentication. Disable the real twitter adapter by default; enable it with spring.profile "twitter" - requires the user to get real oauth tokens. Replicate oauth setup instructions from the twitter sample. Add note to README for enabling the real twitter adapter. Add .gitignore so committers can keep their real credentials in, say, 'oauth.properties.foo'. Add note about `SpringIntegrationTest`. Update dummy tweets to use new icon. INTSAMPLES-119 Polishing - Fix 'twitterTemplate' bean name - Add content to log and JMX Notification JIRA: https://jira.springsource.org/browse/INTSAMPLES-119 --- intermediate/monitoring/.gitignore | 1 + intermediate/monitoring/README.md | 37 ++++++++++++++++ .../service/impl/DummyTwitter.java | 2 +- .../spring-integration-context.xml | 44 ++++++++++++++++--- .../src/main/resources/oauth.properties | 4 ++ .../src/main/webapp/WEB-INF/web.xml | 8 ++++ 6 files changed, 88 insertions(+), 8 deletions(-) create mode 100644 intermediate/monitoring/.gitignore create mode 100644 intermediate/monitoring/src/main/resources/oauth.properties diff --git a/intermediate/monitoring/.gitignore b/intermediate/monitoring/.gitignore new file mode 100644 index 000000000..d84084b8e --- /dev/null +++ b/intermediate/monitoring/.gitignore @@ -0,0 +1 @@ +src/main/resources/oauth.properties.* diff --git a/intermediate/monitoring/README.md b/intermediate/monitoring/README.md index 0d40a230a..b4d4018eb 100644 --- a/intermediate/monitoring/README.md +++ b/intermediate/monitoring/README.md @@ -22,6 +22,8 @@ and then use [VisualVM][]/JConsole to explore the [MBeans][]. The twitter search results can be examined at `http://localhost:8080/monitoring`. +Alternatively, there is a simple `main` class `SpringIntegrationTest`. + ## 2.2 Updates: The application context now includes an example of <int-jmx:notification-publishing-channel-adapter/>, to which the tweets are published. You can navigate to the MBean - **spring.application:type=TweetPublisher,name=tweeter**, click the _Notifications_ tab and then subscribe. You will then see the notifications. @@ -39,6 +41,41 @@ You should observe log output of the notifications as well as polling the channe These changes show how you can create a sophisticated monitoring application using Spring Integration - it is important to understand that the application being monitored doesn't have to be a Spring or Spring Integration application - any application that exports MBeans can be monitored in this way. +## Note: + +Twitter now requires an authenticated user to perform searches. By default, this project now uses a dummy adapter to avoid having +to configure the credentials. To use a real +adapter, uncomment the __spring.profiles.active__ `context-param` element in the `web.xml`. + +To run the `SpringIntegrationTest` command-line application, use `-Dspring.profiles.active=twitter` command line argument in the launch configuration. + +However, you will need to configure OAuth and set the values in the OAuth properties. + +To use OAuth authentication/authorization with Twitter you must create a new Application on the Twitter Developer's site. +Follow the directions below to create a new application and obtain the consumer keys and the access token: + +* Go to [http://dev.twitter.com/](http://dev.twitter.com/) +* Log in to your account +* Go to *My applications*. +* Click on 'Create a new application' link and fill out all required fields on the form provided; +* Submit the form. +* If everything is successful you'll be presented with the 'Consumer Key' and 'Consumer Secret'. +* Copy both values to a safe place. +* On the same page you should see 'My Access Token' button on bottom of the page. +* Click on it and you'll be presented with two more values: 'Access Token' and 'Access Token Secret'. +* Copy these values to a safe place as well. + +When done, fill out **oauth.properties** file so it looks similar to this. + + twitter.oauth.consumerKey=4XzBPabcJQxyBzzzH3TrRQ + twitter.oauth.consumerSecret=ab2piKdMfPu8bVa3ab6DAIvIWEVZyMDL0RSEN2I8 + twitter.oauth.accessToken=21691649-4XYZY5iJEOfz2A9qCFd9SjBRGb3HLmIm4HNE6AMv4 + twitter.oauth.accessTokenSecret=AbRxUAvyNCtqQtvxFK8w5ZMtMj20KFhB6oEfTA0 + +NOTE: the above values are samples only. + + + -------------------------------------------------------------------------------- For help please see the Spring Integration documentation: diff --git a/intermediate/monitoring/src/main/java/org/springframework/integration/service/impl/DummyTwitter.java b/intermediate/monitoring/src/main/java/org/springframework/integration/service/impl/DummyTwitter.java index 0cf9f5a28..19c56d67e 100644 --- a/intermediate/monitoring/src/main/java/org/springframework/integration/service/impl/DummyTwitter.java +++ b/intermediate/monitoring/src/main/java/org/springframework/integration/service/impl/DummyTwitter.java @@ -33,7 +33,7 @@ public Tweet getTweet() { "Spring Integration is the coolest Enterprise Integration project", new Date(), "SomeUser", - "http://a0.twimg.com/profile_images/1598911687/ICO_S2_Bug_normal.png", + "https://pbs.twimg.com/profile_images/378800000502646541/992d3596458fca87741b8e93e7df0860_normal.png", 0L, 0L, null, diff --git a/intermediate/monitoring/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/intermediate/monitoring/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index 65e4b1b1f..1800b2f22 100644 --- a/intermediate/monitoring/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/intermediate/monitoring/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -23,12 +23,19 @@ - - - + - + + + + + + + + @@ -66,7 +73,7 @@ + expression="'Id:' + payload.id + '; Date:' + payload.createdAt + '; FromUser: ' + payload.fromUser + '; Content: ' + payload.text" /> @@ -78,7 +85,7 @@ + expression="'Id:' + payload.id + '; Date:' + payload.createdAt + '; FromUser: ' + payload.fromUser + '; Content: ' + payload.text"/> @@ -91,4 +98,27 @@ + + + + + + + + + + + + + + + + + + + diff --git a/intermediate/monitoring/src/main/resources/oauth.properties b/intermediate/monitoring/src/main/resources/oauth.properties new file mode 100644 index 000000000..651e61ffe --- /dev/null +++ b/intermediate/monitoring/src/main/resources/oauth.properties @@ -0,0 +1,4 @@ +twitter.oauth.consumerKey= +twitter.oauth.consumerSecret= +twitter.oauth.accessToken= +twitter.oauth.accessTokenSecret= diff --git a/intermediate/monitoring/src/main/webapp/WEB-INF/web.xml b/intermediate/monitoring/src/main/webapp/WEB-INF/web.xml index 46208d6ff..5b14b27ab 100644 --- a/intermediate/monitoring/src/main/webapp/WEB-INF/web.xml +++ b/intermediate/monitoring/src/main/webapp/WEB-INF/web.xml @@ -9,6 +9,14 @@ classpath:META-INF/spring/integration/spring-integration-context.xml + + + org.springframework.web.context.ContextLoaderListener From 0f6fb885c274af9c5b9448b4c68862bb436bbd07 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 4 Dec 2013 08:52:06 -0500 Subject: [PATCH 005/356] Dynamic FTP Add Link to Forum For Inbound --- advanced/dynamic-ftp/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/advanced/dynamic-ftp/README.md b/advanced/dynamic-ftp/README.md index c5de52e4d..b974f6ae5 100644 --- a/advanced/dynamic-ftp/README.md +++ b/advanced/dynamic-ftp/README.md @@ -17,3 +17,7 @@ Notice in the config file, how an **expression-based router** is used to invoke expression="@channelResolver.resolve(headers['customer'])"/> +This sample shows the technique for outbound adapters. Refer to [this forum thread][1] and its [links][2] for a similar technique for dynamic inbound endpoints. + +[1]: http://forum.spring.io/forum/spring-projects/integration/119081-dynamic-inbound-channel-adapter-creation +[2]: http://forum.spring.io/forum/spring-projects/integration/117523-starting-multiple-consumers?p=589517#post589517 From ed736aa499d14046a477160479f75c5b7437aa30 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 5 Sep 2013 11:11:09 -0400 Subject: [PATCH 006/356] INTSAMPLES-117 Remove cache-sessions - FTP Sample Compatibility with SI 3.0; also bump to 3.0.0.M3. --- basic/ftp/pom.xml | 2 +- .../integration/FtpInboundChannelAdapterSample-context.xml | 2 +- .../integration/FtpOutboundChannelAdapterSample-context.xml | 2 +- .../spring/integration/FtpOutboundGatewaySample-context.xml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 8757a4308..87cc6e797 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.M3 1.2.17 4.10 diff --git a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml index a94a3cbd7..9e2004081 100644 --- a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml +++ b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml @@ -18,7 +18,7 @@ - - diff --git a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml index 0c43a0907..2c40a6e5e 100644 --- a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml +++ b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml @@ -22,7 +22,7 @@ - - Date: Mon, 16 Dec 2013 10:53:29 +0200 Subject: [PATCH 007/356] INTSAMPLES-121: Upgrade to SI 3.0 and SPR 3.2.6 JIRA: https://jira.springsource.org/browse/INTSAMPLES-121 --- advanced/advanced-testing-examples/pom.xml | 6 +- advanced/dynamic-ftp/pom.xml | 2 +- applications/cafe-scripted/pom.xml | 4 +- applications/cafe/pom.xml | 2 +- applications/loan-broker/pom.xml | 2 +- applications/loanshark/pom.xml | 4 +- ...Accumulator.java => AccumulatorTests.java} | 4 +- basic/amqp/pom.xml | 2 +- basic/control-bus/pom.xml | 4 +- basic/enricher/pom.xml | 2 +- basic/feed/pom.xml | 4 +- basic/file/pom.xml | 2 +- basic/ftp/pom.xml | 2 +- basic/helloworld/pom.xml | 4 +- basic/http/pom.xml | 4 +- .../main/webapp/WEB-INF/servlet-config.xml | 8 +- basic/jdbc/pom.xml | 2 +- basic/jms/pom.xml | 2 +- basic/jmx/pom.xml | 4 +- basic/jpa/pom.xml | 4 +- basic/mail/pom.xml | 4 +- 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 | 6 +- basic/testing-examples/pom.xml | 4 +- basic/twitter/pom.xml | 4 +- basic/ws-inbound-gateway/pom.xml | 4 +- basic/ws-outbound-gateway/pom.xml | 4 +- basic/xml/pom.xml | 4 +- basic/xmpp/pom.xml | 4 +- intermediate/async-gateway/pom.xml | 2 +- intermediate/dynamic-poller/pom.xml | 2 +- intermediate/errorhandling/pom.xml | 2 +- intermediate/file-processing/pom.xml | 4 +- intermediate/mail-attachments/pom.xml | 2 +- intermediate/monitoring/pom.xml | 2 +- intermediate/multipart-http/pom.xml | 4 +- .../main/webapp/WEB-INF/servlet-config.xml | 14 +-- .../multipart/MultipartRestClient.java | 4 +- intermediate/rest-http/pom.xml | 6 +- .../applicationContext-http-int.xml | 90 +++++++++---------- intermediate/retry-and-more/pom.xml | 2 +- .../splitter-aggregator-reaper/pom.xml | 6 +- 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 | 4 +- intermediate/travel/pom.xml | 4 +- intermediate/tx-synch/pom.xml | 2 +- 53 files changed, 135 insertions(+), 135 deletions(-) rename applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/{TestAccumulator.java => AccumulatorTests.java} (98%) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 325463b39..2d83eb9cb 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 2.2.6.RELEASE - 3.1.3.RELEASE + 3.0.0.RELEASE + 3.2.6.RELEASE 1.2.17 4.11 @@ -122,4 +122,4 @@ https://repo.springsource.org/libs-milestone - \ No newline at end of file + diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index fa3dd8780..6a998c5c3 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.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 7da683fa7..705b86de0 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -8,8 +8,8 @@ Samples (Applications) - Cafe Sample (Scripted Implementation) UTF-8 - 2.2.6.RELEASE - 3.1.3.RELEASE + 3.0.0.RELEASE + 3.2.6.RELEASE 1.2.17 4.10 diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index 07f20bc45..15240debb 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -21,7 +21,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.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 893d2ef78..3cb2f626c 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.6.RELEASE + 3.0.0.RELEASE 1.1.1 1.2.17 4.10 diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 425791610..b25713a0f 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -8,8 +8,8 @@ war UTF-8 - 2.1.0.RELEASE - 3.1.0.RELEASE + 3.0.0.RELEASE + 3.2.6.RELEASE 1.6.10 1.6.1 diff --git a/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/TestAccumulator.java b/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java similarity index 98% rename from applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/TestAccumulator.java rename to applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java index bf2c19b54..1eff38b10 100644 --- a/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/TestAccumulator.java +++ b/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java @@ -36,11 +36,11 @@ */ @ContextConfiguration(locations="classpath:META-INF/spring/applicationContext.xml") @RunWith(SpringJUnit4ClassRunner.class) -public class TestAccumulator { +public class AccumulatorTests { @Autowired Accumulator accumulator; - + @Test @Transactional public void test() { diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 40c856146..eb64c8384 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 5fb5da255..0def98699 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 @@ -59,4 +59,4 @@ https://repo.springsource.org/libs-milestone - \ No newline at end of file + diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 50a0b3221..b0a2c2b8f 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index fba381303..fc3c4519f 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.0.RC2 + 3.0.0.RELEASE 1.2.17 4.10 @@ -57,4 +57,4 @@ https://repo.springsource.org/libs-milestone - \ No newline at end of file + diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 7f1d589f0..e44865a47 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 87cc6e797..0d8053fdd 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 3.0.0.M3 + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 98534e922..51c0946c9 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 org.springframework.integration.samples.helloworld.HelloWorldApp @@ -84,4 +84,4 @@ https://repo.springsource.org/libs-milestone - \ No newline at end of file + diff --git a/basic/http/pom.xml b/basic/http/pom.xml index a6d63ed4d..12f5cb7be 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -13,8 +13,8 @@ UTF-8 - 2.2.6.RELEASE - 3.1.3.RELEASE + 3.0.0.RELEASE + 3.2.6.RELEASE 1.2.2 1.3.2 1.2.17 diff --git a/basic/http/src/main/webapp/WEB-INF/servlet-config.xml b/basic/http/src/main/webapp/WEB-INF/servlet-config.xml index 503b59775..b4831c08e 100644 --- a/basic/http/src/main/webapp/WEB-INF/servlet-config.xml +++ b/basic/http/src/main/webapp/WEB-INF/servlet-config.xml @@ -11,10 +11,10 @@ xmlns:int-mail="http://www.springframework.org/schema/integration/mail"> - - - + + + diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 3f1cc211a..cff0ea646 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index b3f739919..fe4e9a48a 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 5.7.0 1.2.17 4.10 diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 8d6b45f02..06b900203 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 @@ -64,4 +64,4 @@ https://repo.springsource.org/libs-milestone - \ No newline at end of file + diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index e01136fd3..31c0adb95 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 2.2.0 @@ -40,7 +40,7 @@ central Maven Central - http://repo1.maven.org/maven2 + http://repo1.maven.org/maven diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index be1a9a59d..946a6e86a 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 @@ -68,4 +68,4 @@ https://repo.springsource.org/libs-milestone - \ No newline at end of file + diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 00987c566..3e842e0db 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 62198c636..22906c9df 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index e71c82023..73927b21e 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 69c5944c2..bffe83810 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -11,7 +11,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 71c040f9f..7f7fe8308 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.6.RELEASE + 3.0.0.RELEASE 1.6.4 4.10 diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index bea2f2f63..6f84f0e90 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -12,8 +12,8 @@ UTF-8 - 3.1.3.RELEASE - 2.2.6.RELEASE + 3.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 org.springframework.integration.samples.tcpclientserver.Main @@ -93,4 +93,4 @@ https://repo.springsource.org/libs-milestone - \ No newline at end of file + diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index b997e5c25..30e7b83e5 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -12,8 +12,8 @@ UTF-8 - 2.2.6.RELEASE - 3.1.3.RELEASE + 3.0.0.RELEASE + 3.2.6.RELEASE 1.2.17 4.10 diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 10444927b..17ab91e70 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.4.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 @@ -57,4 +57,4 @@ https://repo.springsource.org/libs-milestone - \ No newline at end of file + diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 0d3ab3de3..9ab5723af 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -12,8 +12,8 @@ UTF-8 - 2.2.6.RELEASE - 3.1.3.RELEASE + 3.0.0.RELEASE + 3.2.6.RELEASE 1.2.17 4.10 diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index a7e1a1bfe..2d8d9e9fa 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 1.3.19 @@ -82,4 +82,4 @@ https://repo.springsource.org/libs-milestone - \ No newline at end of file + diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index d5f4b6774..bec9b7766 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 @@ -65,4 +65,4 @@ https://repo.springsource.org/libs-milestone - \ No newline at end of file + diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index a2a27b436..2a4b7e817 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 @@ -57,4 +57,4 @@ https://repo.springsource.org/libs-milestone - \ No newline at end of file + diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 0eaa2e365..b83011c6b 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index aa8e5b899..229202e67 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.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 1e000d64a..bd971d516 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 44985ef04..7f4483e4a 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -7,7 +7,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 @@ -57,4 +57,4 @@ https://repo.springsource.org/libs-milestone - \ No newline at end of file + diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 74e51a49c..4871f0dc6 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -8,7 +8,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index b9908f4df..ce782d1a9 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.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 576e74dee..949df9e22 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -8,8 +8,8 @@ war UTF-8 - 2.2.6.RELEASE - 3.1.3.RELEASE + 3.0.0.RELEASE + 3.2.6.RELEASE 1.2.2 1.3.2 1.2.17 diff --git a/intermediate/multipart-http/src/main/webapp/WEB-INF/servlet-config.xml b/intermediate/multipart-http/src/main/webapp/WEB-INF/servlet-config.xml index f27f86701..11d517c4b 100644 --- a/intermediate/multipart-http/src/main/webapp/WEB-INF/servlet-config.xml +++ b/intermediate/multipart-http/src/main/webapp/WEB-INF/servlet-config.xml @@ -9,17 +9,17 @@ xmlns:int-file="http://www.springframework.org/schema/integration/file" xmlns:int-http="http://www.springframework.org/schema/integration/http"> - - - + - + - + diff --git a/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java b/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java index fee911932..d9f23d954 100644 --- a/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java +++ b/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java @@ -32,7 +32,7 @@ * */ public class MultipartRestClient { - + private static Logger logger = Logger.getLogger(MultipartRestClient.class); private static String uri = "http://localhost:8080/multipart-http/inboundAdapter.htm"; private static String resourcePath = "org/springframework/integration/samples/multipart/spring09_logo.png"; @@ -51,7 +51,7 @@ public static void main(String[] args) throws Exception{ headers.setContentType(new MediaType("multipart", "form-data")); HttpEntity request = new HttpEntity(multipartMap, headers); logger.info("Posting request to: " + uri); - ResponseEntity httpResponse = template.exchange(uri, HttpMethod.POST, request, null); + ResponseEntity httpResponse = template.exchange(uri, HttpMethod.POST, request, Object.class); if (!httpResponse.getStatusCode().equals(HttpStatus.OK)){ logger.error("Problems with the request. Http status: " + httpResponse.getStatusCode()); } diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index ec0363b21..adbe0a0ac 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -13,9 +13,9 @@ - 2.2.6.RELEASE - 3.1.3.RELEASE - 3.1.3.RELEASE + 3.0.0.RELEASE + 3.2.6.RELEASE + 3.1.4.RELEASE 1.2 1.3.2 1.2.17 diff --git a/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml b/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml index fee9fa23c..ae55e3c87 100644 --- a/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml +++ b/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml @@ -2,75 +2,75 @@ - + - - - - + - - - - + - + - - - - + - - - - - - - - - + + + + + + + + + + + + + - + - - + + - + - + - - - - - \ No newline at end of file + + + diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 278f0417b..26588ae4a 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.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 99f78d9ca..362b067c7 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -20,11 +20,11 @@ UTF-8 - 2.2.0.RC2 + 3.0.0.RELEASE 1.2.16 4.10 1 - 3.1.2.RELEASE + 3.2.6.RELEASE @@ -98,4 +98,4 @@ ${spring.version} - \ No newline at end of file + diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index f3d1f8590..1c9495c36 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index dad86ec2f..4eb5ba176 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -17,7 +17,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 697b47f41..cf024d2d6 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.2.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 60da2e154..8dc992fd4 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.2.6.RELEASE + 3.0.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 760ec5c54..45eef0ad4 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.1.3.RELEASE - 2.2.6.RELEASE + 3.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index d7fd5c9df..38d3e4c59 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -12,10 +12,10 @@ UTF-8 - 2.2.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 - 3.1.3.RELEASE + 3.2.6.RELEASE org.springframework.integration.samples.travel.Main diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 223a298a9..919daf3de 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.6.RELEASE + 3.0.0.RELEASE 1.2.17 4.10 From 56aee6fd91e50b6c5ab1ad40f64f09ae92947a98 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 30 Jan 2014 18:54:36 +0200 Subject: [PATCH 008/356] Enable Intermediate modules Ignore MS & Oracle tests --- .../resources/META-INF/spring/applicationContext.xml | 9 +++++---- applications/pom.xml | 1 + intermediate/pom.xml | 7 +++++++ .../integration/samples/StringConversionServiceTest.java | 2 ++ intermediate/stored-procedures-oracle/pom.xml | 4 ++++ .../integration/sts/StringConversionServiceTest.java | 6 +++--- 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/applications/loanshark/src/main/resources/META-INF/spring/applicationContext.xml b/applications/loanshark/src/main/resources/META-INF/spring/applicationContext.xml index 8cf2da1e6..2a7836680 100644 --- a/applications/loanshark/src/main/resources/META-INF/spring/applicationContext.xml +++ b/applications/loanshark/src/main/resources/META-INF/spring/applicationContext.xml @@ -37,15 +37,16 @@ instantiate your @Controller classes, as these should be instantiated by a web tier application context. Refer to web.xml for more details about the web tier application context setup services. - - Furthermore, this turns on @Autowired, @PostConstruct etc support. These - annotations allow you to use common Spring and Java Enterprise Edition - annotations in your classes without needing to do any special configuration. + + Furthermore, this turns on @Autowired, @PostConstruct etc support. These + annotations allow you to use common Spring and Java Enterprise Edition + annotations in your classes without needing to do any special configuration. The most commonly used annotation is @Autowired, which instructs Spring to dependency inject an object into your class. --> + diff --git a/applications/pom.xml b/applications/pom.xml index 0c9b8e90f..9263cd65d 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -11,6 +11,7 @@ cafe + cafe-scripted loan-broker loanshark diff --git a/intermediate/pom.xml b/intermediate/pom.xml index 425146c49..9b2f0bd6d 100644 --- a/intermediate/pom.xml +++ b/intermediate/pom.xml @@ -24,6 +24,13 @@ tcp-client-server-multiplex travel mail-attachments + dynamic-poller + monitoring + retry-and-more + stored-procedures-ms + stored-procedures-oracle + stored-procedures-postgresql + tx-synch diff --git a/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java b/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java index 27faa02ba..385206e3b 100644 --- a/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java +++ b/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java @@ -17,6 +17,7 @@ package org.springframework.integration.samples; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -25,6 +26,7 @@ /** * Verify that the Spring Integration Application Context starts successfully. */ +@Ignore public class StringConversionServiceTest { @Test diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index cf024d2d6..5911177cf 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -27,6 +27,10 @@ SpringSource Maven Milestone Repository https://repo.springsource.org/libs-milestone + + code.lds.org + https://code.lds.org/nexus/content/groups/main-repo + diff --git a/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java b/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java index 25d84c63b..ec4af2fc5 100644 --- a/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java +++ b/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java @@ -16,17 +16,17 @@ package org.springframework.integration.sts; -import static junit.framework.Assert.*; - +import org.junit.Ignore; import org.junit.Test; + import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; - import org.springframework.integration.service.StringConversionService; /** * Verify that the Spring Integration Application Context starts successfully. */ +@Ignore public class StringConversionServiceTest { @Test From e20219560fdac3838730718afe42ca020de03d50 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 31 Jan 2014 12:11:46 +0200 Subject: [PATCH 009/356] INTSAMPLES-125/126:SF 3.2.7, SI 3.0.1; Schemas JIRA: https://jira.springsource.org/browse/INTSAMPLES-125 Polishing some poms and enable all modules INTSAMPLES-126: Fix XSD versions vulnerability JIRA: https://jira.springsource.org/browse/INTSAMPLES-126 Polishing Add dummy JUnit to monitoring "test". --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 6 ++--- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/pom.xml | 8 +++---- applications/loan-broker/pom.xml | 2 +- applications/loanshark/pom.xml | 4 ++-- basic/amqp/pom.xml | 2 +- basic/control-bus/pom.xml | 2 +- basic/enricher/pom.xml | 2 +- basic/feed/pom.xml | 2 +- basic/file/pom.xml | 2 +- basic/ftp/pom.xml | 2 +- basic/helloworld/pom.xml | 2 +- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 2 +- basic/jms/pom.xml | 5 +++-- basic/jmx/pom.xml | 2 +- .../integration/JmxAdapterDemo-context.xml | 6 ++--- basic/jpa/pom.xml | 18 +++++---------- basic/mail/pom.xml | 2 +- basic/mongodb/pom.xml | 4 ++-- .../mongodb/inbound/mongodb-in-config.xml | 16 +++++++------- .../mongodb/outbound/mongodb-out-config.xml | 6 ++--- basic/oddeven/pom.xml | 2 +- basic/pom.xml | 2 ++ basic/quote/pom.xml | 2 +- basic/sftp/pom.xml | 2 +- basic/tcp-amqp/pom.xml | 9 +------- basic/tcp-client-server/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 2 +- basic/ws-inbound-gateway/pom.xml | 5 +++-- basic/ws-outbound-gateway/pom.xml | 2 +- basic/xml/pom.xml | 2 +- basic/xmpp/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 | 5 +++-- intermediate/monitoring/pom.xml | 8 +++---- .../integration/SpringIntegrationTest.java | 14 ++++++++++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 4 ++-- .../applicationContext-http-int.xml | 4 ++-- .../webapp/WEB-INF/config/security-config.xml | 14 ++++++------ .../WEB-INF/config/web-application-config.xml | 12 +++++----- .../integration/http-outbound-config.xml | 20 ++++++++--------- intermediate/retry-and-more/pom.xml | 6 ++--- .../circuit-breaker-advice-context.xml | 8 +++---- .../integration/expression-advice-context.xml | 16 +++++++------- .../stateful-retry-advice-context.xml | 22 +++++++++---------- .../stateless-retry-advice-context.xml | 14 ++++++------ .../splitter-aggregator-reaper/pom.xml | 5 +++-- 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 +- .../spring-integration-context.xml | 2 +- .../tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 12 +++++----- .../integration/transaction-synch-context.xml | 12 +++++----- 63 files changed, 177 insertions(+), 174 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 2d83eb9cb..a22447328 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.0.0.RELEASE - 3.2.6.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.11 diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 6a998c5c3..21870bff7 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -7,8 +7,8 @@ jar UTF-8 - 3.1.3.RELEASE - 3.0.0.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 @@ -16,7 +16,7 @@ org.springframework spring-context - ${spring.framework.version} + ${spring.version} org.springframework.integration diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 705b86de0..2acafe9e8 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -8,8 +8,8 @@ Samples (Applications) - Cafe Sample (Scripted Implementation) UTF-8 - 3.0.0.RELEASE - 3.2.6.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index 15240debb..1f5c0d4f1 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -21,8 +21,8 @@ UTF-8 - 3.0.0.RELEASE - 3.1.3.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 @@ -30,12 +30,12 @@ org.springframework spring-tx - ${spring.core.version} + ${spring.version} org.springframework spring-context - ${spring.core.version} + ${spring.version} org.springframework.integration diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 3cb2f626c..9e3a7b931 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -8,7 +8,7 @@ Samples (Applications) - Loan Broker UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.1.1 1.2.17 4.10 diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index b25713a0f..651aaf5cd 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -8,8 +8,8 @@ war UTF-8 - 3.0.0.RELEASE - 3.2.6.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.6.10 1.6.1 diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index eb64c8384..4e313741c 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 0def98699..4179aff0a 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index b0a2c2b8f..dae8c325c 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index fc3c4519f..3b2c95beb 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/file/pom.xml b/basic/file/pom.xml index e44865a47..5e7ee54ec 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 0d8053fdd..f45588f65 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 51c0946c9..6ceab69b8 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.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 12f5cb7be..d47a0198c 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -13,8 +13,8 @@ UTF-8 - 3.0.0.RELEASE - 3.2.6.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.2 1.3.2 1.2.17 diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index cff0ea646..46d4055e2 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index fe4e9a48a..51dd56cfb 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -14,7 +14,8 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 5.7.0 1.2.17 4.10 @@ -44,7 +45,7 @@ org.springframework spring-jms - 3.1.3.RELEASE + ${spring.version} compile diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 06b900203..a430b897b 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml b/basic/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml index f621c0d53..0fa4ac0f4 100644 --- a/basic/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml +++ b/basic/jmx/src/main/resources/META-INF/spring/integration/JmxAdapterDemo-context.xml @@ -6,7 +6,7 @@ xmlns:stream="http://www.springframework.org/schema/integration/stream" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/integration/jmx http://www.springframework.org/schema/integration/jmx/spring-integration-jmx-2.0.xsd + http://www.springframework.org/schema/integration/jmx http://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd"> @@ -28,8 +28,8 @@ - - \ No newline at end of file + diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 31c0adb95..bc97d9ef0 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -16,13 +16,13 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 2.2.0 2.3.2 4.0.1.Final - 3.1.3.RELEASE @@ -33,14 +33,8 @@ repo.eclipse - Spring Framework Maven Milestone Repository - http://download.eclipse.org/rt/eclipselink/maven.repo/ - - - - central - Maven Central - http://repo1.maven.org/maven + EclipseLink Maven Repository + http://download.eclipse.org/rt/eclipselink/maven.repo @@ -65,7 +59,7 @@ java - -javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring-instrument.version}/spring-instrument-${spring-instrument.version}.jar + -javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring.version}/spring-instrument-${spring.version}.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar -classpath @@ -104,7 +98,7 @@ org.springframework spring-instrument - ${spring-instrument.version} + ${spring.version} diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 946a6e86a..adbfca919 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 3e842e0db..5b3402f23 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 @@ -25,7 +25,7 @@ repo.springsource.org.milestone Spring Framework Maven Milestone Repository - https://repo.springsource.org/milestone + https://repo.spring.io/libs-milestone diff --git a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/inbound/mongodb-in-config.xml b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/inbound/mongodb-in-config.xml index 348ba872a..a6178d18e 100644 --- a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/inbound/mongodb-in-config.xml +++ b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/inbound/mongodb-in-config.xml @@ -4,21 +4,21 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-mongodb="http://www.springframework.org/schema/integration/mongodb" xmlns:mongo="http://www.springframework.org/schema/data/mongo" - xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo-1.1.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.2.xsd + xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/integration/mongodb http://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-2.2.xsd"> + http://www.springframework.org/schema/integration/mongodb http://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd"> - - - + - + - + diff --git a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/mongodb-out-config.xml b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/mongodb-out-config.xml index d865a0564..068c7906e 100644 --- a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/mongodb-out-config.xml +++ b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/mongodb-out-config.xml @@ -4,10 +4,10 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-mongodb="http://www.springframework.org/schema/integration/mongodb" xmlns:mongo="http://www.springframework.org/schema/data/mongo" - xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo-1.1.xsd - http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.2.xsd + xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo.xsd + http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/integration/mongodb http://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb-2.2.xsd"> + http://www.springframework.org/schema/integration/mongodb http://www.springframework.org/schema/integration/mongodb/spring-integration-mongodb.xsd"> diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 22906c9df..6a0256c75 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/pom.xml b/basic/pom.xml index 9bd80f728..69ff3d6ca 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -33,6 +33,8 @@ ws-outbound-gateway xml xmpp + mongodb + tcp-amqp diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 73927b21e..e0ec68bfe 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index bffe83810..b9111e3c3 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -11,7 +11,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 7f7fe8308..189f5c275 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -16,8 +16,7 @@ UTF-8 - 1.1.3.RELEASE - 3.0.0.RELEASE + 3.0.1.RELEASE 1.6.4 4.10 @@ -105,12 +104,6 @@ spring-integration-ip ${spring.integration.version} - - org.springframework.amqp - spring-rabbit - ${spring.amqp.version} - - diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 6f84f0e90..4d19880d6 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -12,8 +12,8 @@ UTF-8 - 3.2.6.RELEASE - 3.0.0.RELEASE + 3.2.7.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 org.springframework.integration.samples.tcpclientserver.Main diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 30e7b83e5..57a29ecae 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -12,8 +12,8 @@ UTF-8 - 3.0.0.RELEASE - 3.2.6.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 17ab91e70..ace3dc9a1 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 9ab5723af..04c42655f 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -12,8 +12,8 @@ UTF-8 - 3.0.0.RELEASE - 3.2.6.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 @@ -32,6 +32,7 @@ org.springframework spring-test ${spring.version} + test log4j diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 2d8d9e9fa..b86f9292b 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 1.3.19 diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index bec9b7766..33691558b 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 2a4b7e817..cca0a2256 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index b83011c6b..bd10c0b64 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 229202e67..2219f6e0e 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.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 bd971d516..aa5693a6a 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 7f4483e4a..0b972e071 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -7,7 +7,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 4871f0dc6..a4d9799af 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -8,7 +8,8 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 @@ -59,7 +60,7 @@ org.springframework spring-test - 3.1.3.RELEASE + ${spring.version} test diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index ce782d1a9..fa948a418 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -16,8 +16,8 @@ UTF-8 - 3.0.0.RELEASE - 3.1.3.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 @@ -78,13 +78,13 @@ org.springframework spring-context - ${org.springframework-version} + ${spring.version} org.springframework spring-webmvc - ${org.springframework-version} + ${spring.version} diff --git a/intermediate/monitoring/src/test/java/org/springframework/integration/SpringIntegrationTest.java b/intermediate/monitoring/src/test/java/org/springframework/integration/SpringIntegrationTest.java index 9a02a5e7d..8179cdc34 100644 --- a/intermediate/monitoring/src/test/java/org/springframework/integration/SpringIntegrationTest.java +++ b/intermediate/monitoring/src/test/java/org/springframework/integration/SpringIntegrationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,9 @@ package org.springframework.integration; +import org.junit.Test; + +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; /** @@ -27,9 +30,16 @@ public class SpringIntegrationTest { public static void main(String[] args) throws Exception { - new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", SpringIntegrationTest.class); + ConfigurableApplicationContext context = + new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", SpringIntegrationTest.class); System.out.println("Hit Enter to terminate"); System.in.read(); + context.close(); + } + + @Test + public void test() { + // no op for maven } } diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 949df9e22..95e7f4187 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -8,8 +8,8 @@ war UTF-8 - 3.0.0.RELEASE - 3.2.6.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.2 1.3.2 1.2.17 diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index adbe0a0ac..a21493433 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -13,8 +13,8 @@ - 3.0.0.RELEASE - 3.2.6.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 3.1.4.RELEASE 1.2 1.3.2 diff --git a/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml b/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml index ae55e3c87..9f9a8ec21 100644 --- a/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml +++ b/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml @@ -1,10 +1,10 @@ diff --git a/intermediate/rest-http/src/main/webapp/WEB-INF/config/security-config.xml b/intermediate/rest-http/src/main/webapp/WEB-INF/config/security-config.xml index 1109cc0b0..1bf85f936 100644 --- a/intermediate/rest-http/src/main/webapp/WEB-INF/config/security-config.xml +++ b/intermediate/rest-http/src/main/webapp/WEB-INF/config/security-config.xml @@ -3,20 +3,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-3.1.xsd"> + http://www.springframework.org/schema/security/spring-security.xsd"> - - + + - - @@ -47,4 +47,4 @@ - \ No newline at end of file + diff --git a/intermediate/rest-http/src/main/webapp/WEB-INF/config/web-application-config.xml b/intermediate/rest-http/src/main/webapp/WEB-INF/config/web-application-config.xml index f9f133602..b5627086f 100644 --- a/intermediate/rest-http/src/main/webapp/WEB-INF/config/web-application-config.xml +++ b/intermediate/rest-http/src/main/webapp/WEB-INF/config/web-application-config.xml @@ -4,13 +4,13 @@ xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + http://www.springframework.org/schema/context/spring-context.xsd"> + - + - - \ No newline at end of file + + diff --git a/intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml b/intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml index 7eb39a9cb..6538278f3 100644 --- a/intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml +++ b/intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-http="http://www.springframework.org/schema/integration/http" xmlns:oxm="http://www.springframework.org/schema/oxm" - xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + xmlns:context="http://www.springframework.org/schema/context" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd - http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - - + http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + @@ -25,11 +25,11 @@ - + - + - + - + diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 26588ae4a..25b2321a4 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.1.3.RELEASE - 3.0.0.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 @@ -55,7 +55,7 @@ org.springframework spring-test - ${spring.framework.version} + ${spring.version} junit diff --git a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/circuit-breaker-advice-context.xml b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/circuit-breaker-advice-context.xml index ddf9691fb..fedfcf526 100644 --- a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/circuit-breaker-advice-context.xml +++ b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/circuit-breaker-advice-context.xml @@ -4,7 +4,7 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-stream="http://www.springframework.org/schema/integration/stream" xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream-2.2.xsd + http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> @@ -12,15 +12,15 @@ - - - + diff --git a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml index fce3c05fd..9af49c2e9 100644 --- a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml +++ b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml @@ -6,12 +6,12 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:int-file="http://www.springframework.org/schema/integration/file" xmlns:int-ftp="http://www.springframework.org/schema/integration/ftp" - xsi:schemaLocation="http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp-2.2.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration/ftp http://www.springframework.org/schema/integration/ftp/spring-integration-ftp.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-2.2.xsd - http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream-2.2.xsd + http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd + http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> @@ -43,16 +43,16 @@ - + - + - + - + diff --git a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateful-retry-advice-context.xml b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateful-retry-advice-context.xml index 29252e82a..36e425779 100644 --- a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateful-retry-advice-context.xml +++ b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateful-retry-advice-context.xml @@ -5,10 +5,10 @@ xmlns:int-stream="http://www.springframework.org/schema/integration/stream" xmlns:int-amqp="http://www.springframework.org/schema/integration/amqp" xmlns:rabbit="http://www.springframework.org/schema/rabbit" - xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp-2.2.xsd + xsi:schemaLocation="http://www.springframework.org/schema/integration/amqp http://www.springframework.org/schema/integration/amqp/spring-integration-amqp.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream-2.2.xsd - http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit-1.1.xsd + http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd + http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> @@ -18,13 +18,13 @@ - + @@ -32,24 +32,24 @@ - + - - + @@ -89,9 +89,9 @@ - + - + diff --git a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateless-retry-advice-context.xml b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateless-retry-advice-context.xml index 6e897dac2..60db37099 100644 --- a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateless-retry-advice-context.xml +++ b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateless-retry-advice-context.xml @@ -4,7 +4,7 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-stream="http://www.springframework.org/schema/integration/stream" xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream-2.2.xsd + http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> @@ -12,19 +12,19 @@ - + - - + @@ -39,7 +39,7 @@ - + @@ -67,9 +67,9 @@ - + - + diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 362b067c7..a1d390090 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -20,11 +20,11 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.16 4.10 1 - 3.2.6.RELEASE + 3.2.7.RELEASE @@ -96,6 +96,7 @@ org.springframework spring-test ${spring.version} + test diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 1c9495c36..6d652741b 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 4eb5ba176..6f4515c23 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -17,7 +17,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 5911177cf..be76ae4aa 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 8dc992fd4..96c2f207f 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index 7456ab4aa..f8e0c2da3 100644 --- a/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -7,7 +7,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/integration/jdbc file:///Users/hillert/dev/git/spring-integration/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-2.2.xsd + http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/spring-integration-jdbc.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"> diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 45eef0ad4..b73c4e8b6 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.2.6.RELEASE - 3.0.0.RELEASE + 3.2.7.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 38d3e4c59..93e34a6c6 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -12,10 +12,10 @@ UTF-8 - 3.0.0.RELEASE + 3.0.1.RELEASE 1.2.17 4.10 - 3.2.6.RELEASE + 3.2.7.RELEASE org.springframework.integration.samples.travel.Main diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 919daf3de..a19313f74 100755 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.1.3.RELEASE - 3.0.0.RELEASE + 3.0.1.RELEASE + 3.2.7.RELEASE 1.2.17 4.10 @@ -44,7 +44,7 @@ org.springframework spring-jdbc - ${spring.framework.version} + ${spring.version} com.h2database @@ -65,7 +65,7 @@ org.springframework spring-test - ${spring.framework.version} + ${spring.version} junit @@ -92,7 +92,7 @@ exec-maven-plugin 1.2 - ${java.main.class} + org.springframework.integration.samples.advice.TransactionSynchronizationDemo @@ -101,7 +101,7 @@ repo.springsource.org.milestone Spring Framework Maven Milestone Repository - https://repo.springsource.org/libs-snapshot + https://repo.spring.io/libs-milestone diff --git a/intermediate/tx-synch/src/main/resources/META-INF/spring/integration/transaction-synch-context.xml b/intermediate/tx-synch/src/main/resources/META-INF/spring/integration/transaction-synch-context.xml index 9244deacf..1caf95b60 100755 --- a/intermediate/tx-synch/src/main/resources/META-INF/spring/integration/transaction-synch-context.xml +++ b/intermediate/tx-synch/src/main/resources/META-INF/spring/integration/transaction-synch-context.xml @@ -10,7 +10,7 @@ xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd - http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc-2.2.xsd + http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd http://www.springframework.org/schema/integration/stream http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> @@ -30,20 +30,20 @@ - - + - - - + From d9fba154b306a8c7f4a134cae216ac4daa5000e4 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Sun, 23 Feb 2014 12:48:26 -0500 Subject: [PATCH 010/356] Change Maven Repos to spring.io --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 2 +- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 4 ++-- intermediate/retry-and-more/pom.xml | 4 ++-- intermediate/splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- intermediate/stored-procedures-postgresql/pom.xml | 4 ++-- intermediate/tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 2 +- 48 files changed, 94 insertions(+), 94 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index a22447328..1ecc87ca9 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -117,9 +117,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 21870bff7..1dd30d51f 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -77,9 +77,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 2acafe9e8..b8e97d131 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -195,9 +195,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index 1f5c0d4f1..fa23bc45e 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -83,9 +83,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 9e3a7b931..83e925cdf 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -54,9 +54,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 651aaf5cd..1ca926acc 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -15,9 +15,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 4e313741c..2574beaa4 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -23,9 +23,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 4179aff0a..a0d0c5381 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -54,9 +54,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index dae8c325c..9f31ab169 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -23,9 +23,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 3b2c95beb..e2d43718e 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -52,9 +52,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 5e7ee54ec..08e2f677a 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -52,9 +52,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index f45588f65..bca07d737 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -91,9 +91,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 6ceab69b8..b9f48359f 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -79,9 +79,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/http/pom.xml b/basic/http/pom.xml index d47a0198c..d8437e378 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -87,9 +87,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 46d4055e2..7ed675ea8 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -23,9 +23,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 51dd56cfb..fbb431d20 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -107,9 +107,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index a430b897b..90542bce7 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -59,9 +59,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index bc97d9ef0..a4e15869b 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -27,9 +27,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone repo.eclipse diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index adbfca919..ccd25a738 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -63,9 +63,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 5b3402f23..cd16ed32b 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -23,7 +23,7 @@ - repo.springsource.org.milestone + repo.spring.io.milestone Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 6a0256c75..dbf0bab35 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -79,9 +79,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index e0ec68bfe..fef366425 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -52,9 +52,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index b9111e3c3..24a6d03ef 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -51,9 +51,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 189f5c275..858df5dad 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -23,9 +23,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 4d19880d6..c535dd690 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -88,9 +88,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 57a29ecae..ed63b14dc 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -131,9 +131,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index ace3dc9a1..f6208e6c5 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -52,9 +52,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 04c42655f..9847087dc 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -64,9 +64,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index b86f9292b..18c0b6835 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -77,9 +77,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 33691558b..77c739f1a 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -60,9 +60,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index cca0a2256..abfce5939 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -52,9 +52,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index bd10c0b64..271e1f284 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -53,9 +53,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 2219f6e0e..44abc6f8e 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -66,9 +66,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index aa5693a6a..42a34ad6c 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -58,9 +58,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 0b972e071..3ea465ced 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -52,9 +52,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index a4d9799af..3a2aaf491 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -102,9 +102,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone Spring Framework Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index fa948a418..78cfcd31c 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -24,9 +24,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 95e7f4187..099230aad 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -76,9 +76,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index a21493433..b1af91438 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -225,9 +225,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 25b2321a4..818c8ed6b 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -89,9 +89,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone Spring Framework Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index a1d390090..8d2999815 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -29,9 +29,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone Spring Framework Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 6d652741b..73520558f 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -23,9 +23,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 6f4515c23..811d84ccd 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -24,9 +24,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone Spring Framework Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index be76ae4aa..d789e46bf 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -23,9 +23,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone code.lds.org diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 96c2f207f..74db77013 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -23,9 +23,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index b73c4e8b6..b478b0d5b 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -71,9 +71,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 93e34a6c6..c61649610 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -84,9 +84,9 @@ - repo.springsource.org.milestone + repo.spring.io.milestone SpringSource Maven Milestone Repository - https://repo.springsource.org/libs-milestone + https://repo.spring.io/libs-milestone diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index a19313f74..bbf47dd27 100755 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -99,7 +99,7 @@ - repo.springsource.org.milestone + repo.spring.io.milestone Spring Framework Maven Milestone Repository https://repo.spring.io/libs-milestone From 33f8783f13a47cec9dc55559ad73c241d65c376b Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Mon, 31 Mar 2014 16:03:55 -0400 Subject: [PATCH 011/356] INTSAMPLES-128 Update SI to 3.0.2, SF to 3.2.8 --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 2 +- applications/loanshark/pom.xml | 4 ++-- basic/amqp/pom.xml | 2 +- basic/control-bus/pom.xml | 2 +- basic/enricher/pom.xml | 2 +- basic/feed/pom.xml | 2 +- basic/file/pom.xml | 2 +- basic/ftp/pom.xml | 2 +- basic/helloworld/pom.xml | 2 +- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 2 +- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 2 +- basic/jpa/pom.xml | 4 ++-- 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 | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 2 +- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 2 +- basic/xml/pom.xml | 2 +- basic/xmpp/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 | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 4 ++-- intermediate/retry-and-more/pom.xml | 4 ++-- intermediate/splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 2 +- intermediate/stored-procedures-ms/pom.xml | 2 +- intermediate/stored-procedures-oracle/pom.xml | 2 +- intermediate/stored-procedures-postgresql/pom.xml | 2 +- intermediate/tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 48 files changed, 68 insertions(+), 68 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 1ecc87ca9..e1c10f54d 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.0.1.RELEASE - 3.2.7.RELEASE + 3.0.2.RELEASE + 3.2.8.RELEASE 1.2.17 4.11 diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 1dd30d51f..1d6fb9329 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -7,8 +7,8 @@ jar UTF-8 - 3.0.1.RELEASE - 3.2.7.RELEASE + 3.0.2.RELEASE + 3.2.8.RELEASE 1.2.17 4.10 diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index b8e97d131..c389673e0 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -8,8 +8,8 @@ Samples (Applications) - Cafe Sample (Scripted Implementation) UTF-8 - 3.0.1.RELEASE - 3.2.7.RELEASE + 3.0.2.RELEASE + 3.2.8.RELEASE 1.2.17 4.10 diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index fa23bc45e..db5498a92 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -21,8 +21,8 @@ UTF-8 - 3.0.1.RELEASE - 3.2.7.RELEASE + 3.0.2.RELEASE + 3.2.8.RELEASE 1.2.17 4.10 diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 83e925cdf..785ee4dd9 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -8,7 +8,7 @@ Samples (Applications) - Loan Broker UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.1.1 1.2.17 4.10 diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 1ca926acc..e733867fa 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -8,8 +8,8 @@ war UTF-8 - 3.0.1.RELEASE - 3.2.7.RELEASE + 3.0.2.RELEASE + 3.2.8.RELEASE 1.6.10 1.6.1 diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 2574beaa4..1e58b99b8 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index a0d0c5381..dc2432cf1 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 9f31ab169..43943d28d 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index e2d43718e..f4577ad5f 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 08e2f677a..909aa66b5 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index bca07d737..d9c0e2d82 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index b9f48359f..21de21f3e 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.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 d8437e378..4ba31060c 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -13,8 +13,8 @@ UTF-8 - 3.0.1.RELEASE - 3.2.7.RELEASE + 3.0.2.RELEASE + 3.2.8.RELEASE 1.2.2 1.3.2 1.2.17 diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 7ed675ea8..26e4affa6 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index fbb431d20..c0e0506c1 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.0.1.RELEASE - 3.2.7.RELEASE + 3.0.2.RELEASE + 3.2.8.RELEASE 5.7.0 1.2.17 4.10 diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 90542bce7..96bb222f1 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index a4e15869b..644a19efd 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -16,8 +16,8 @@ UTF-8 - 3.0.1.RELEASE - 3.2.7.RELEASE + 3.0.2.RELEASE + 3.2.8.RELEASE 1.2.17 4.10 2.2.0 diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index ccd25a738..5340ad957 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index cd16ed32b..659e71d02 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index dbf0bab35..81bd00350 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index fef366425..1480c32ff 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 24a6d03ef..355949322 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -11,7 +11,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 858df5dad..c2c25e2d8 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.6.4 4.10 diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index c535dd690..e489d3cab 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -12,8 +12,8 @@ UTF-8 - 3.2.7.RELEASE - 3.0.1.RELEASE + 3.2.8.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 org.springframework.integration.samples.tcpclientserver.Main diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index ed63b14dc..d0f2c499d 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -12,8 +12,8 @@ UTF-8 - 3.0.1.RELEASE - 3.2.7.RELEASE + 3.0.2.RELEASE + 3.2.8.RELEASE 1.2.17 4.10 diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index f6208e6c5..a19d73c89 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 9847087dc..64bc7fb5d 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -12,8 +12,8 @@ UTF-8 - 3.0.1.RELEASE - 3.2.7.RELEASE + 3.0.2.RELEASE + 3.2.8.RELEASE 1.2.17 4.10 diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 18c0b6835..438e34edb 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 1.3.19 diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 77c739f1a..7034ccb52 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index abfce5939..c364016dd 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 271e1f284..0c226881c 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 44abc6f8e..85e318488 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.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 42a34ad6c..24c3c2c9c 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 3ea465ced..6d3cec1cb 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -7,7 +7,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 3a2aaf491..3e0b13207 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -8,8 +8,8 @@ UTF-8 - 3.0.1.RELEASE - 3.2.7.RELEASE + 3.0.2.RELEASE + 3.2.8.RELEASE 1.2.17 4.10 diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 78cfcd31c..5e99b4d9f 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -16,8 +16,8 @@ UTF-8 - 3.0.1.RELEASE - 3.2.7.RELEASE + 3.0.2.RELEASE + 3.2.8.RELEASE 1.2.17 4.10 diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 099230aad..4b9be2b1a 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -8,8 +8,8 @@ war UTF-8 - 3.0.1.RELEASE - 3.2.7.RELEASE + 3.0.2.RELEASE + 3.2.8.RELEASE 1.2.2 1.3.2 1.2.17 diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index b1af91438..9f5fd075f 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -13,8 +13,8 @@ - 3.0.1.RELEASE - 3.2.7.RELEASE + 3.0.2.RELEASE + 3.2.8.RELEASE 3.1.4.RELEASE 1.2 1.3.2 diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 818c8ed6b..6c1bc35b9 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.0.1.RELEASE - 3.2.7.RELEASE + 3.0.2.RELEASE + 3.2.8.RELEASE 1.2.17 4.10 diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 8d2999815..c494004eb 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -20,11 +20,11 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.16 4.10 1 - 3.2.7.RELEASE + 3.2.8.RELEASE diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 73520558f..bfa3f17d5 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 811d84ccd..684fbff26 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -17,7 +17,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index d789e46bf..8bb7915b6 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 74db77013..759ebe05f 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.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 b478b0d5b..504e15230 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.2.7.RELEASE - 3.0.1.RELEASE + 3.2.8.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index c61649610..7cc940391 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -12,10 +12,10 @@ UTF-8 - 3.0.1.RELEASE + 3.0.2.RELEASE 1.2.17 4.10 - 3.2.7.RELEASE + 3.2.8.RELEASE org.springframework.integration.samples.travel.Main diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index bbf47dd27..83b9bdf39 100755 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.0.1.RELEASE - 3.2.7.RELEASE + 3.0.2.RELEASE + 3.2.8.RELEASE 1.2.17 4.10 From c5b1ace70fa37a5f476d2e55ed006c588042391a Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 15 Apr 2014 08:35:46 -0400 Subject: [PATCH 012/356] Fix Typo in tcp-amqp Sample Config --- .../META-INF/spring/integration/spring-integration-context.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basic/tcp-amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/basic/tcp-amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index 4f277d9e7..bbc13dd29 100644 --- a/basic/tcp-amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/basic/tcp-amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -23,7 +23,7 @@ amqp-template="amqpTemplate" exchange-name="si.test.exchange" routing-key="si.test.binding"/> - + Date: Tue, 1 Apr 2014 17:41:35 -0400 Subject: [PATCH 013/356] INTSAMPLES-127 Polishing - PR Comments - Switch to Jackson2 - Fix oxm config Polishing INTSAMPLES-127 Update to SI 4.0.0.RC1 INTSAMPLES-127 Remove Servlet Dependency travel sample; see INT-3350. INTSAMPLES-127 Update Samples to SI 4.0.0 JIRA: https://jira.spring.io/browse/INTSAMPLES-127 Created `maint` branch for ongoing SI 3.0.x samples. --- README.md | 4 + advanced/advanced-testing-examples/pom.xml | 4 +- .../advance/testing/jms/JmsMockTests.java | 10 +-- advanced/dynamic-ftp/pom.xml | 11 ++- .../ftp/DynamicFtpChannelResolver.java | 2 +- .../ftp/DynamicFtpChannelResolverTests.java | 2 +- .../ftp/FtpOutboundChannelAdapterSample.java | 46 ++++++----- applications/cafe-scripted/pom.xml | 4 +- .../amqp/cafeDemo-amqp-config-xml.xml | 2 +- applications/cafe/pom.xml | 10 +-- applications/loan-broker/pom.xml | 2 +- applications/loanshark/pom.xml | 76 +------------------ basic/amqp/pom.xml | 2 +- basic/control-bus/pom.xml | 2 +- .../controlbus/ControlBusDemoTest.java | 16 ++-- basic/enricher/pom.xml | 2 +- basic/feed/pom.xml | 2 +- .../feed/FeedInboundChannelAdapterSample.java | 11 +-- basic/file/pom.xml | 2 +- basic/ftp/pom.xml | 2 +- .../ftp/FtpInboundChannelAdapterSample.java | 4 +- .../ftp/FtpOutboundChannelAdapterSample.java | 4 +- basic/helloworld/pom.xml | 2 +- .../samples/helloworld/HelloWorldApp.java | 6 +- basic/http/pom.xml | 4 +- basic/jdbc/pom.xml | 2 +- basic/jms/pom.xml | 4 +- .../samples/jms/ChannelAdapterDemoTest.java | 4 +- .../samples/jms/GatewayDemoTest.java | 4 +- basic/jmx/pom.xml | 2 +- basic/jpa/pom.xml | 4 +- basic/mail/pom.xml | 2 +- .../GmailInboundImapIdleAdapterTestApp.java | 6 +- .../GmailInboundPop3AdapterTestApp.java | 6 +- basic/mongodb/pom.xml | 2 +- .../outbound/MongoDbOutboundAdapterDemo.java | 4 +- basic/oddeven/pom.xml | 2 +- basic/quote/pom.xml | 2 +- basic/sftp/pom.xml | 2 +- .../sftp/SftpInboundReceiveSample.java | 2 +- .../sftp/SftpOutboundTransferSample.java | 4 +- basic/tcp-amqp/pom.xml | 2 +- basic/tcp-client-server/pom.xml | 4 +- .../TcpServerConnectionDeserializeTest.java | 9 ++- .../TcpServerCustomSerializerTest.java | 6 +- basic/testing-examples/pom.xml | 9 +-- .../src/main/resources/log4j.xml | 2 +- .../CommaDelimitedAggregatorTests.java | 4 +- .../samples/testing/chain/SpelChainTests.java | 4 +- .../testing/errorhandling/GatewayTests.java | 6 +- .../testing/filter/PetFilterTests.java | 4 +- .../samples/testing/gateway/GatewayTests.java | 2 +- .../testing/router/PetRouterTests.java | 4 +- .../splitter/CommaDelimitedSplitterTests.java | 4 +- basic/twitter/pom.xml | 2 +- .../twitter/TwitterSendUpdatesSample.java | 6 +- basic/ws-inbound-gateway/pom.xml | 4 +- basic/ws-outbound-gateway/pom.xml | 2 +- .../samples/ws/WebServiceDemoTestApp.java | 10 +-- basic/xml/pom.xml | 2 +- .../xml/BookOrderProcessingTestApp.java | 4 +- basic/xmpp/pom.xml | 2 +- .../xmpp/SendInstantMessageSample.java | 6 +- intermediate/async-gateway/pom.xml | 2 +- intermediate/dynamic-poller/pom.xml | 2 +- intermediate/errorhandling/pom.xml | 2 +- .../samples/errorhandling/ErrorUnwrapper.java | 6 +- intermediate/file-processing/pom.xml | 2 +- .../fileprocessing/FileProcessingTest.java | 2 +- intermediate/mail-attachments/pom.xml | 4 +- .../support/EmailSplitter.java | 2 +- intermediate/monitoring/pom.xml | 4 +- .../PayloadAwareTimingInterceptor.java | 6 +- .../service/impl/DefaultTwitterService.java | 4 +- intermediate/multipart-http/pom.xml | 10 +-- .../MultipartClientForHttpOutboundClient.java | 3 +- intermediate/rest-http/pom.xml | 22 ++++-- .../rest/json/JaxbJacksonObjectMapper.java | 25 +++--- .../view/ExtendedMappingJacksonJsonView.java | 13 ++-- .../rest/service/EmployeeSearchService.java | 6 +- .../applicationContext-http-int.xml | 2 +- .../samples/rest/RestHttpClientTest.java | 21 +++-- .../integration/http-outbound-config.xml | 4 +- intermediate/retry-and-more/pom.xml | 4 +- .../splitter-aggregator-reaper/pom.xml | 4 +- .../TestSplitterAggregator.java | 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 | 4 +- intermediate/travel/pom.xml | 4 +- intermediate/tx-synch/pom.xml | 4 +- 93 files changed, 262 insertions(+), 292 deletions(-) diff --git a/README.md b/README.md index 78b57ad60..70bc6f08c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ Spring Integration Samples ========================== +# Note + +This (master) branch requires Spring Integration 4.0 or above. For samples running against earlier versions of Spring Integration, use the __maint__ branch. + # Introduction Welcome to the **Spring Integration Samples** repository which provides **50+ samples** to help you learn [Spring Integration][]. To simplify your experience, the *Spring Integration* samples are split into 4 distinct categories: diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index e1c10f54d..97244faa4 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.0.2.RELEASE - 3.2.8.RELEASE + 4.0.0.RC1 + 4.0.3.RELEASE 1.2.17 4.11 diff --git a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java index dccfcc1c2..3ebbd9461 100644 --- a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java +++ b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java @@ -30,11 +30,11 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.support.converter.SimpleMessageConverter; diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 1d6fb9329..416e4e704 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -7,10 +7,10 @@ jar UTF-8 - 3.0.2.RELEASE - 3.2.8.RELEASE + 4.0.0.RC1 + 4.0.3.RELEASE 1.2.17 - 4.10 + 4.11 @@ -34,6 +34,11 @@ junit ${junit.version} + + org.hamcrest + hamcrest-all + 1.3 + diff --git a/advanced/dynamic-ftp/src/main/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolver.java b/advanced/dynamic-ftp/src/main/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolver.java index 889d435e0..da667255c 100644 --- a/advanced/dynamic-ftp/src/main/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolver.java +++ b/advanced/dynamic-ftp/src/main/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolver.java @@ -25,7 +25,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.env.PropertiesPropertySource; import org.springframework.core.env.StandardEnvironment; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; /** * Demonstrates how a dynamic Spring Integration flow snippet can be used diff --git a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolverTests.java b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolverTests.java index bb77a4b38..0e73d55cd 100644 --- a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolverTests.java +++ b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolverTests.java @@ -18,7 +18,7 @@ import static org.junit.Assert.*; import org.junit.Test; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; /** * @author Gary Russell diff --git a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java index a4c185bca..b4a496495 100644 --- a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java +++ b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,19 +15,22 @@ */ package org.springframework.integration.samples.ftp; +import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.io.File; import java.net.UnknownHostException; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; /** * @author Gary Russell @@ -47,25 +50,28 @@ public void runDemo() throws Exception{ .build(); try { channel.send(message); - } catch (MessagingException e) { - assertTrue(e.getCause().getCause() instanceof UnknownHostException); - assertTrue(e.getCause().getCause().getMessage().startsWith("host.for.cust1")); + } + catch (MessagingException e) { + assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); + assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust1")); } // send another so we can see in the log we don't create the ac again. try { channel.send(message); - } catch (MessagingException e) { - assertTrue(e.getCause().getCause() instanceof UnknownHostException); - assertTrue(e.getCause().getCause().getMessage().startsWith("host.for.cust1")); + } + catch (MessagingException e) { + assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); + assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust1")); } // send to a different customer; again, check the log to see a new ac is built message = MessageBuilder.withPayload(file) .setHeader("customer", "cust2").build(); try { channel.send(message); - } catch (MessagingException e) { - assertTrue(e.getCause().getCause() instanceof UnknownHostException); - assertTrue(e.getCause().getCause().getMessage().startsWith("host.for.cust2")); + } + catch (MessagingException e) { + assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); + assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust2")); } // send to a different customer; again, check the log to see a new ac is built @@ -74,9 +80,10 @@ public void runDemo() throws Exception{ .setHeader("customer", "cust3").build(); try { channel.send(message); - } catch (MessagingException e) { - assertTrue(e.getCause().getCause() instanceof UnknownHostException); - assertTrue(e.getCause().getCause().getMessage().startsWith("host.for.cust3")); + } + catch (MessagingException e) { + assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); + assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust3")); } //send to cust1 again, since this one has been invalidated before, we should @@ -85,9 +92,10 @@ public void runDemo() throws Exception{ .setHeader("customer", "cust1").build(); try { channel.send(message); - } catch (MessagingException e) { - assertTrue(e.getCause().getCause() instanceof UnknownHostException); - assertEquals("host.for.cust1", e.getCause().getCause().getMessage()); + } + catch (MessagingException e) { + assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); + assertEquals("host.for.cust1", e.getCause().getCause().getCause().getMessage()); } ctx.close(); diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index c389673e0..60a5c84e7 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -8,8 +8,8 @@ Samples (Applications) - Cafe Sample (Scripted Implementation) UTF-8 - 3.0.2.RELEASE - 3.2.8.RELEASE + 4.0.0.RC1 + 4.0.3.RELEASE 1.2.17 4.10 diff --git a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-config-xml.xml b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-config-xml.xml index f20a517b9..66ff9b2f5 100644 --- a/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-config-xml.xml +++ b/applications/cafe/cafe-amqp/src/main/resources/META-INF/spring/integration/amqp/cafeDemo-amqp-config-xml.xml @@ -21,7 +21,7 @@ - + diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index db5498a92..d983753c7 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -21,8 +21,8 @@ UTF-8 - 3.0.2.RELEASE - 3.2.8.RELEASE + 4.0.0.RC1 + 4.0.3.RELEASE 1.2.17 4.10 @@ -49,9 +49,9 @@ 1.9.2 - org.codehaus.jackson - jackson-mapper-asl - 1.9.2 + com.fasterxml.jackson.core + jackson-databind + 2.3.2 log4j diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 785ee4dd9..4c8cf11cb 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -8,7 +8,7 @@ Samples (Applications) - Loan Broker UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.1.1 1.2.17 4.10 diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index e733867fa..5bd9bbf1e 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -8,9 +8,8 @@ war UTF-8 - 3.0.2.RELEASE - 3.2.8.RELEASE - 1.6.10 + 4.0.0.RC1 + 4.0.3.RELEASE 1.6.1 @@ -49,11 +48,6 @@ slf4j-log4j12 ${slf4j.version} - - org.aspectj - aspectjrt - ${aspectj.version} - javax.servlet servlet-api @@ -99,11 +93,6 @@ spring-aop ${spring.version} - - org.springframework - spring-aspects - ${spring.version} - org.springframework spring-tx @@ -345,43 +334,6 @@ 1.6 - - org.codehaus.mojo - aspectj-maven-plugin - 1.0 - - - - org.aspectj - aspectjrt - ${aspectj.version} - - - org.aspectj - aspectjtools - ${aspectj.version} - - - - - - compile - test-compile - - - - - true - - - org.springframework - spring-aspects - - - 1.6 - 1.6 - - org.apache.maven.plugins maven-resources-plugin @@ -416,30 +368,6 @@ 2.5 - - org.apache.maven.plugins - maven-eclipse-plugin - 2.7 - - true - false - 2.0 - - - org.eclipse.ajdt.core.ajbuilder - - org.springframework.aspects - - - - org.springframework.ide.eclipse.core.springbuilder - - - - org.springframework.ide.eclipse.core.springnature - - - org.apache.maven.plugins maven-idea-plugin diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 1e58b99b8..016239cd5 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index dc2432cf1..f12eb8a10 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/basic/control-bus/src/test/java/org/springframework/integration/samples/controlbus/ControlBusDemoTest.java b/basic/control-bus/src/test/java/org/springframework/integration/samples/controlbus/ControlBusDemoTest.java index b44c515c0..c1e544ce5 100644 --- a/basic/control-bus/src/test/java/org/springframework/integration/samples/controlbus/ControlBusDemoTest.java +++ b/basic/control-bus/src/test/java/org/springframework/integration/samples/controlbus/ControlBusDemoTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,23 +18,24 @@ import org.apache.log4j.Logger; import org.junit.Test; -import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.support.GenericMessage; /** * @author Oleg Zhurakousky * */ public class ControlBusDemoTest { - + private static Logger logger = Logger.getLogger(ControlBusDemoTest.class); @Test public void demoControlBus(){ - ApplicationContext ac = new ClassPathXmlApplicationContext("/META-INF/spring/integration/ControlBusDemo-context.xml"); + ConfigurableApplicationContext ac = new ClassPathXmlApplicationContext( + "/META-INF/spring/integration/ControlBusDemo-context.xml"); MessageChannel controlChannel = ac.getBean("controlChannel", MessageChannel.class); PollableChannel adapterOutputChanel = ac.getBean("adapterOutputChanel", PollableChannel.class); logger.info("Received before adapter started: " + adapterOutputChanel.receive(1000)); @@ -42,5 +43,6 @@ public void demoControlBus(){ logger.info("Received before adapter started: " + adapterOutputChanel.receive(1000)); controlChannel.send(new GenericMessage("@inboundAdapter.stop()")); logger.info("Received after adapter stopped: " + adapterOutputChanel.receive(1000)); + ac.close(); } } diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 43943d28d..357e68c79 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index f4577ad5f..13ad91d41 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/basic/feed/src/test/java/org/springframework/integration/samples/feed/FeedInboundChannelAdapterSample.java b/basic/feed/src/test/java/org/springframework/integration/samples/feed/FeedInboundChannelAdapterSample.java index 0fc024ce1..65c74bbb4 100644 --- a/basic/feed/src/test/java/org/springframework/integration/samples/feed/FeedInboundChannelAdapterSample.java +++ b/basic/feed/src/test/java/org/springframework/integration/samples/feed/FeedInboundChannelAdapterSample.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,10 +17,10 @@ import org.junit.Test; -import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import com.sun.syndication.feed.synd.SyndEntry; @@ -33,7 +33,7 @@ public class FeedInboundChannelAdapterSample { @SuppressWarnings("unchecked") @Test public void runDemo(){ - ApplicationContext ac = + ConfigurableApplicationContext ac = new ClassPathXmlApplicationContext("META-INF/spring/integration/FeedInboundChannelAdapterSample-context.xml"); PollableChannel feedChannel = ac.getBean("feedChannel", PollableChannel.class); for (int i = 0; i < 10; i++) { @@ -46,5 +46,6 @@ public void runDemo(){ break; } } + ac.close(); } } diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 909aa66b5..5ecfc6a19 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index d9c0e2d82..5acf1df2e 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java index dee7ca78a..4ab722811 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java @@ -22,8 +22,8 @@ import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; /** * diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java index fbff4ef73..4e5d17461 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java @@ -25,8 +25,8 @@ import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.support.MessageBuilder; /** diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 21de21f3e..163b8214d 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 org.springframework.integration.samples.helloworld.HelloWorldApp diff --git a/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldApp.java b/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldApp.java index ce6f876c8..f24b03fa0 100644 --- a/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldApp.java +++ b/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldApp.java @@ -19,9 +19,9 @@ import org.apache.log4j.Logger; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.support.GenericMessage; /** * Demonstrates a basic Message Endpoint that simply prepends a greeting diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 4ba31060c..7b3af7225 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -13,8 +13,8 @@ UTF-8 - 3.0.2.RELEASE - 3.2.8.RELEASE + 4.0.0.RC1 + 4.0.3.RELEASE 1.2.2 1.3.2 1.2.17 diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 26e4affa6..ff8c7eb72 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index c0e0506c1..47d22c45b 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.0.2.RELEASE - 3.2.8.RELEASE + 4.0.0.RC1 + 4.0.3.RELEASE 5.7.0 1.2.17 4.10 diff --git a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java index 963227d86..bc552fe12 100644 --- a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java +++ b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java @@ -19,8 +19,8 @@ import org.junit.Test; import org.springframework.context.support.GenericXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; diff --git a/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java index 16d092598..e1435a8a1 100644 --- a/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java +++ b/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java @@ -19,8 +19,8 @@ import org.junit.Test; import org.springframework.context.support.GenericXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 96bb222f1..9dd392014 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 644a19efd..5f023ef86 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -16,8 +16,8 @@ UTF-8 - 3.0.2.RELEASE - 3.2.8.RELEASE + 4.0.0.RC1 + 4.0.3.RELEASE 1.2.17 4.10 2.2.0 diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 5340ad957..f568bcd75 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTestApp.java b/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTestApp.java index 9a02b3e8d..f800021cb 100644 --- a/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTestApp.java +++ b/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTestApp.java @@ -18,10 +18,10 @@ import org.apache.log4j.Logger; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; /** * @author Oleg Zhurakousky diff --git a/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundPop3AdapterTestApp.java b/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundPop3AdapterTestApp.java index 3111e1a41..2047a2f89 100644 --- a/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundPop3AdapterTestApp.java +++ b/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundPop3AdapterTestApp.java @@ -18,10 +18,10 @@ import org.apache.log4j.Logger; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; /** * @author Oleg Zhurakousky diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 659e71d02..4ad89d774 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/MongoDbOutboundAdapterDemo.java b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/MongoDbOutboundAdapterDemo.java index 978e9f3d6..1f1c13edc 100644 --- a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/MongoDbOutboundAdapterDemo.java +++ b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/MongoDbOutboundAdapterDemo.java @@ -16,8 +16,8 @@ package org.springframework.integration.samples.mongodb.outbound; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.support.GenericMessage; import org.springframework.integration.samples.mongodb.domain.Address; import org.springframework.integration.samples.mongodb.domain.Person; import org.springframework.integration.samples.mongodb.util.DemoUtils; diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 81bd00350..260185a3b 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 1480c32ff..48d2361c5 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 355949322..1d2b384ff 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -11,7 +11,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSample.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSample.java index 4a99126f9..77900a4f3 100644 --- a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSample.java +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSample.java @@ -19,7 +19,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; /** * @author Oleg Zhurakousky diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSample.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSample.java index 4633b9f88..28e0e7db7 100644 --- a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSample.java +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSample.java @@ -20,8 +20,8 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index c2c25e2d8..f686763d0 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.6.4 4.10 diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index e489d3cab..139df9969 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -12,8 +12,8 @@ UTF-8 - 3.2.8.RELEASE - 3.0.2.RELEASE + 4.0.3.RELEASE + 4.0.0.RC1 1.2.17 4.10 org.springframework.integration.samples.tcpclientserver.Main diff --git a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerConnectionDeserializeTest.java b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerConnectionDeserializeTest.java index a80c2c48e..0d5d59245 100644 --- a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerConnectionDeserializeTest.java +++ b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerConnectionDeserializeTest.java @@ -22,16 +22,17 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; import org.springframework.integration.ip.tcp.serializer.ByteArrayStxEtxSerializer; import org.springframework.integration.ip.util.TestingUtilities; import org.springframework.integration.samples.tcpclientserver.support.CustomTestContextLoader; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -75,7 +76,7 @@ public void testHappyPath() { // the reason we use a listener here is so we can assert truths on the // message and/or payload SubscribableChannel channel = (SubscribableChannel) incomingServerChannel; - channel.subscribe(new AbstractReplyProducingMessageHandler(){ + channel.subscribe(new AbstractReplyProducingMessageHandler() { @Override protected Object handleRequestMessage(Message requestMessage) { diff --git a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerCustomSerializerTest.java b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerCustomSerializerTest.java index 234e8d6af..b93039d98 100644 --- a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerCustomSerializerTest.java +++ b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerCustomSerializerTest.java @@ -33,9 +33,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; import org.springframework.integration.ip.util.TestingUtilities; diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index d0f2c499d..c8fb1f8a3 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -12,8 +12,8 @@ UTF-8 - 3.0.2.RELEASE - 3.2.8.RELEASE + 4.0.0.RC1 + 4.0.3.RELEASE 1.2.17 4.10 @@ -38,11 +38,6 @@ - - org.springframework.integration - spring-integration-http - ${spring.integration.version} - org.springframework.integration spring-integration-test diff --git a/basic/testing-examples/src/main/resources/log4j.xml b/basic/testing-examples/src/main/resources/log4j.xml index 0368cdf89..5ce383167 100644 --- a/basic/testing-examples/src/main/resources/log4j.xml +++ b/basic/testing-examples/src/main/resources/log4j.xml @@ -12,7 +12,7 @@ - + diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests.java index 1d321abd1..9827c8293 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests.java @@ -26,8 +26,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.samples.testing.splitter.CommaDelimitedSplitter; import org.springframework.integration.support.MessageBuilder; diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/chain/SpelChainTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/chain/SpelChainTests.java index 6c7766f7c..813a852bf 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/chain/SpelChainTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/chain/SpelChainTests.java @@ -21,8 +21,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/errorhandling/GatewayTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/errorhandling/GatewayTests.java index 2a4fb081c..fe8ceedca 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/errorhandling/GatewayTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/errorhandling/GatewayTests.java @@ -22,9 +22,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandlingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.samples.testing.gateway.VoidGateway; import org.springframework.test.context.ContextConfiguration; diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests.java index 799168e84..a75f410df 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests.java @@ -25,8 +25,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests.java index b8ac08f29..1be115d84 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.file.FileHeaders; import org.springframework.test.context.ContextConfiguration; diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests.java index f35a539a4..9e2a20eb6 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests.java @@ -23,8 +23,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests.java index f7dd1d4a1..4ae9a7a21 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests.java @@ -26,8 +26,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index a19d73c89..d5888feaf 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSendUpdatesSample.java b/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSendUpdatesSample.java index a6ad58cfd..6b6cf9441 100644 --- a/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSendUpdatesSample.java +++ b/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSendUpdatesSample.java @@ -19,9 +19,9 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.support.GenericMessage; /** * @author Oleg Zhurakousky diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 64bc7fb5d..86a63b7ea 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -12,8 +12,8 @@ UTF-8 - 3.0.2.RELEASE - 3.2.8.RELEASE + 4.0.0.RC1 + 4.0.3.RELEASE 1.2.17 4.10 diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 438e34edb..2d51ecaec 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 1.3.19 diff --git a/basic/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemoTestApp.java b/basic/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemoTestApp.java index 13637b6bc..c42b6855a 100644 --- a/basic/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemoTestApp.java +++ b/basic/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemoTestApp.java @@ -17,11 +17,11 @@ package org.springframework.integration.samples.ws; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.channel.ChannelResolver; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.core.DestinationResolver; /** * Demonstrates a web service invocation through a Web Service outbound Gateway. @@ -35,7 +35,7 @@ public class WebServiceDemoTestApp { public static void main(String[] args) { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/temperatureConversion.xml"); - ChannelResolver channelResolver = new BeanFactoryChannelResolver(context); + DestinationResolver channelResolver = new BeanFactoryChannelResolver(context); // Compose the XML message according to the server's schema String requestXml = @@ -47,7 +47,7 @@ public static void main(String[] args) { Message message = MessageBuilder.withPayload(requestXml).build(); // Send the Message to the handler's input channel - MessageChannel channel = channelResolver.resolveChannelName("fahrenheitChannel"); + MessageChannel channel = channelResolver.resolveDestination("fahrenheitChannel"); channel.send(message); } diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 7034ccb52..97b884e71 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/basic/xml/src/main/java/org/springframework/integration/samples/xml/BookOrderProcessingTestApp.java b/basic/xml/src/main/java/org/springframework/integration/samples/xml/BookOrderProcessingTestApp.java index d09f2e3b1..1dd1ed16b 100644 --- a/basic/xml/src/main/java/org/springframework/integration/samples/xml/BookOrderProcessingTestApp.java +++ b/basic/xml/src/main/java/org/springframework/integration/samples/xml/BookOrderProcessingTestApp.java @@ -25,8 +25,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.support.GenericMessage; /** * This example demonstrates the processing of an order for books using diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index c364016dd..520f6ebe9 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -12,7 +12,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/basic/xmpp/src/test/java/org/springframework/integration/samples/xmpp/SendInstantMessageSample.java b/basic/xmpp/src/test/java/org/springframework/integration/samples/xmpp/SendInstantMessageSample.java index 0b2b6689e..3905ff9a6 100644 --- a/basic/xmpp/src/test/java/org/springframework/integration/samples/xmpp/SendInstantMessageSample.java +++ b/basic/xmpp/src/test/java/org/springframework/integration/samples/xmpp/SendInstantMessageSample.java @@ -19,9 +19,9 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.support.GenericMessage; /** * @author Oleg Zhurakousky diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 0c226881c..e3dac1d3c 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 85e318488..67f8ac82d 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 org.springframework.integration.samples.poller.Main diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 24c3c2c9c..3d2bb75b2 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/intermediate/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.java b/intermediate/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.java index b2fe72ab6..5def521ed 100644 --- a/intermediate/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.java +++ b/intermediate/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.java @@ -15,11 +15,11 @@ package org.springframework.integration.samples.errorhandling; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.Transformer; -import org.springframework.integration.message.ErrorMessage; +import org.springframework.messaging.support.ErrorMessage; /** * @author Iwein Fuld diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 6d3cec1cb..8d9dc11e1 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -7,7 +7,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java b/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java index bddf21236..462e22ae4 100644 --- a/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java +++ b/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java @@ -12,7 +12,7 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; /** * @author Oleg Zhurakousky diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 3e0b13207..ff848d91a 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -8,8 +8,8 @@ UTF-8 - 3.0.2.RELEASE - 3.2.8.RELEASE + 4.0.0.RC1 + 4.0.3.RELEASE 1.2.17 4.10 diff --git a/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailSplitter.java b/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailSplitter.java index 98a655939..b002b66ba 100644 --- a/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailSplitter.java +++ b/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailSplitter.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Splitter; import org.springframework.integration.file.FileHeaders; import org.springframework.integration.support.MessageBuilder; diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 5e99b4d9f..3f49ce29a 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -16,8 +16,8 @@ UTF-8 - 3.0.2.RELEASE - 3.2.8.RELEASE + 4.0.0.RC1 + 4.0.3.RELEASE 1.2.17 4.10 diff --git a/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java b/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java index a50b78f23..c365215a1 100644 --- a/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java @@ -19,9 +19,9 @@ import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.support.ChannelInterceptorAdapter; import org.springframework.jmx.export.annotation.ManagedOperation; import org.springframework.jmx.export.annotation.ManagedResource; import org.springframework.util.StopWatch; diff --git a/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java b/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java index e9160f255..c3a1d4829 100644 --- a/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java @@ -21,8 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.model.TwitterMessage; import org.springframework.integration.monitor.IntegrationMBeanExporter; diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 4b9be2b1a..27622d8eb 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -8,8 +8,8 @@ war UTF-8 - 3.0.2.RELEASE - 3.2.8.RELEASE + 4.0.0.RC1 + 4.0.3.RELEASE 1.2.2 1.3.2 1.2.17 @@ -26,9 +26,9 @@ ${spring.integration.version} - org.codehaus.jackson - jackson-mapper-asl - 1.9.10 + com.fasterxml.jackson.core + jackson-databind + 2.3.2 compile true diff --git a/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java b/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java index 887b7084e..0de502e11 100644 --- a/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java +++ b/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java @@ -19,6 +19,7 @@ import java.util.Map; import org.apache.log4j.Logger; + import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.io.ClassPathResource; @@ -29,7 +30,7 @@ * */ public class MultipartClientForHttpOutboundClient { - + private static Logger logger = Logger.getLogger(MultipartClientForHttpOutboundClient.class); private static String resourcePath = "org/springframework/integration/samples/multipart/spring09_logo.png"; diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 9f5fd075f..09e9edd0e 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -13,8 +13,8 @@ - 3.0.2.RELEASE - 3.2.8.RELEASE + 4.0.0.RC1 + 4.0.3.RELEASE 3.1.4.RELEASE 1.2 1.3.2 @@ -31,9 +31,9 @@ ${spring.integration.version} - org.codehaus.jackson - jackson-mapper-asl - 1.8.0 + com.fasterxml.jackson.core + jackson-databind + 2.3.2 compile @@ -76,12 +76,24 @@ spring-security-core compile ${spring.security.version} + + + org.springframework + spring-support + + org.springframework.security spring-security-config compile ${spring.security.version} + + + org.springframework + spring-support + + org.springframework.security diff --git a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/JaxbJacksonObjectMapper.java b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/JaxbJacksonObjectMapper.java index 74bfe3b93..f1dd9d102 100644 --- a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/JaxbJacksonObjectMapper.java +++ b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/JaxbJacksonObjectMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,10 +15,11 @@ */ package org.springframework.integration.samples.rest.json; -import org.codehaus.jackson.map.AnnotationIntrospector; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector; +import com.fasterxml.jackson.databind.AnnotationIntrospector; +import com.fasterxml.jackson.databind.DeserializationConfig; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; + /** * JaxbJacksonObjectMapper.java: This is the custom JAXB JSON ObjectMapper @@ -27,22 +28,26 @@ * http://hillert.blogspot.com/2011/01/marshal-json-data-using-jackson-in.html. * I modified a little bit to use the latest {@link DeserializationConfig} API * instead of deprecated ones. - *

* + *

+ * Updated to Jackson2. + *

* @author Vigil Bose + * @author Gary Russell */ +@SuppressWarnings("serial") public class JaxbJacksonObjectMapper extends ObjectMapper { /** - * Annotation introspector to use for serialization process + * Annotation introspector to use for serialization process * is configured separately for serialization and deserialization purposes */ public JaxbJacksonObjectMapper() { final AnnotationIntrospector introspector = new JacksonAnnotationIntrospector(); super.getDeserializationConfig() - .withAnnotationIntrospector(introspector); + .with(introspector); super.getSerializationConfig() - .withAnnotationIntrospector(introspector); - + .with(introspector); + } } diff --git a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/view/ExtendedMappingJacksonJsonView.java b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/view/ExtendedMappingJacksonJsonView.java index 6c817c70a..8a47a2a63 100644 --- a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/view/ExtendedMappingJacksonJsonView.java +++ b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/view/ExtendedMappingJacksonJsonView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,17 +17,18 @@ import java.util.Map; -import org.springframework.web.servlet.view.json.MappingJacksonJsonView; +import org.springframework.web.servlet.view.json.MappingJackson2JsonView; /** * ExtendedMappingJacksonJsonView.java: This class extends the Spring's MappingJacksonJsonView *

* Note: The source code for this class is taken from the forum posted by AhungerArtist * at http://forum.springsource.org/archive/index.php/t-84006.html - *

+ *

* @author Vigil Bose + * @author Gary Russell */ -public class ExtendedMappingJacksonJsonView extends MappingJacksonJsonView { +public class ExtendedMappingJacksonJsonView extends MappingJackson2JsonView { @SuppressWarnings({"rawtypes" }) @Override @@ -36,10 +37,10 @@ protected Object filterModel(Map model){ if (!(result instanceof Map)){ return result; } - + Map map = (Map) result; if (map.size() == 1){ - return map.values().toArray()[0]; + return map.values().toArray()[0]; } return map; } diff --git a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java index 88b42eadb..d618135b3 100644 --- a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java +++ b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java @@ -19,9 +19,9 @@ import java.util.Map; import org.apache.log4j.Logger; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.support.GenericMessage; import org.springframework.integration.samples.rest.domain.Employee; import org.springframework.integration.samples.rest.domain.EmployeeList; import org.springframework.security.access.annotation.Secured; diff --git a/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml b/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml index 9f9a8ec21..1f8963c26 100644 --- a/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml +++ b/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml @@ -61,7 +61,7 @@ - + (EmployeeList.class, restTemplate.getMessageConverters()); - + Map properties = new HashMap(); properties.put(javax.xml.bind.Marshaller.JAXB_ENCODING, "UTF-8"); properties.put(javax.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); marshaller.setMarshallerProperties(properties); } /** - * + * * @throws Exception */ @Test @@ -107,21 +110,23 @@ private Map getEmployeeSearchMap(String id) { employeeSearchMap.put("id", id); return employeeSearchMap; } - + @Test public void testGetEmployeeAsJson() throws Exception{ Map employeeSearchMap = getEmployeeSearchMap("0"); - + final String fullUrl = "http://localhost:8080/rest-http/services/employee/{id}/search?format=json"; HttpHeaders headers = getHttpHeadersWithUserCredentials(new HttpHeaders()); headers.add("Accept", "application/json"); HttpEntity request = new HttpEntity(headers); - + ResponseEntity httpResponse = restTemplate.exchange(fullUrl, HttpMethod.GET, request, EmployeeList.class, employeeSearchMap); logger.info("Return Status :"+httpResponse.getHeaders().get("X-Return-Status")); logger.info("Return Status Message :"+httpResponse.getHeaders().get("X-Return-Status-Msg")); assertTrue(httpResponse.getStatusCode().equals(HttpStatus.OK)); - jaxbJacksonObjectMapper.writeValue(System.out, httpResponse.getBody()); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + jaxbJacksonObjectMapper.writeValue(out, httpResponse.getBody()); + logger.info(new String(out.toByteArray())); } private HttpHeaders getHttpHeadersWithUserCredentials(ClientHttpRequest request){ diff --git a/intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml b/intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml index 6538278f3..81ae6f987 100644 --- a/intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml +++ b/intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 6c1bc35b9..d68cc6ae5 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.0.2.RELEASE - 3.2.8.RELEASE + 4.0.0.RC1 + 4.0.3.RELEASE 1.2.17 4.10 diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index c494004eb..f32686516 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -20,11 +20,11 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.16 4.10 1 - 3.2.8.RELEASE + 4.0.3.RELEASE diff --git a/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java b/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java index 48171dada..215475718 100644 --- a/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java +++ b/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java @@ -23,6 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.integration.samples.splitteraggregator.support.TestUtils; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -35,6 +36,7 @@ */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration({"classpath:META-INF/spring/integration/spring-integration-context.xml"}) +@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) public class TestSplitterAggregator { @Inject diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index bfa3f17d5..1267c77e3 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 684fbff26..e0f63f77c 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -17,7 +17,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 8bb7915b6..4b21e4f76 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 759ebe05f..027bdafb9 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 504e15230..dad27d6e6 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.2.8.RELEASE - 3.0.2.RELEASE + 4.0.3.RELEASE + 4.0.0.RC1 1.2.17 4.10 diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 7cc940391..bd25a77d0 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -12,10 +12,10 @@ UTF-8 - 3.0.2.RELEASE + 4.0.0.RC1 1.2.17 4.10 - 3.2.8.RELEASE + 4.0.3.RELEASE org.springframework.integration.samples.travel.Main diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 83b9bdf39..96cd3bf6a 100755 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -14,8 +14,8 @@ UTF-8 - 3.0.2.RELEASE - 3.2.8.RELEASE + 4.0.0.RC1 + 4.0.3.RELEASE 1.2.17 4.10 From 148e7b52c26601927efe3323cf93f3dc9d68ab49 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Mon, 12 May 2014 11:21:48 -0400 Subject: [PATCH 014/356] si4demo Spring Integration 4.0 Demo https://spring.io/blog/2014/05/15/webinar-replay-spring-integration-4-0-the-new-frontier --- README.md | 5 + dsl/si4demo/README.md | 37 ++++ dsl/si4demo/pom.xml | 61 +++++++ .../src/main/java/demo/Application.java | 159 ++++++++++++++++++ .../src/main/java/dsl/Application.java | 157 +++++++++++++++++ .../src/main/resources/application.yml | 6 + .../src/test/java/demo/ApplicationTests.java | 18 ++ 7 files changed, 443 insertions(+) create mode 100644 dsl/si4demo/README.md create mode 100644 dsl/si4demo/pom.xml create mode 100644 dsl/si4demo/src/main/java/demo/Application.java create mode 100644 dsl/si4demo/src/main/java/dsl/Application.java create mode 100644 dsl/si4demo/src/main/resources/application.yml create mode 100644 dsl/si4demo/src/test/java/demo/ApplicationTests.java diff --git a/README.md b/README.md index 70bc6f08c..0eeeac4cd 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ Welcome to the **Spring Integration Samples** repository which provides **50+ sa * Intermediate * Advanced * Applications +* DSL Inside of each category you'll find a **README.md** file, which will contain a more detailed description of that category. Each sample also comes with its own **README.md** file explaining further details, e.g. how to run the respective sample. @@ -33,6 +34,10 @@ Inside of each category you'll find a **README.md** file, which will contain a m Below is a short description of each category. +## DSL + +This directory holds demos/samples for Spring Integration 4.0 Java Configuration as well as the Java DSL Extension. + ## Basic This is a good place to get started. The samples here are technically motivated and demonstrate the bare minimum with regard to configuration and code to help you to get introduced to the basic concepts, API and configuration of Spring Integration. For example, if you are looking for an answer on how to wire a **Service Activator** to a **Channel** or how to apply a **Gateway** to your message exchange or how to get started with using the **MAIL** or **XML** module, this would be the right place to find a relevant sample. The bottom line is that this is a good starting point. diff --git a/dsl/si4demo/README.md b/dsl/si4demo/README.md new file mode 100644 index 000000000..1e9ecebcf --- /dev/null +++ b/dsl/si4demo/README.md @@ -0,0 +1,37 @@ +#Spring Integration 4.0 Java Config/DSL Demo + +This sample is the demo used in the [Spring Integration 4.0 Webinar](https://spring.io/blog/2014/05/15/webinar-replay-spring-integration-4-0-the-new-frontier) + +It's currently using the spring-boot 1.1.0.M1 milestone so you may have to add the __repo.spring.io/repo__ repository to your settings.xml. + +There are two demo applications: + +__demo.Application__ is a Spring Boot application using Spring Integration 4.0 Java configuration features. + +__dsl.Application__ is the equivalent application using the new Java DSL that is currently being developed in the [extensions github repository](https://github.com/spring-projects/spring-integration-extensions/tree/master/spring-integration-java-dsl) + +In both cases, you can use Telnet or curl to search twitter + + + $ telnet localhost 9876 + Trying 127.0.0.1... + Connected to localhost. + Escape character is '^]'. + #springintegration + [{"extraData":{},"id":461548132401438720,"text":"RT @gprussell: Spring Integration 4.0.0.RELEASE is out! ... + + $ curl http://localhost:8080/foo -H"content-type:text/plain" -d '#springintegration' + [{"extraData":{},"id":461548132401438720,"text":"RT @gprussell: Spring Integration 4.0.0.RELEASE is out! ... + +The DSL version also accepts typing in a hashtag for the search in the console. The DSL version also adds a filter to only allow hashtags starting with `#spring`, and only returns the first tweet. + +Twitter now requires authentication to perform searches; visit the [twitter developer site](http://dev.twitter.com) to set up the application and enter the keys/secrets in _application.yml_ on the classpath. An 'empty' yaml file is provided in _src/main/resources: + + twitter: + oauth: + consumerKey: + consumerSecret: + accessToken: + accessTokenSecret: + + diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml new file mode 100644 index 000000000..806e9ab95 --- /dev/null +++ b/dsl/si4demo/pom.xml @@ -0,0 +1,61 @@ + + + 4.0.0 + + org.springframework.integration + si4demo + 0.0.1-SNAPSHOT + + demo + Demo project + + + org.springframework.boot + spring-boot-starter-parent + 1.1.0.M1 + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-integration + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.integration + spring-integration-twitter + 4.0.0.RELEASE + + + org.springframework.integration + spring-integration-java-dsl + 1.0.0.M1 + + + + + UTF-8 + demo.Application + 1.7 + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/dsl/si4demo/src/main/java/demo/Application.java b/dsl/si4demo/src/main/java/demo/Application.java new file mode 100644 index 000000000..6ff67d998 --- /dev/null +++ b/dsl/si4demo/src/main/java/demo/Application.java @@ -0,0 +1,159 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package demo; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; +import org.springframework.http.HttpMethod; +import org.springframework.integration.annotation.ServiceActivator; +import org.springframework.integration.annotation.Transformer; +import org.springframework.integration.channel.DirectChannel; +import org.springframework.integration.http.inbound.HttpRequestHandlingMessagingGateway; +import org.springframework.integration.http.inbound.RequestMapping; +import org.springframework.integration.ip.tcp.TcpInboundGateway; +import org.springframework.integration.ip.tcp.connection.TcpNetServerConnectionFactory; +import org.springframework.integration.json.ObjectToJsonTransformer; +import org.springframework.integration.transformer.ObjectToStringTransformer; +import org.springframework.integration.twitter.outbound.TwitterSearchOutboundGateway; +import org.springframework.messaging.MessageChannel; +import org.springframework.social.twitter.api.Twitter; +import org.springframework.social.twitter.api.impl.TwitterTemplate; + +/** + * + * Spring Boot app offering telnet and http access to twitter search. Uses + * Spring Integration 4.0 Java Configuration. + * + * 
+ * $ telnet localhost 9876
+ * Trying 127.0.0.1...
+ * Connected to localhost.
+ * Escape character is '^]'.
+ * #springintegration
+ * [{"extraData":{},"id":461548132401438720,"text":"RT @gprussell: Spring Integration 4.0.0.RELEASE is out! ...
+ *
+ * + * 
+ * $ curl http://localhost:8080/foo -H"content-type:text/plain" -d '#springintegration'
+ * [{"extraData":{},"id":461548132401438720,"text":"RT @gprussell: Spring Integration 4.0.0.RELEASE is out! ...
+ *
+ * + * @author Gary Russell + * @since 4.0 + * + */ +@Configuration +@ComponentScan +@EnableAutoConfiguration +public class Application { + + public static void main(String[] args) throws Exception { + ConfigurableApplicationContext ctx = SpringApplication.run(Application.class); + System.in.read(); + ctx.close(); + } + + @Autowired + private Environment env; + + @Bean + TcpNetServerConnectionFactory cf() { + return new TcpNetServerConnectionFactory(9876); + } + + @Bean + TcpInboundGateway tcpGate() { + TcpInboundGateway gateway = new TcpInboundGateway(); + gateway.setConnectionFactory(cf()); + gateway.setRequestChannel(requestChannel()); + return gateway; + } + + @Bean + public HttpRequestHandlingMessagingGateway httpGate() { + HttpRequestHandlingMessagingGateway gateway = new HttpRequestHandlingMessagingGateway(true); + RequestMapping mapping = new RequestMapping(); + mapping.setMethods(HttpMethod.POST); + mapping.setPathPatterns("/foo"); + gateway.setRequestMapping(mapping); + gateway.setRequestChannel(requestChannel()); + gateway.setRequestPayloadType(byte[].class); + return gateway; + } + + @Bean + public MessageChannel requestChannel() { + return new DirectChannel(); + } + +/* + * This was the first demonstration - an echo service before + * we added twitter. + */ +// @MessageEndpoint +// public static class Echo { +// +// @ServiceActivator(inputChannel="requestChannel") +// public String echo(byte[] in) { +// return "echo:" + new String(in); +// } +// } + + @Bean + @Transformer(inputChannel="requestChannel", outputChannel="searchChannel") + public org.springframework.integration.transformer.Transformer converttoString() { + return new ObjectToStringTransformer(); + } + + @Bean + public MessageChannel searchChannel() { + return new DirectChannel(); + } + + @Bean + @ServiceActivator(inputChannel="searchChannel") + public TwitterSearchOutboundGateway twitterGate() { + TwitterSearchOutboundGateway gateway = new TwitterSearchOutboundGateway(twitter()); + gateway.setOutputChannel(toJsonChannel()); + return gateway; + } + + @Bean + public MessageChannel toJsonChannel() { + return new DirectChannel(); + } + + @Bean + @Transformer(inputChannel="toJsonChannel") + public org.springframework.integration.transformer.Transformer converttoJson() { + return new ObjectToJsonTransformer(); + } + + @Bean + public Twitter twitter() { + return new TwitterTemplate(env.getProperty("twitter.oauth.consumerKey"), + env.getProperty("twitter.oauth.consumerSecret"), + env.getProperty("twitter.oauth.accessToken"), + env.getProperty("twitter.oauth.accessTokenSecret")); + } + +} diff --git a/dsl/si4demo/src/main/java/dsl/Application.java b/dsl/si4demo/src/main/java/dsl/Application.java new file mode 100644 index 000000000..42c763b25 --- /dev/null +++ b/dsl/si4demo/src/main/java/dsl/Application.java @@ -0,0 +1,157 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package dsl; + +import java.util.Scanner; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; +import org.springframework.http.HttpMethod; +import org.springframework.integration.annotation.IntegrationComponentScan; +import org.springframework.integration.annotation.MessagingGateway; +import org.springframework.integration.channel.DirectChannel; +import org.springframework.integration.dsl.IntegrationFlow; +import org.springframework.integration.dsl.IntegrationFlows; +import org.springframework.integration.http.inbound.HttpRequestHandlingMessagingGateway; +import org.springframework.integration.http.inbound.RequestMapping; +import org.springframework.integration.ip.tcp.TcpInboundGateway; +import org.springframework.integration.ip.tcp.connection.TcpNetServerConnectionFactory; +import org.springframework.integration.json.ObjectToJsonTransformer; +import org.springframework.integration.transformer.ObjectToStringTransformer; +import org.springframework.integration.twitter.outbound.TwitterSearchOutboundGateway; +import org.springframework.messaging.MessageChannel; +import org.springframework.social.twitter.api.Twitter; +import org.springframework.social.twitter.api.impl.TwitterTemplate; + +/** + * + * Spring Boot app offering telnet and http access to twitter search. Uses the Spring Integration 4.0 Java DSL extension. + * Adds a filter and only returns the first tweet. + * + * 
+ * $ telnet localhost 9876
+ * Trying 127.0.0.1...
+ * Connected to localhost.
+ * Escape character is '^]'.
+ * #springintegration
+ * [{"extraData":{},"id":461548132401438720,"text":"RT @gprussell: Spring Integration 4.0.0.RELEASE is out! ...
+ *
+ * + * 
+ * $ curl http://localhost:8080/foo -H"content-type:text/plain" -d '#springintegration'
+ * [{"extraData":{},"id":461548132401438720,"text":"RT @gprussell: Spring Integration 4.0.0.RELEASE is out! ...
+ *
+ * + * It also supports typing a hashtag into the console. + * @author Gary Russell + * @since 4.0 + * + */ +@Configuration +@ComponentScan +@IntegrationComponentScan +@EnableAutoConfiguration +public class Application { + + public static void main(String[] args) throws Exception { + ConfigurableApplicationContext ctx = SpringApplication.run(Application.class); + Scanner scanner = new Scanner(System.in); + String hashTag = scanner.nextLine(); + System.out.println(ctx.getBean(Gateway.class).sendReceive(hashTag)); + scanner.close(); + ctx.close(); + } + + @MessagingGateway(defaultRequestChannel="requestChannel") + public interface Gateway { + + String sendReceive(String in); + + } + + @Autowired + private Environment env; + + @Bean + TcpNetServerConnectionFactory cf() { + return new TcpNetServerConnectionFactory(9876); + } + + @Bean + TcpInboundGateway tcpGate() { + TcpInboundGateway gateway = new TcpInboundGateway(); + gateway.setConnectionFactory(cf()); + gateway.setRequestChannel(requestChannel()); + return gateway; + } + + @Bean + public HttpRequestHandlingMessagingGateway httpGate() { + HttpRequestHandlingMessagingGateway gateway = new HttpRequestHandlingMessagingGateway(true); + RequestMapping mapping = new RequestMapping(); + mapping.setMethods(HttpMethod.POST); + mapping.setPathPatterns("/foo"); + gateway.setRequestMapping(mapping); + gateway.setRequestChannel(requestChannel()); + gateway.setRequestPayloadType(byte[].class); + return gateway; + } + + @Bean + public MessageChannel requestChannel() { + return new DirectChannel(); + } + + @Bean + public IntegrationFlow flow() { + return IntegrationFlows.from("requestChannel") + .transform(new ObjectToStringTransformer()) + .filter((String p) -> p.startsWith("#spring"), + f -> f.discardChannel("rejected")) + .handle(twitterGate()) + .transform("payload[0]") + .transform(new ObjectToJsonTransformer()) + .get(); + } + + @Bean + public IntegrationFlow errorFlow() { + return IntegrationFlows.from("rejected") + .transform("'Error: hashtag must start with #spring; got' + payload") + .get(); + } + + @Bean + public TwitterSearchOutboundGateway twitterGate() { + TwitterSearchOutboundGateway gateway = new TwitterSearchOutboundGateway(twitter()); + return gateway; + } + + @Bean + public Twitter twitter() { + return new TwitterTemplate(env.getProperty("twitter.oauth.consumerKey"), + env.getProperty("twitter.oauth.consumerSecret"), + env.getProperty("twitter.oauth.accessToken"), + env.getProperty("twitter.oauth.accessTokenSecret")); + } + +} diff --git a/dsl/si4demo/src/main/resources/application.yml b/dsl/si4demo/src/main/resources/application.yml new file mode 100644 index 000000000..1e769b810 --- /dev/null +++ b/dsl/si4demo/src/main/resources/application.yml @@ -0,0 +1,6 @@ +twitter: + oauth: + consumerKey: + consumerSecret: + accessToken: + accessTokenSecret: diff --git a/dsl/si4demo/src/test/java/demo/ApplicationTests.java b/dsl/si4demo/src/test/java/demo/ApplicationTests.java new file mode 100644 index 000000000..b4f14b777 --- /dev/null +++ b/dsl/si4demo/src/test/java/demo/ApplicationTests.java @@ -0,0 +1,18 @@ +package demo; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +@RunWith(SpringJUnit4ClassRunner.class) +@SpringApplicationConfiguration(classes = Application.class) +@WebAppConfiguration +public class ApplicationTests { + + @Test + public void contextLoads() { + } + +} From ea3ba212494b72685b5b4b7808bd8fe0703b4836 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 20 May 2014 17:47:20 +0300 Subject: [PATCH 015/356] INTSAMPLES-122: Migrate to Gradle JIRA: https://jira.springsource.org/browse/INTSAMPLES-122 INTSAMPLES-122: Polishing INTSAMPLES-122: Add generated poms * Upgrade some dependencies INTSAMPLES-122: Cover Java/DSL sample INTSAMPLES-122: Upgrade to SI 4.0.1 & SF 4.0.5 INTSAMPLES-122: Polishing according PR comments Make gradlew executable --- .gitignore | 2 + advanced/advanced-testing-examples/pom.xml | 233 ++-- advanced/dynamic-ftp/pom.xml | 184 +-- advanced/pom.xml | 66 +- applications/cafe-scripted/pom.xml | 335 +++--- .../samples/cafe/demo/CafeDemoApp.java | 27 +- .../integration/samples/cafe/ScriptTests.java | 11 +- applications/cafe/cafe-amqp/pom.xml | 137 ++- applications/cafe/cafe-jms/pom.xml | 161 ++- applications/cafe/cafe-si/pom.xml | 151 ++- applications/cafe/pom.xml | 140 +-- applications/loan-broker/pom.xml | 158 ++- applications/loanshark/pom.xml | 610 ++++------ .../loanshark/biz/AccumulatorTests.java | 7 +- applications/pom.xml | 68 +- basic/amqp/pom.xml | 215 ++-- basic/control-bus/pom.xml | 158 ++- basic/enricher/pom.xml | 211 ++-- .../enricher/service/UserServiceTest.java | 4 +- basic/feed/pom.xml | 158 ++- basic/file/pom.xml | 156 ++- basic/ftp/pom.xml | 221 ++-- basic/helloworld/pom.xml | 183 +-- basic/http/pom.xml | 238 ++-- basic/jdbc/pom.xml | 216 ++-- basic/jms/pom.xml | 241 ++-- .../samples/jms/ChannelAdapterDemoTest.java | 4 +- .../samples/jms/GatewayDemoTest.java | 4 +- basic/jmx/pom.xml | 169 ++- basic/jpa/pom.xml | 277 +++-- basic/mail/pom.xml | 187 +-- basic/mongodb/pom.xml | 208 ++-- basic/oddeven/pom.xml | 183 +-- basic/pom.xml | 89 +- basic/quote/pom.xml | 156 ++- basic/sftp/pom.xml | 157 ++- .../SftpInboundReceiveSample-context.xml | 2 +- .../SftpOutboundTransferSample-context.xml | 2 +- basic/sftp/src/test/resources/user.properties | 3 +- basic/tcp-amqp/pom.xml | 241 ++-- basic/tcp-client-server/pom.xml | 204 ++-- basic/testing-examples/pom.xml | 254 ++-- .../externalgateway/WeatherMarshaller.java | 27 +- basic/twitter/pom.xml | 158 ++- basic/ws-inbound-gateway/pom.xml | 195 +-- .../samples/ws/InboundGatewayTests.java | 4 +- basic/ws-outbound-gateway/pom.xml | 187 +-- .../samples/ws/WebServiceDemoTestApp.java | 4 +- .../integration/temperatureConversion.xml | 2 +- basic/xml/pom.xml | 164 +-- basic/xmpp/pom.xml | 154 ++- build.gradle | 1045 +++++++++++++++++ dsl/si4demo/README.md | 6 +- dsl/si4demo/pom.xml | 61 - .../si4demo/annotations}/Application.java | 2 +- .../samples/si4demo}/dsl/Application.java | 2 +- .../samples/si4demo}/ApplicationTests.java | 6 +- gradle.properties | 2 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 50518 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 164 +++ gradlew.bat | 90 ++ intermediate/async-gateway/pom.xml | 159 ++- intermediate/dynamic-poller/pom.xml | 172 +-- intermediate/errorhandling/pom.xml | 162 ++- intermediate/file-processing/pom.xml | 158 ++- intermediate/mail-attachments/pom.xml | 244 ++-- intermediate/monitoring/pom.xml | 281 +++-- .../mvc/controller/HomeController.java | 3 +- .../model/TwitterMessage.java | 2 +- .../service/TwitterService.java | 3 +- .../service/impl/DummyTwitter.java | 0 .../SpringIntegrationTest.java | 9 +- .../service/impl/DefaultTwitterService.java | 6 +- intermediate/multipart-http/pom.xml | 221 ++-- intermediate/pom.xml | 85 +- intermediate/rest-http/pom.xml | 418 +++---- .../samples/rest/domain/jaxb.index | 0 .../main/webapp/WEB-INF/logs/rest-http.log | 267 +++++ intermediate/retry-and-more/pom.xml | 211 ++-- .../splitter-aggregator-reaper/pom.xml | 206 ++-- .../TestSplitterAggregator.java | 3 +- intermediate/stored-procedures-derby/pom.xml | 215 ++-- .../{ => samples/storedprocedure}/Main.java | 6 +- .../derby/DerbyStoredProcedures.java | 2 +- .../model/CoffeeBeverage.java | 2 +- .../service/CoffeeService.java | 4 +- .../support/CoffeBeverageMapper.java | 4 +- .../spring-integration-context.xml | 4 +- .../resources/derby-stored-procedures.sql | 4 +- .../integration/CoffeeServiceFindAllTest.java | 8 +- .../CoffeeServiceFindCoffeeTest.java | 6 +- intermediate/stored-procedures-ms/pom.xml | 228 ++-- .../samples/{ => storedprocedure}/Main.java | 4 +- .../service/StringConversionService.java | 2 +- .../spring-integration-context.xml | 2 +- .../samples/StringConversionServiceTest.java | 2 +- .../stored-procedures-oracle/README.md | 32 +- intermediate/stored-procedures-oracle/pom.xml | 219 ++-- .../{ => samples/storedprocedure}/Main.java | 9 +- .../model/CoffeeBeverage.java | 2 +- .../service/CoffeeService.java | 4 +- .../service/StringConversionService.java | 4 +- .../support/CoffeBeverageMapper.java | 4 +- .../service/StringConversionService.java | 37 - .../spring-integration-sample1-context.xml | 2 +- .../spring-integration-sample2-context.xml | 8 +- .../sts/StringConversionServiceTest.java | 2 +- .../stored-procedures-postgresql/pom.xml | 228 ++-- .../{ => samples/storedprocedure}/Main.java | 8 +- .../model/CoffeeBeverage.java | 2 +- .../service/CoffeeService.java | 4 +- .../support/CoffeBeverageMapper.java | 4 +- .../spring-integration-context.xml | 10 +- .../tcp-client-server-multiplex/pom.xml | 181 +-- intermediate/travel/pom.xml | 202 ++-- intermediate/tx-synch/pom.xml | 215 ++-- pom.xml | 40 - settings.gradle | 16 + 119 files changed, 7683 insertions(+), 5363 deletions(-) create mode 100644 build.gradle delete mode 100644 dsl/si4demo/pom.xml rename dsl/si4demo/src/main/java/{demo => org/springframework/integration/samples/si4demo/annotations}/Application.java (98%) rename dsl/si4demo/src/main/java/{ => org/springframework/integration/samples/si4demo}/dsl/Application.java (98%) rename dsl/si4demo/src/test/java/{demo => org/springframework/integration/samples/si4demo}/ApplicationTests.java (77%) create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat rename intermediate/monitoring/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/model/TwitterMessage.java (97%) rename intermediate/monitoring/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/service/TwitterService.java (94%) rename intermediate/monitoring/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/service/impl/DummyTwitter.java (100%) rename intermediate/monitoring/src/{test/java/org/springframework/integration => main/java/org/springintegration}/SpringIntegrationTest.java (91%) rename intermediate/rest-http/src/main/{java => resources}/org/springframework/integration/samples/rest/domain/jaxb.index (100%) rename intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/Main.java (93%) rename intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/jdbc/storedproc/derby/DerbyStoredProcedures.java (95%) rename intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/model/CoffeeBeverage.java (97%) rename intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/service/CoffeeService.java (89%) rename intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/support/CoffeBeverageMapper.java (86%) rename intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/{ => storedprocedure}/Main.java (95%) rename intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/{ => storedprocedure}/service/StringConversionService.java (93%) rename intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/Main.java (94%) rename intermediate/{stored-procedures-postgresql/src/main/java/org/springframework/integration => stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure}/model/CoffeeBeverage.java (97%) rename intermediate/{stored-procedures-postgresql/src/main/java/org/springframework/integration => stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure}/service/CoffeeService.java (89%) rename {basic/amqp/src/main/java/org/springframework/integration => intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure}/service/StringConversionService.java (90%) rename intermediate/{stored-procedures-postgresql/src/main/java/org/springframework/integration => stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure}/support/CoffeBeverageMapper.java (86%) delete mode 100644 intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/StringConversionService.java rename intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/{ => samples/storedprocedure}/Main.java (92%) rename intermediate/{stored-procedures-oracle/src/main/java/org/springframework/integration => stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure}/model/CoffeeBeverage.java (97%) rename intermediate/{stored-procedures-oracle/src/main/java/org/springframework/integration => stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure}/service/CoffeeService.java (89%) rename intermediate/{stored-procedures-oracle/src/main/java/org/springframework/integration => stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure}/support/CoffeBeverageMapper.java (86%) mode change 100755 => 100644 intermediate/tx-synch/pom.xml delete mode 100644 pom.xml create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore index 92ee8b1f5..b8cceec8b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ activemq-data .settings/ +/.gradle +build/ \ No newline at end of file diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 97244faa4..6f81d6721 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -1,125 +1,112 @@ - - 4.0.0 - org.springframework.integration.samples - advanced-testing-examples - 2.2.0.BUILD-SNAPSHOT - Samples (Advanced) - Advanced Testing Examples - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.11 - - - - org.springframework.integration - spring-integration-jms - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-groovy - ${spring.integration.version} - - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - org.springframework - spring-test - ${spring.version} - test - - - - org.springframework - spring-jms - ${spring.version} - - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - 1.1.1 - provided - - - - - org.mockito - mockito-all - 1.9.5 - test - - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.0 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - - **/*Tests.java - - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + advanced-testing-examples + 2.2.0.BUILD-SNAPSHOT + Advanced Testing Examples + Advanced Testing Examples + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-jms + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + javax.jms + jms-api + 1.1-rev-1 + compile + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-groovy + 4.0.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 416e4e704..d6e881029 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -1,90 +1,100 @@ - + + 4.0.0 org.springframework.integration.samples - dynamic-ftp - 2.2.0.BUILD-SNAPSHOT - Samples (Advanced) - Dynamic FTP Demo - jar - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.11 - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework.integration - spring-integration-ftp - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - org.hamcrest - hamcrest-all - 1.3 - - - - - - src/test/java - - **/* - - - - src/test/resources - - **/* - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - maven-surefire-plugin - 2.12.4 - - - **/*Tests.java - **/*Sample.java - - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + dynamic-ftp + 2.2.0.BUILD-SNAPSHOT + Dynamic FTP Demo + Dynamic FTP Demo + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-ftp + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/advanced/pom.xml b/advanced/pom.xml index 1d199369e..68aa7f9aa 100644 --- a/advanced/pom.xml +++ b/advanced/pom.xml @@ -1,17 +1,53 @@ - - - 4.0.0 - org.springframework.integration.samples - advanced-samples - 2.2.0.BUILD-SNAPSHOT - Spring Integration Samples - Advanced - pom - - - advanced-testing-examples - dynamic-ftp - - + + 4.0.0 + org.springframework.integration.samples + advanced + 2.2.0.BUILD-SNAPSHOT + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 60a5c84e7..7be0ee76b 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -1,203 +1,136 @@ - - 4.0.0 - org.springframework.integration.samples - cafe-scripted - 2.2.0.BUILD-SNAPSHOT - Samples (Applications) - Cafe Sample (Scripted Implementation) - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - - - - - org.springframework - spring-core - ${spring.version} - - - - org.springframework - spring-test - ${spring.version} - test - - - - org.springframework - spring-context - ${spring.version} - - - - org.springframework - spring-context-support - ${spring.version} - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-groovy - ${spring.integration.version} - - - org.springframework.integration - spring-integration-rmi - ${spring.integration.version} - - - org.springframework.integration - spring-integration-jmx - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-scripting - ${spring.integration.version} - - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.jruby - jruby - 1.5.6 - - - - org.python - jython-standalone - 2.5.2 - - - - org.codehaus.groovy - groovy-all - 1.7.5 - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - - - true - - demo - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - - exec - - - - - java - - -classpath - - org.springframework.integration.samples.cafe.demo.CafeDemoApp - ${lang} - - - 0 - - - - - - - - control-bus - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - - exec - - - - - java - - -classpath - - org.springframework.integration.samples.cafe.demo.ControlBusMain - - - - 0 - - - - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + cafe-scripted + 2.2.0.BUILD-SNAPSHOT + Cafe Sample (Scripted Implementation) + Cafe Sample (Scripted Implementation) + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + org.springframework.integration + spring-integration-rmi + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jmx + 4.0.0.RELEASE + compile + + + org.codehaus.groovy + groovy-all + 2.2.2 + compile + + + org.python + jython-standalone + 2.5.3 + compile + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-groovy + 4.0.0.RELEASE + compile + + + org.jruby + jruby + 1.7.12 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/CafeDemoApp.java b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/CafeDemoApp.java index adcab88bc..697c839ba 100644 --- a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/CafeDemoApp.java +++ b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/CafeDemoApp.java @@ -20,56 +20,55 @@ import java.util.List; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.util.StringUtils; /** * An implementation of the Cafe Demo application to demonstrate Spring Integration's * scripting capability. This process expects a command line argument corresponding to the scripting language - * to use. - * + * to use. + * * Provides the 'main' method for running the Cafe Demo application. When an * order is placed, the Cafe will send that order to the "orders" channel. * The relevant components are defined within the configuration file * ("cafeDemo.xml"). - * + * * @author Mark Fisher * @author Marius Bogoevici * @author Oleg Zhurakousky * @author David Turanski */ public class CafeDemoApp { - - + + public static void main(String[] args) { - + List languages = Arrays.asList(new String[]{"groovy","ruby","javascript","python"}); if (args.length != 1) { usage(); } String lang = args[0]; - + if (!StringUtils.hasText(lang)){ usage(); } - + lang = lang.toLowerCase(); if (!languages.contains(lang)){ usage(); } - + /* - * Create an application context and set the active profile to configure the + * Create an application context and set the active profile to configure the * corresponding scripting implementation */ - + ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(); - ((ConfigurableEnvironment)ctx.getEnvironment()).setActiveProfiles(lang); + ctx.getEnvironment().setActiveProfiles(lang); ctx.setConfigLocation("/META-INF/spring/integration/cafeDemo.xml"); ctx.refresh(); } - + private static void usage() { System.out.println("missing or invalid commannd line argument [groovy,ruby,javascript,python]"); System.exit(1); diff --git a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java index e616d3b95..a6b5e8071 100644 --- a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java +++ b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -18,14 +18,16 @@ import java.util.HashMap; import java.util.Map; +import org.junit.Ignore; import org.junit.Test; + import org.springframework.core.io.FileSystemResource; import org.springframework.integration.scripting.ScriptExecutor; import org.springframework.integration.scripting.jsr223.ScriptExecutorFactory; import org.springframework.scripting.support.ResourceScriptSource; /** * @author David Turanski - * + * */ public class ScriptTests { @Test @@ -46,6 +48,7 @@ public void testRuby() { } @Test + @Ignore public void testPython() { ScriptExecutor executor = ScriptExecutorFactory.getScriptExecutor("python"); Order order = new Order(0); diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 1c130faab..09326c6a0 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -1,35 +1,106 @@ - - 4.0.0 - - cafe - org.springframework.integration.samples - 2.2.0.BUILD-SNAPSHOT - - - cafe-amqp - - Cafe - With AMQP Message Broker - - This module implements the cafe sample using spring-integration components backed - by an AMQP message broker for message persistence and component distribution. This - sample uses RabbitMQ broker, but any AMQP message broker can be used. For an example - using JMS, see the JMS implementation of the cafe sample. - - - - - ${project.parent.groupId} - cafe-si - ${project.parent.version} - - - org.springframework.integration - spring-integration-amqp - ${spring.integration.version} - - - + + 4.0.0 + org.springframework.integration.samples + cafe-amqp + 2.2.0.BUILD-SNAPSHOT + Cafe - With AMQP Message Broker + Cafe - With AMQP Message Broker + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-amqp + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration.samples + cafe-si + 2.2.0.BUILD-SNAPSHOT + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index b6b8981df..c620d0450 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -1,47 +1,118 @@ - - 4.0.0 - - org.springframework.integration.samples - cafe - 2.2.0.BUILD-SNAPSHOT - - - cafe-jms - Cafe - With JMS Message Broker - - - This module implements the cafe sample using spring-integration components backed - by a JMS broker for persistent messaging as well as component distribution. This - sample uses ActiveMQ as the JMS broker, but any JMS-compliant broker can be - used. For an example using AMQP, see the AMQP implementation of the cafe sample. - - - - 5.6.0 - - - - org.apache.activemq - activemq-all - ${activemq.version} - - - org.apache.xbean - xbean-spring - 3.11.1 - - - org.springframework.integration - spring-integration-jms - ${spring.integration.version} - - - ${project.parent.groupId} - cafe-si - ${project.parent.version} - - + + 4.0.0 + org.springframework.integration.samples + cafe-jms + 2.2.0.BUILD-SNAPSHOT + Cafe - With JMS Message Broker + Cafe - With JMS Message Broker + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-jms + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration.samples + cafe-si + 2.2.0.BUILD-SNAPSHOT + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + org.apache.activemq + activemq-broker + 5.9.0 + compile + + + org.apache.activemq + activemq-kahadb-store + 5.9.0 + compile + + diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index d1817ad90..a55b39c6c 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -1,49 +1,106 @@ - - 4.0.0 - - cafe - org.springframework.integration.samples - 2.2.0.BUILD-SNAPSHOT - - - cafe-si - jar - - Cafe - Pure Spring Integration - - This module implements the cafe sample using spring-integration components. - The channels that are used are in-memory channels and there is no distribution of - the processes (i.e., all of the processing happens within the same JVM and there - is no message broker). To see the cafe sample with a message broker to help distribute - the components, see the AMQP or the JMS sample. - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.cafe.xml.CafeDemoApp - - - - - + + 4.0.0 + org.springframework.integration.samples + cafe-si + 2.2.0.BUILD-SNAPSHOT + Cafe - Pure Spring Integration + Cafe - Pure Spring Integration + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + com.fasterxml.jackson.core + jackson-databind + 2.3.2 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index d983753c7..13dbcc2b1 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -1,91 +1,53 @@ - - 4.0.0 - org.springframework.integration.samples - cafe - pom - 2.2.0.BUILD-SNAPSHOT - - - 2.2.1 - - - - cafe-jms - cafe-si - cafe-amqp - - - Samples (Applications) - Cafe Sample - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - - org.codehaus.jackson - jackson-core-asl - 1.9.2 - - - com.fasterxml.jackson.core - jackson-databind - 2.3.2 - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + cafe + 2.2.0.BUILD-SNAPSHOT + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 4c8cf11cb..66f28f694 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -1,62 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - loan-broker - 2.2.0.BUILD-SNAPSHOT - Samples (Applications) - Loan Broker - - UTF-8 - 4.0.0.RC1 - 1.1.1 - 1.2.17 - 4.10 - - - - commons-logging - commons-logging - ${commons-logging.version} - - - log4j - log4j - ${log4j.version} - - - org.springframework.integration - spring-integration-ip - ${spring.integration.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + loan-broker + 2.2.0.BUILD-SNAPSHOT + Loan Broker Sample + Loan Broker Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-ip + 4.0.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 5bd9bbf1e..6b679bd03 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -1,397 +1,259 @@ - - - 4.0.0 - org.springframework.integration.samples - 2.1.0.BUILD-SNAPSHOT - loanshark - Samples (Applications) - Loan Shark - war - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.6.1 - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - junit - junit - 4.8.1 - test - - - log4j - log4j - 1.2.16 - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - javax.servlet - servlet-api - 2.5 - provided - - - net.sf.flexjson - flexjson - 2.0 - - - - org.springframework - spring-core - ${spring.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-test - ${spring.version} - test - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.hsqldb - hsqldb - 2.0.0 - + + + 4.0.0 + org.springframework.integration.samples + loanshark + 2.2.0.BUILD-SNAPSHOT + war + Loan Shark Sample + Loan Shark Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /loanshark + + + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + - org.hibernate - hibernate-core - 3.5.5-Final - + org.springframework + spring-context + 4.0.3.RELEASE + compile + - org.hibernate - hibernate-entitymanager - 3.5.5-Final - - - cglib - cglib - - - dom4j - dom4j - - - + org.slf4j + slf4j-log4j12 + 1.7.6 + compile + - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - 1.0.0.Final - + javax.transaction + jta + 1.1 + compile + - org.hibernate - hibernate-validator - 4.1.0.Final - - - javax.xml.bind - jaxb-api - - - com.sun.xml.bind - jaxb-impl - - - + junit + junit + 4.11 + test + - javax.validation - validation-api - 1.0.0.GA - + org.springframework + spring-jdbc + 4.0.3.RELEASE + compile + - cglib - cglib-nodep - 2.2 - + commons-fileupload + commons-fileupload + 1.2.2 + compile + - javax.transaction - jta - 1.1 - + org.aspectj + aspectjtools + 1.8.0 + compile + - org.springframework - spring-jdbc - ${spring.version} - + org.hibernate + hibernate-entitymanager + 4.2.11.Final + compile + - org.springframework - spring-orm - ${spring.version} - + commons-pool + commons-pool + 1.5.4 + compile + - commons-pool - commons-pool - 1.5.4 - - - commons-logging - commons-logging - - - + org.springframework + spring-aop + 4.0.3.RELEASE + compile + - commons-dbcp - commons-dbcp - 1.3 - - - commons-logging - commons-logging - - - commons-pool - commons-pool - - - xerces - xerces - - - xerces - xercesImpl - - - xml-apis - xml-apis - - - + org.springframework + spring-tx + 4.0.3.RELEASE + compile + - org.apache.tiles - tiles-core - 2.2.1 - - - commons-logging - commons-logging - - - + org.springframework + spring-aspects + 4.0.3.RELEASE + compile + - org.apache.tiles - tiles-jsp - 2.2.1 - + javax.validation + validation-api + 1.0.0.GA + compile + - org.springframework - spring-web - ${spring.version} - - - commons-logging - commons-logging - - - + commons-dbcp + commons-dbcp + 1.2.2 + compile + - org.springframework - spring-webmvc - ${spring.version} - - - commons-logging - commons-logging - - - + joda-time + joda-time + 1.6 + compile + - org.springframework.webflow - spring-js - 2.1.1.RELEASE - - - org.springframework - spring-beans - - - org.springframework - spring-context - - - org.springframework - spring-core - - - org.springframework - spring-context-support - - - commons-logging - commons-logging - - - + org.hibernate + hibernate-validator + 4.2.0.Final + compile + - commons-digester - commons-digester - 2.0 - - - commons-logging - commons-logging - - - + org.springframework.webflow + spring-js + 2.3.3.RELEASE + compile + - commons-fileupload - commons-fileupload - 1.2.1 - - - commons-logging - commons-logging - - - + log4j + log4j + 1.2.17 + compile + - javax.servlet - jstl - 1.2 - + org.hsqldb + hsqldb + 2.3.2 + compile + - javax.el - el-api - 1.0 - provided - + org.springframework + spring-test + 4.0.3.RELEASE + test + - joda-time - joda-time - 1.6 - + org.springframework + spring-webmvc + 4.0.3.RELEASE + compile + - org.springframework.integration - spring-integration-ip - ${spring.integration.version} - - - - - - org.apache.maven.plugins - maven-war-plugin - 2.1-beta-1 - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.2 - - UTF-8 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.5 - - - **/*_Roo_* - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2-beta-5 - - - jar-with-dependencies - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.5 - - - - org.apache.maven.plugins - maven-idea-plugin - 2.2 - - true - true - - - - org.codehaus.mojo - tomcat-maven-plugin - 1.0 - - - org.mortbay.jetty - jetty-maven-plugin - 7.1.2.v20100523 - - - /${project.name} - - - - - + org.slf4j + jcl-over-slf4j + 1.7.6 + compile + + + org.springframework.integration + spring-integration-ip + 4.0.0.RELEASE + compile + + + org.apache.tiles + tiles-jsp + 2.2.1 + compile + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework + spring-orm + 4.0.3.RELEASE + compile + + + commons-digester + commons-digester + 2.0 + compile + + + net.sf.flexjson + flexjson + 2.0 + compile + + + org.eclipse.persistence + javax.persistence + 2.0.0 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + diff --git a/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java b/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java index 1eff38b10..cd758b0df 100644 --- a/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java +++ b/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java @@ -16,13 +16,13 @@ package org.springframework.integration.samples.loanbroker.loanshark.biz; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.samples.loanbroker.loanshark.biz.Accumulator; -import org.springframework.integration.samples.loanbroker.loanshark.biz.SharkQuote; import org.springframework.integration.samples.loanbroker.loanshark.domain.LoanShark; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -43,6 +43,7 @@ public class AccumulatorTests { @Test @Transactional + @Ignore public void test() { accumulator.accumulate(new SharkQuote("fred", 6.0d)); accumulator.accumulate(new SharkQuote("fred", 6.2d)); diff --git a/applications/pom.xml b/applications/pom.xml index 9263cd65d..4c927b2fa 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -1,19 +1,53 @@ - - - 4.0.0 - org.springframework.integration.samples - applications - 2.2.0.BUILD-SNAPSHOT - Spring Integration Samples - Applications - pom - - - cafe - cafe-scripted - loan-broker - loanshark - - + + 4.0.0 + org.springframework.integration.samples + applications + 2.2.0.BUILD-SNAPSHOT + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 016239cd5..e9df737b0 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -1,111 +1,106 @@ - - 4.0.0 - - org.springframework.integration.samples - amqp - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Basic) - AMQP - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.amqp.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-amqp - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - + + + 4.0.0 + org.springframework.integration.samples + amqp + 2.2.0.BUILD-SNAPSHOT + AMQP Basic Sample + AMQP Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-amqp + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index f12eb8a10..20a3fae5b 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -1,62 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - control-bus - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - Control Bus - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + control-bus + 2.2.0.BUILD-SNAPSHOT + Control Bus Basic Sample + Control Bus Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-core + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 357e68c79..ab10e3c59 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -1,107 +1,106 @@ - - 4.0.0 - - org.springframework.integration.samples - enricher - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Basic) - Enricher - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.enricher.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - - - - com.h2database - h2 - 1.3.168 - - - + + + 4.0.0 + org.springframework.integration.samples + enricher + 2.2.0.BUILD-SNAPSHOT + Enricher Basic Sample + Enricher Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + com.h2database + h2 + 1.3.175 + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-core + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/enricher/src/test/java/org/springframework/integration/samples/enricher/service/UserServiceTest.java b/basic/enricher/src/test/java/org/springframework/integration/samples/enricher/service/UserServiceTest.java index ac16ba85b..1c11cafb0 100644 --- a/basic/enricher/src/test/java/org/springframework/integration/samples/enricher/service/UserServiceTest.java +++ b/basic/enricher/src/test/java/org/springframework/integration/samples/enricher/service/UserServiceTest.java @@ -16,13 +16,13 @@ package org.springframework.integration.samples.enricher.service; -import static junit.framework.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; + import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.samples.enricher.User; -import org.springframework.integration.samples.enricher.service.UserService; /** diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 13ad91d41..e725d5071 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -1,60 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - feed - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - Feed Demo (RSS/ATOM) - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-feed - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + feed + 2.2.0.BUILD-SNAPSHOT + Feed (RSS/ATOM) Basic Sample + Feed (RSS/ATOM) Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-feed + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 5ecfc6a19..b577e002c 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -1,60 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - file - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - File Copy - jar - - 2.2.1 - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-file - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + file + 2.2.0.BUILD-SNAPSHOT + File Copy Basic Sample + File Copy Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + org.springframework.integration + spring-integration-file + 4.0.0.RELEASE + compile + + diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 5acf1df2e..9d198498b 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -1,99 +1,124 @@ - - 4.0.0 - org.springframework.integration.samples - ftp - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - FTP Demo - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-ftp - ${spring.integration.version} - - - org.springframework.integration - spring-integration-test - ${spring.integration.version} - test - - - - commons-io - commons-io - 2.4 - - - - - junit - junit - ${junit.version} - - - org.apache.ftpserver - ftpserver-core - 1.0.6 - - - - - - log4j - log4j - ${log4j.version} - - - - org.slf4j - slf4j-log4j12 - 1.5.2 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.11 - - - **/TestSuite.java - - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + ftp + 2.2.0.BUILD-SNAPSHOT + FTP Basic Sample + FTP Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.slf4j + slf4j-log4j12 + 1.7.6 + compile + + + org.springframework.integration + spring-integration-ftp + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + commons-io + commons-io + 2.4 + compile + + + org.springframework.integration + spring-integration-test + 4.0.0.RELEASE + test + + + org.apache.ftpserver + ftpserver-core + 1.0.6 + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 163b8214d..14bc2d5cc 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -1,87 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - helloworld - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - Hello World Sample - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - org.springframework.integration.samples.helloworld.HelloWorldApp - - - - - hello - - org.springframework.integration.samples.helloworld.HelloWorldApp - - - - poller - - org.springframework.integration.samples.helloworld.PollerApp - - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - ${java.main.class} - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + helloworld + 2.2.0.BUILD-SNAPSHOT + Hello World Sample + Hello World Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-core + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 7b3af7225..e99ee3849 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -1,95 +1,145 @@ - - 4.0.0 - org.springframework.integration.samples - http - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - HTTP Demo - war - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.2 - 1.3.2 - 1.2.17 - - - - org.springframework.integration - spring-integration-http - ${spring.integration.version} - - - org.springframework.integration - spring-integration-mail - ${spring.integration.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - commons-fileupload - commons-fileupload - ${commons-fileupload} - - - org.apache.commons - commons-io - 1.3.2 - - - javax.mail - mail - 1.4.5 - - - log4j - log4j - ${log4j.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.http.HttpClientDemo - - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.26 - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + http + 2.2.0.BUILD-SNAPSHOT + war + HTTP Sample + HTTP Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /http + + + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework + spring-webmvc + 4.0.3.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-http + 4.0.0.RELEASE + compile + + + commons-io + commons-io + 2.4 + compile + + + org.springframework.integration + spring-integration-mail + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + javax.mail + javax.mail-api + 1.4.7 + compile + + + commons-fileupload + commons-fileupload + 1.2.2 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index ff8c7eb72..4ed7c84eb 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -1,112 +1,106 @@ - - 4.0.0 - - org.springframework.integration.samples - jdbc - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Basic) - JDBC - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.jdbc.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-jdbc - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - - - - com.h2database - h2 - 1.3.168 - - + + + 4.0.0 + org.springframework.integration.samples + jdbc + 2.2.0.BUILD-SNAPSHOT + JDBC Basic Sample + JDBC Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + com.h2database + h2 + 1.3.175 + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jdbc + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 47d22c45b..dfd43b9b2 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -1,115 +1,130 @@ - - 4.0.0 - org.springframework.integration.samples - jms - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - JMS - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 5.7.0 - 1.2.17 - 4.10 - org.springframework.integration.samples.jms.Main - - - - - - junit - junit - ${junit.version} - test - - - - org.apache.activemq - activemq-core - ${activemq.version} - - - spring-context - org.springframework - - - - - org.springframework - spring-jms - ${spring.version} - compile - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - org.springframework.integration - spring-integration-jms - ${spring.integration.version} - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - org.springframework.integration - spring-integration-test - ${spring.integration.version} - test - - - log4j - log4j - ${log4j.version} - - - org.slf4j - slf4j-log4j12 - 1.6.6 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - ${java.main.class} - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + jms + 2.2.0.BUILD-SNAPSHOT + JMS Basic Sample + JMS Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-jms + 4.0.0.RELEASE + compile + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + org.slf4j + slf4j-log4j12 + 1.7.6 + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-test + 4.0.0.RELEASE + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + org.apache.activemq + activemq-broker + 5.9.0 + compile + + + org.apache.activemq + activemq-kahadb-store + 5.9.0 + compile + + diff --git a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java index bc552fe12..4bc9aa47b 100644 --- a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java +++ b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java @@ -15,9 +15,9 @@ */ package org.springframework.integration.samples.jms; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; + import org.springframework.context.support.GenericXmlApplicationContext; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; diff --git a/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java index e1435a8a1..1ab846702 100644 --- a/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java +++ b/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java @@ -15,9 +15,9 @@ */ package org.springframework.integration.samples.jms; -import junit.framework.Assert; - +import org.junit.Assert; import org.junit.Test; + import org.springframework.context.support.GenericXmlApplicationContext; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 9dd392014..172fd55b0 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -1,67 +1,106 @@ - - 4.0.0 - org.springframework.integration.samples - jmx - Samples (Basic) - JMX - 2.2.0.BUILD-SNAPSHOT - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-jmx - ${spring.integration.version} - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + jmx + 2.2.0.BUILD-SNAPSHOT + JMX Basic Sample + JMX Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jmx + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 5f023ef86..30238f61c 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -1,143 +1,136 @@ - - 4.0.0 - - org.springframework.integration.samples - jpa - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Basic) - JPA - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - 2.2.0 - 2.3.2 - 4.0.1.Final - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.eclipse - EclipseLink Maven Repository - http://download.eclipse.org/rt/eclipselink/maven.repo - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - java - - -javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring.version}/spring-instrument-${spring.version}.jar - -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar - -classpath - - org.springframework.integration.samples.jpa.Main - - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-jpa - ${spring.integration.version} - - - - org.springframework - spring-instrument - ${spring.version} - - - - - - log4j - log4j - ${log4j.version} - - - org.slf4j - slf4j-log4j12 - 1.7.2 - - - - - - com.h2database - h2 - 1.3.168 - - - - - - org.hibernate - hibernate-entitymanager - ${hibernate.version} - - - org.eclipse.persistence - org.eclipse.persistence.jpa - ${eclipselink.version} - - - org.apache.openjpa - openjpa - ${openjpa.version} - - + + + 4.0.0 + org.springframework.integration.samples + jpa + 2.2.0.BUILD-SNAPSHOT + JPA Basic Sample + JPA Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.hibernate + hibernate-entitymanager + 4.2.11.Final + compile + + + com.h2database + h2 + 1.3.175 + compile + + + commons-lang + commons-lang + 2.6 + compile + + + junit + junit + 4.11 + test + + + org.springframework + spring-instrument + 4.0.3.RELEASE + runtime + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.apache.openjpa + openjpa + 2.3.0 + runtime + + + org.springframework.integration + spring-integration-jpa + 4.0.0.RELEASE + compile + + + org.eclipse.persistence + javax.persistence + 2.0.0 + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index f568bcd75..1a7ee7e59 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -1,71 +1,118 @@ - - 4.0.0 - org.springframework.integration.samples - mail - Samples (Basic) - Mail Demo (IMAP + POP3) - 2.2.0.BUILD-SNAPSHOT - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-mail - ${spring.integration.version} - - - javax.activation - activation - 1.1.1 - true - - - javax.mail - mail - 1.4.5 - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + mail + 2.2.0.BUILD-SNAPSHOT + Mail (IMAP + POP3) Sample + Mail (IMAP + POP3) Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework + spring-context + 4.0.3.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-mail + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + javax.mail + javax.mail-api + 1.4.7 + compile + + + com.sun.mail + mailapi + 1.4.7 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 4ad89d774..e2d004a69 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -1,110 +1,100 @@ - - 4.0.0 - - org.springframework.integration.samples - mongodb - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Basic) - MongoDb - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.jdbc.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-mongodb - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - - org.slf4j - slf4j-log4j12 - 1.6.1 - - + + + 4.0.0 + org.springframework.integration.samples + mongodb + 2.2.0.BUILD-SNAPSHOT + MongoDb Basic Sample + MongoDb Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-mongodb + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 260185a3b..5da4f94fc 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -1,87 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - oddeven - Samples (Basic) - Odd-Even Sample - 2.2.0.BUILD-SNAPSHOT - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - cron - - org.springframework.integration.samples.oddeven.CronOddEvenDemo - - - - interval - - org.springframework.integration.samples.oddeven.IntervalOddEvenDemoTestApp - - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - ${java.main.class} - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + oddeven + 2.2.0.BUILD-SNAPSHOT + Odd-Even Sample + Odd-Even Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-core + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/pom.xml b/basic/pom.xml index 69ff3d6ca..acfeb9687 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -1,40 +1,53 @@ - - - 4.0.0 - org.springframework.integration.samples - basic-samples - 2.2.0.BUILD-SNAPSHOT - Spring Integration Samples - Basic - pom - - - amqp - control-bus - enricher - feed - file - ftp - helloworld - http - jdbc - jms - jmx - jpa - mail - oddeven - quote - sftp - tcp-client-server - testing-examples - twitter - ws-inbound-gateway - ws-outbound-gateway - xml - xmpp - mongodb - tcp-amqp - - + + 4.0.0 + org.springframework.integration.samples + basic + 2.2.0.BUILD-SNAPSHOT + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 48d2361c5..11a7e6610 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -1,60 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - quote - Samples (Basic) - Quote Sample - 2.2.0.BUILD-SNAPSHOT - jar - - 2.2.1 - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + quote + 2.2.0.BUILD-SNAPSHOT + Quote Sample + Quote Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 1d2b384ff..06eea9708 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -1,59 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - sftp - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - SFTP Demo - jar - - 2.2.1 - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-sftp - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + sftp + 2.2.0.BUILD-SNAPSHOT + SFTP Basic Sample + SFTP Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-sftp + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml index 757ce5193..133727721 100644 --- a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml +++ b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml @@ -25,7 +25,7 @@ channel="receiveChannel" session-factory="sftpSessionFactory" local-directory="file:local-dir" - remote-directory="<>" + remote-directory="${remote.directory}" auto-create-local-directory="true" delete-remote-files="false" filename-regex=".*\.txt$"> diff --git a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml index d9b65a038..82ab84814 100644 --- a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml +++ b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml @@ -25,6 +25,6 @@ session-factory="sftpSessionFactory" channel="inputChannel" remote-filename-generator-expression="payload.getName() + '_foo'" - remote-directory=""/> + remote-directory="${remote.directory}"/> diff --git a/basic/sftp/src/test/resources/user.properties b/basic/sftp/src/test/resources/user.properties index 72d8a1314..3780ad08f 100644 --- a/basic/sftp/src/test/resources/user.properties +++ b/basic/sftp/src/test/resources/user.properties @@ -1,4 +1,5 @@ user= passphrase= #private.keyfile=file:/home/someuser/.ssh/id_rsa -private.keyfile=classpath:META-INF/keys/sftp_rsa \ No newline at end of file +private.keyfile=classpath:META-INF/keys/sftp_rsa +remote.directory=<> diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index f686763d0..39a1fb499 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -1,131 +1,112 @@ - - 4.0.0 - - org.springframework.integration.samples - tcp-amqp - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Basic) - TCP-AMQP - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.6.4 - 4.10 - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.tcpamqp.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-amqp - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-groovy - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-ip - ${spring.integration.version} - - - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - log4j-over-slf4j - ${slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - + + + 4.0.0 + org.springframework.integration.samples + tcp-amqp + 2.2.0.BUILD-SNAPSHOT + TCP-AMQP Basic Sample + TCP-AMQP Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.slf4j + slf4j-log4j12 + 1.7.6 + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-amqp + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-ip + 4.0.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 139df9969..63d562942 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -1,96 +1,112 @@ - - 4.0.0 - org.springframework.integration.samples - tcp-client-server - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - TCP Client Server Sample - jar - - 2.2.1 - - - UTF-8 - 4.0.3.RELEASE - 4.0.0.RC1 - 1.2.17 - 4.10 - org.springframework.integration.samples.tcpclientserver.Main - - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework.integration - spring-integration-ip - ${spring.integration.version} - - - org.springframework.integration - spring-integration-test - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - org.springframework - spring-test - ${spring.version} - test - - - commons-lang - commons-lang - 2.6 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - ${java.main.class} - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + tcp-client-server + 2.2.0.BUILD-SNAPSHOT + TCP Client Server Sample + TCP Client Server Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + commons-lang + commons-lang + 2.6 + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-test + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-ip + 4.0.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index c8fb1f8a3..4fe9ac3e5 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -1,134 +1,124 @@ - - 4.0.0 - org.springframework.integration.samples - testing-examples - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - Testing Examples - jar - - 2.2.1 - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-file - ${spring.integration.version} - - - org.springframework.integration - spring-integration-ws - ${spring.integration.version} - - - spring-web - org.springframework - - - spring-expression - org.springframework - - - - - org.springframework.integration - spring-integration-test - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - org.springframework - spring-test - ${spring.version} - test - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - spring-expression - org.springframework - - - - - org.springframework - spring-oxm - ${spring.version} - - - - - - src/test/java - - **/* - - - **/*.java - - - - src/test/resources - - **/* - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - maven-surefire-plugin - 2.12.4 - - - **/*Tests.java - - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + testing-examples + 2.2.0.BUILD-SNAPSHOT + Testing Examples + Testing Examples + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework + spring-webmvc + 4.0.3.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-http + 4.0.0.RELEASE + compile + + + org.springframework.integration + spring-integration-ws + 4.0.0.RELEASE + compile + + + org.springframework.integration + spring-integration-test + 4.0.0.RELEASE + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + org.springframework.integration + spring-integration-file + 4.0.0.RELEASE + compile + + diff --git a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java index b02938936..c7e798030 100644 --- a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java +++ b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java @@ -27,6 +27,8 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; +import org.w3c.dom.Document; + import org.springframework.beans.factory.InitializingBean; import org.springframework.oxm.Marshaller; import org.springframework.oxm.MarshallingFailureException; @@ -35,26 +37,27 @@ import org.springframework.xml.transform.StringResult; import org.springframework.xml.transform.StringSource; import org.springframework.xml.xpath.XPathExpressionFactory; -import org.w3c.dom.Document; - -import com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl; /** - * + * * @author Oleg Zhurakousky * @author Mark Fisher * @since SpringOne2GX - 2010, Chicago */ public class WeatherMarshaller implements Marshaller, Unmarshaller, InitializingBean { - private Map namespacePrefixes = new HashMap(); + + private static final TransformerFactory transformerFactory = TransformerFactory.newInstance(); + + private Map namespacePrefixes = new HashMap(); + private String xpathPrefix = "/p:GetCityWeatherByZIPResponse/p:GetCityWeatherByZIPResult/"; public Object unmarshal(Source source) throws IOException, XmlMappingException { - + //this.writeXml(((DOMSource)source).getNode().getOwnerDocument()); DOMResult result = null; try { - Transformer transformer = new TransformerFactoryImpl().newTransformer(); - result = new DOMResult(); + Transformer transformer = transformerFactory.newTransformer(); + result = new DOMResult(); transformer.transform(source, result); } catch (Exception e) { throw new MarshallingFailureException("Failed to unmarshal SOAP Response", e); @@ -86,13 +89,13 @@ public void marshal(Object zip, Result result) throws IOException, " " + zip + "" + ""; try { - Transformer transformer = new TransformerFactoryImpl().newTransformer(); + Transformer transformer = transformerFactory.newTransformer(); transformer.transform(new StringSource(xmlString), result); } catch (Exception e) { e.printStackTrace(); } } - + public static final void writeXml(Document document) { Transformer transformer = createIndentingTransformer(); @@ -108,7 +111,7 @@ public static final void writeXml(Document document) { public static final Transformer createIndentingTransformer() { Transformer xformer; try { - xformer = TransformerFactory.newInstance().newTransformer(); + xformer = transformerFactory.newTransformer(); xformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes"); xformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); xformer.setOutputProperty(OutputKeys.INDENT, "yes"); @@ -122,6 +125,6 @@ public static final Transformer createIndentingTransformer() { } public void afterPropertiesSet() throws Exception { - namespacePrefixes.put("p", "http://ws.cdyne.com/WeatherWS/"); + namespacePrefixes.put("p", "http://ws.cdyne.com/WeatherWS/"); } } diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index d5888feaf..ddf3fda0a 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -1,60 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - twitter - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - Twitter Demo - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-twitter - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + twitter + 2.2.0.BUILD-SNAPSHOT + Twitter Basic Sample + Twitter Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-twitter + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 86a63b7ea..61d2f1ab4 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -1,72 +1,127 @@ - - 4.0.0 - org.springframework.integration.samples - ws-inbound-gateway - Samples (Basic) - WS Inbound Gateway Sample - 2.2.0.BUILD-SNAPSHOT - war - - 2.2.1 - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-xml - ${spring.integration.version} - - - org.springframework.integration - spring-integration-ws - ${spring.integration.version} - - - org.springframework - spring-test - ${spring.version} - test - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + ws-inbound-gateway + 2.2.0.BUILD-SNAPSHOT + war + WS Inbound Gateway Sample + WS Inbound Gateway Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /ws-inbound-gateway + + + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework + spring-webmvc + 4.0.3.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-ws + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-xml + 4.0.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java index 8aba40d8e..121fa9521 100644 --- a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java +++ b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java @@ -17,6 +17,7 @@ package org.springframework.integration.samples.ws; import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -28,6 +29,7 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; +import org.hamcrest.CoreMatchers; import org.junit.Test; import org.junit.runner.RunWith; import org.w3c.dom.Document; @@ -76,7 +78,7 @@ public void testSendAndReceive() throws Exception { MessageContext messageContext = new DefaultMessageContext(request, messageFactory); gateway.invoke(messageContext); Object reply = messageContext.getResponse().getPayloadSource(); - assertThat(reply, is(DOMSource.class)); + assertThat(reply, is(instanceOf(DOMSource.class))); DOMSource replySource = (DOMSource) reply; Element element = (Element) replySource.getNode().getFirstChild(); assertThat(element.getTagName(), equalTo("echoResponse")); diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 2d51ecaec..f76c377fe 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -1,85 +1,106 @@ - - 4.0.0 - org.springframework.integration.samples - ws-outbound-gateway - Samples (Basic) - WS Outbound Gateway Sample - 2.2.0.BUILD-SNAPSHOT - jar - - 2.2.1 - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - 1.3.19 - 1.1.1 - - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - org.springframework.integration - spring-integration-ws - ${spring.integration.version} - - - com.sun.xml.messaging.saaj - saaj-impl - ${saaj.version} - - - javax.activation - activation - ${javax-activation.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.ws.WebServiceDemoTestApp - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + ws-outbound-gateway + 2.2.0.BUILD-SNAPSHOT + WS Outbound Gateway Sample + WS Outbound Gateway Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-ws + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemoTestApp.java b/basic/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemoTestApp.java index c42b6855a..c403f05d3 100644 --- a/basic/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemoTestApp.java +++ b/basic/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemoTestApp.java @@ -39,8 +39,8 @@ public static void main(String[] args) { // Compose the XML message according to the server's schema String requestXml = - "" + - " 90.0" + + "" + + "90.0" + ""; // Create the Message object diff --git a/basic/ws-outbound-gateway/src/main/resources/META-INF/spring/integration/temperatureConversion.xml b/basic/ws-outbound-gateway/src/main/resources/META-INF/spring/integration/temperatureConversion.xml index e6a3c4950..3dd1f2e14 100644 --- a/basic/ws-outbound-gateway/src/main/resources/META-INF/spring/integration/temperatureConversion.xml +++ b/basic/ws-outbound-gateway/src/main/resources/META-INF/spring/integration/temperatureConversion.xml @@ -18,7 +18,7 @@ Web Service for the given URI, and the reply Message is sent to the 'celsiusChannel'. --> - + diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 97b884e71..941aa6ff9 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -1,68 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - xml - Samples (Basic) - XML Sample - 2.2.0.BUILD-SNAPSHOT - jar - - 2.2.1 - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-xml - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.xml.BookOrderProcessingTestApp - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + xml + 2.2.0.BUILD-SNAPSHOT + XML Sample + XML Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-xml + 4.0.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 520f6ebe9..2d0049db9 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -1,60 +1,100 @@ - + + 4.0.0 org.springframework.integration.samples - xmpp - 2.2.0.BUILD-SNAPSHOT - Samples (Basic) - XMPP Demo - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-xmpp - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + xmpp + 2.2.0.BUILD-SNAPSHOT + XMPP Basic Sample + XMPP Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-xmpp + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..9e4db1cd7 --- /dev/null +++ b/build.gradle @@ -0,0 +1,1045 @@ +description = 'Spring Integration Samples' + +apply plugin: 'base' +apply plugin: 'idea' + +ext { + linkHomepage = 'http://projects.spring.io/spring-integration' + linkCi = 'https://build.spring.io/browse/INTSAMPLES' + linkIssue = 'https://jira.spring.io/browse/INTSAMPLES' + linkScmUrl = 'https://github.com/spring-projects/spring-integration-samples' + linkScmConnection = 'scm:git:git://github.com/spring-projects/spring-integration-samples.git' + linkScmDevConnection = 'scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git' +} + +buildscript { + repositories { + maven { url "http://repo.spring.io/libs-milestone" } + } + dependencies { + classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion") + } +} + +allprojects { + group = 'org.springframework.integration.samples' +} + +subprojects { subproject -> + + apply plugin: 'eclipse' + apply plugin: 'idea' + apply plugin: 'maven' + + task generatePom << { + pom { + project { + name = project.description + description = project.description + url = linkHomepage + + organization { + name = 'SpringIO' + url = 'https://spring.io' + } + + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' + } + } + + scm { + url = linkScmUrl + connection = 'scm:git:' + linkScmConnection + developerConnection = 'scm:git:' + linkScmDevConnection + } + + developers { + developer { + id = 'garyrussell' + name = 'Gary Russell' + email = 'grussell@gopivotal.com' + roles = ["project lead"] + } + developer { + id = 'markfisher' + name = 'Mark Fisher' + email = 'mfisher@gopivotal.com' + roles = ["project founder and lead emeritus"] + } + developer { + id = 'ghillert' + name = 'Gunnar Hillert' + email = 'ghillert@gopivotal.com' + } + developer { + id = 'abilan' + name = 'Artem Bilan' + email = 'abilan@gopivotal.com' + } + } + + if (subproject.plugins.hasPlugin('java')) { + repositories { + repository { + id = 'repo.spring.io.milestone' + name = 'Spring Framework Maven Milestone Repository' + url = 'https://repo.spring.io/libs-milestone' + } + } + } + + if (subproject.plugins.hasPlugin('jetty')) { + packaging = 'war' + build { + plugins { + plugin { + groupId = 'org.mortbay.jetty' + artifactId = 'jetty-maven-plugin' + version = '8.1.14.v20131031' + configuration { + webAppConfig { + contextPath = '/' + subproject.name + } + } + } + } + } + } + + if (subproject.plugins.hasPlugin('spring-boot')) { + parent { + groupId = 'org.springframework.boot' + artifactId = 'spring-boot-starter-parent' + version = springBootVersion + } + + build { + plugins { + plugin { + groupId = 'org.springframework.boot' + artifactId = 'spring-boot-maven-plugin' + } + } + } + } + + } + }.writeTo('pom.xml') + } + + eclipse { + project { + natures += 'org.springframework.ide.eclipse.core.springnature' + } + } + + repositories { + maven { url 'http://repo.spring.io/libs-milestone' } + } + + if (!(subproject.name in ['advanced', 'applications', 'basic', 'intermediate', 'cafe'])) { + + apply plugin: 'java' + + sourceCompatibility = 1.6 + + ext { + activeMqVersion = '5.9.0' + aspectjVersion = '1.8.0' + commonsDigesterVersion = '2.0' + commonsDbcpVersion = '1.2.2' + commonsFileUploadVersion = '1.2.2' + commonsIoVersion = '2.4' + commonsLangVersion = '2.6' + commonsPoolVersion = '1.5.4' + c3p0Version = '0.9.1.2' + derbyVersion = '10.10.1.1' + hamcrestVersion = '1.3' + hibernateVersion = '4.2.11.Final' + hibernateValidatorVersion = '4.2.0.Final' + ftpServerVersion = '1.0.6' + flexjsonVersion = '2.0' + groovyVersion = '2.3.0' + hsqldbVersion = '2.3.2' + h2Version = '1.3.175' + jacksonVersion = '2.3.2' + jasyptVersion = '1.7' + javaxInjectVersion = '1' + javaxMailVersion = '1.4.7' + jodaTimeVersion = '1.6' + jtaVersion = '1.1' + jtdsVersion = '1.2.6' + jmsApiVersion = '1.1-rev-1' + jrubyVersion = '1.7.12' + jpaApiVersion = '2.0.0' + jstlVersion = '1.2' + junitVersion = '4.11' + jythonVersion = '2.5.3' + log4jVersion = '1.2.17' + mockitoVersion = '1.9.5' + openJpaVersion = '2.3.0' + oracleDriverVersion = '11.2.0.3' + postgresVersion = '9.1-901-1.jdbc4' + subethasmtpVersion = '1.2' + slf4jVersion = '1.7.6' + springIntegrationVersion = '4.0.1.RELEASE' + springIntegrationDslVersion = '1.0.0.M1' + springVersion = '4.0.5.RELEASE' + springSecurityVersion = '3.2.4.RELEASE' + springWebFlowVersion = '2.3.3.RELEASE' + tilesJspVersion = '2.2.1' + validationApiVersion = '1.0.0.GA' + } + + sourceSets.each { + it.resources.srcDirs = ["src/${it.name}/resources", "src/${it.name}/java"] + } + + // dependencies that are common across all java projects + dependencies { + compile "log4j:log4j:$log4jVersion" + + testCompile("junit:junit:$junitVersion") { + exclude group: 'org.hamcrest' + } + testCompile "org.hamcrest:hamcrest-all:$hamcrestVersion" + testCompile("org.mockito:mockito-core:$mockitoVersion") { + exclude group: 'org.hamcrest' + } + testCompile "org.springframework:spring-test:$springVersion" + } + + // enable all compiler warnings; individual projects may customize further + ext.xLintArg = '-Xlint:all,-options' + [compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg] + + test { + // suppress all console output during testing unless running `gradle -i` + logging.captureStandardOutput(LogLevel.INFO) + } + + task checkTestConfigs << { + def configFiles = [] + sourceSets.test.allSource.srcDirs.each { + fileTree(it).include('**/*.xml').exclude('**/log4j.xml').each { configFile -> + def configXml = new XmlParser(false, false).parse(configFile) + + if (configXml.@'xsi:schemaLocation' ==~ /.*spring-[a-z-]*\d\.\d\.xsd.*/) { + configFiles << configFile + } + } + } + if (configFiles) { + throw new InvalidUserDataException('Hardcoded XSD version in the config files:\n' + + configFiles.collect { relativePath(it) }.join('\n') + + '\nPlease, use versionless schemaLocations for Spring XSDs to avoid issues with builds ' + + 'on different versions of dependencies.') + } + } + + test.dependsOn checkTestConfigs + } + + task cleanTarget(type: Delete) { + delete 'target' + } + + clean.dependsOn cleanTarget +} + +project('advanced-testing-examples') { + description = 'Advanced Testing Examples' + + dependencies { + compile "javax.jms:jms-api:$jmsApiVersion" + compile "org.springframework.integration:spring-integration-jms:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-groovy:$springIntegrationVersion" + } +} + +project('dynamic-ftp') { + description = 'Dynamic FTP Demo' + + dependencies { + compile "org.springframework.integration:spring-integration-ftp:$springIntegrationVersion" + } +} + +project('cafe-si') { + description = 'Cafe - Pure Spring Integration' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.cafe.xml.CafeDemoApp' + + dependencies { + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" + } +} + +project('cafe-amqp') { + description = 'Cafe - With AMQP Message Broker' + + dependencies { + compile project(":cafe-si") + compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" + } +} + +project('cafe-jms') { + description = 'Cafe - With JMS Message Broker' + + dependencies { + compile project(":cafe-si") + compile "org.apache.activemq:activemq-broker:$activeMqVersion" + compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { + exclude group: "org.springframework" + } + compile "org.springframework.integration:spring-integration-jms:$springIntegrationVersion" + } +} + +project('cafe-scripted') { + description = 'Cafe Sample (Scripted Implementation)' + + dependencies { + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-groovy:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-rmi:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-jmx:$springIntegrationVersion" + compile "org.jruby:jruby:$jrubyVersion" + compile "org.python:jython-standalone:$jythonVersion" + compile "org.codehaus.groovy:groovy-all:$groovyVersion" + } + + task runCafeDemoApp(type: JavaExec) { + main 'org.springframework.integration.samples.cafe.demo.CafeDemoApp' + args project.hasProperty('lang') ? project.lang : '' + classpath = sourceSets.main.runtimeClasspath + } + + task runControlBus(type: JavaExec) { + main 'org.springframework.integration.samples.cafe.demo.ControlBusMain' + classpath = sourceSets.main.runtimeClasspath + } +} + +project('loan-broker') { + description = 'Loan Broker Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.loanbroker.demo.LoanBrokerDemo' + + dependencies { + compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" + } + + task runLoanBrokerSharkDetectorDemo(type: JavaExec) { + main 'org.springframework.integration.samples.loanbroker.demo.LoanBrokerSharkDetectorDemo' + classpath = sourceSets.main.runtimeClasspath + } + +} + +project('loanshark') { + description = 'Loan Shark Sample' + + apply plugin: 'jetty' + + dependencies { + compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" + compile "org.springframework:spring-webmvc:$springVersion" + compile "org.springframework:spring-orm:$springVersion" + compile "org.springframework:spring-aop:$springVersion" + compile "org.springframework:spring-aspects:$springVersion" + compile "org.aspectj:aspectjtools:$aspectjVersion" + compile "org.springframework:spring-jdbc:$springVersion" + compile "org.springframework:spring-tx:$springVersion" + compile "org.springframework:spring-context:$springVersion" + compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" + compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" + compile "org.slf4j:slf4j-log4j12:$slf4jVersion" + compile "org.slf4j:jcl-over-slf4j:$slf4jVersion" + compile "commons-digester:commons-digester:$commonsDigesterVersion" + compile "commons-pool:commons-pool:$commonsPoolVersion" + compile "org.apache.tiles:tiles-jsp:$tilesJspVersion" + compile "joda-time:joda-time:$jodaTimeVersion" + compile "javax.transaction:jta:$jtaVersion" + compile "org.hsqldb:hsqldb:$hsqldbVersion" + compile "net.sf.flexjson:flexjson:$flexjsonVersion" + compile "javax.validation:validation-api:$validationApiVersion" + compile "org.hibernate:hibernate-validator:$hibernateValidatorVersion" + compile "org.eclipse.persistence:javax.persistence:$jpaApiVersion" + compile "org.hibernate:hibernate-entitymanager:$hibernateVersion" + compile "org.springframework.webflow:spring-js:$springWebFlowVersion" + } + +} + +project('amqp') { + description = 'AMQP Basic Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.amqp.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" + } +} + +project('control-bus') { + description = 'Control Bus Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + } +} + +project('enricher') { + description = 'Enricher Basic Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.enricher.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "com.h2database:h2:$h2Version" + } +} + +project('feed') { + description = 'Feed (RSS/ATOM) Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-feed:$springIntegrationVersion" + } +} + +project('file') { + description = 'File Copy Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + } +} + +project('ftp') { + description = 'FTP Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-ftp:$springIntegrationVersion" + compile "commons-io:commons-io:$commonsIoVersion" + compile "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" + compile "org.slf4j:slf4j-log4j12:$slf4jVersion" + + testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + } + + test { + include '**/TestSuite*' + } +} + +project('helloworld') { + description = 'Hello World Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + } + + task runHelloWorldApp(type: JavaExec) { + main 'org.springframework.integration.samples.helloworld.HelloWorldApp' + classpath = sourceSets.main.runtimeClasspath + } + + task runPollerApp(type: JavaExec) { + main 'org.springframework.integration.samples.helloworld.PollerApp' + classpath = sourceSets.main.runtimeClasspath + } + +} + +project('http') { + description = 'HTTP Sample' + + apply plugin: 'application' + apply plugin: 'jetty' + + mainClassName = 'org.springframework.integration.samples.http.HttpClientDemo' + + dependencies { + compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-mail:$springIntegrationVersion" + compile "org.springframework:spring-webmvc:$springVersion" + compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" + compile "commons-io:commons-io:$commonsIoVersion" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + } + +} + +project('si4demo') { + description = 'Java Configuration/DSL Sample' + + apply plugin: 'spring-boot' + + sourceCompatibility = 1.8 + + dependencies { + compile 'org.springframework.boot:spring-boot-starter-web' + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-twitter:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-java-dsl:$springIntegrationDslVersion" + + testCompile 'org.springframework.boot:spring-boot-starter-test' + } + + mainClassName = 'org.springframework.integration.samples.si4demo.dsl.Application' +} + +project('jdbc') { + description = 'JDBC Basic Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.jdbc.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "com.h2database:h2:$h2Version" + } +} + +project('jms') { + description = 'JMS Basic Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.jms.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-jms:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "org.slf4j:slf4j-log4j12:$slf4jVersion" + compile "org.apache.activemq:activemq-broker:$activeMqVersion" + compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { + exclude group: "org.springframework" + } + + testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + } +} + +project('jmx') { + description = 'JMX Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-jmx:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + } +} + +project('jpa') { + description = 'JPA Basic Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.jpa.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-jpa:$springIntegrationVersion" + compile "com.h2database:h2:$h2Version" + compile "org.hibernate:hibernate-entitymanager:$hibernateVersion" + compile "org.eclipse.persistence:javax.persistence:$jpaApiVersion" + compile "commons-lang:commons-lang:$commonsLangVersion" + + runtime "org.springframework:spring-instrument:$springVersion" + runtime "org.apache.openjpa:openjpa:$openJpaVersion" + + } + + //Suppress openjpa annotation processor warnings + compileTestJava.options.compilerArgs = ["${xLintArg},-processing"] + + run { + def javaAgents = configurations.testRuntime.resolvedConfiguration.resolvedArtifacts + .findAll { it.name in ['spring-instrument', 'openjpa'] } + .collect { "-javaagent:${it.file}" } + jvmArgs javaAgents + } +} + +project('mail') { + description = 'Mail (IMAP + POP3) Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-mail:$springIntegrationVersion" + compile "org.springframework:spring-context:$springVersion" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "com.sun.mail:mailapi:$javaxMailVersion" + } + + task runGmailInboundPop3AdapterTestApp(type: JavaExec) { + main 'org.springframework.integration.samples.mail.imapidle.GmailInboundPop3AdapterTestApp' + classpath = sourceSets.main.runtimeClasspath + + } + + task runGmailInboundImapIdleAdapterTestApp(type: JavaExec) { + main 'org.springframework.integration.samples.mail.imapidle.GmailInboundImapIdleAdapterTestApp' + classpath = sourceSets.main.runtimeClasspath + } +} + +project('mongodb') { + description = 'MongoDb Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-mongodb:$springIntegrationVersion" + } + + task runMongoDbInboundAdapterDemo(type: JavaExec) { + main 'org.springframework.integration.samples.mongodb.inbound.MongoDbInboundAdapterDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runMongoDbOutboundAdapterDemo(type: JavaExec) { + main 'org.springframework.integration.samples.mongodb.inbound.MongoDbOutboundAdapterDemo' + classpath = sourceSets.main.runtimeClasspath + } +} + +project('oddeven') { + description = 'Odd-Even Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + } + + task runCronOddEvenDemo(type: JavaExec) { + main 'org.springframework.integration.samples.oddeven.CronOddEvenDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runIntervalOddEvenDemoTestApp(type: JavaExec) { + main 'org.springframework.integration.samples.oddeven.IntervalOddEvenDemoTestApp' + classpath = sourceSets.main.runtimeClasspath + } +} + +project('quote') { + description = 'Quote Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + } +} + +project('sftp') { + description = 'SFTP Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-sftp:$springIntegrationVersion" + } + + test { + exclude '**/*Sample*' + } +} + +project('tcp-amqp') { + description = 'TCP-AMQP Basic Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.tcpamqp.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" + compile "org.slf4j:slf4j-log4j12:$slf4jVersion" + } +} + +project('tcp-client-server') { + description = 'TCP Client Server Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.tcpclientserver.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" + compile "commons-lang:commons-lang:$commonsLangVersion" + compile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + } +} + +project('testing-examples') { + description = 'Testing Examples' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.testing.externalgateway.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-ws:$springIntegrationVersion" + compile "org.springframework:spring-webmvc:$springVersion" + + testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + } +} + +project('twitter') { + description = 'Twitter Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-twitter:$springIntegrationVersion" + } + + test { + exclude '**/*Sample*' + } +} + +project('ws-inbound-gateway') { + description = 'WS Inbound Gateway Sample' + + apply plugin: 'jetty' + + dependencies { + compile "org.springframework.integration:spring-integration-xml:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-ws:$springIntegrationVersion" + compile "org.springframework:spring-webmvc:$springVersion" + } + + test { + exclude '**/InContainerTests*' + } +} + +project('ws-outbound-gateway') { + description = 'WS Outbound Gateway Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.ws.WebServiceDemoTestApp' + + dependencies { + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-ws:$springIntegrationVersion" +// compile 'com.sun.xml.messaging.saaj:saaj-impl:1.3.19' + } +} + +project('xml') { + description = 'XML Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.xml.BookOrderProcessingTestApp' + + dependencies { + compile "org.springframework.integration:spring-integration-xml:$springIntegrationVersion" + } +} + +project('xmpp') { + description = 'XMPP Basic Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-xmpp:$springIntegrationVersion" + } + + test { + exclude '**/*Sample*' + } +} + +project('async-gateway') { + description = 'Async Gateway Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + } +} + +project('dynamic-poller') { + description = 'Dynamic Poller Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.poller.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + } +} + +project('errorhandling') { + description = 'Error Handling Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + } +} + +project('file-processing') { + description = 'File Processing Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + } +} + +project('mail-attachments') { + description = 'Mail Attachment Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.mailattachments.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-mail:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "commons-io:commons-io:$commonsIoVersion" + compile "com.sun.mail:mailapi:$javaxMailVersion" + + testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + testCompile "org.subethamail:subethasmtp-wiser:$subethasmtpVersion" + + } +} + +project('monitoring') { + description = 'Monitoring Application' + + apply plugin: 'jetty' + apply plugin: 'application' + + mainClassName = 'org.springintegration.SpringIntegrationTest' + + dependencies { + compile "org.springframework.integration:spring-integration-jmx:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-twitter:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-groovy:$springIntegrationVersion" + compile "org.springframework:spring-webmvc:$springVersion" + compile "javax.servlet:jstl:$jstlVersion" + } +} + +project('multipart-http') { + description = 'HTTP Multipart Demo' + + apply plugin: 'jetty' + + dependencies { + compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" + compile "org.springframework:spring-webmvc:$springVersion" + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" + compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" + compile "commons-io:commons-io:$commonsIoVersion" + } +} + +project('rest-http') { + description = 'Spring Integration Rest HTTP Path Usage Demo' + + apply plugin: 'jetty' + + dependencies { + compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" + compile "org.springframework:spring-webmvc:$springVersion" + compile "org.springframework:spring-oxm:$springVersion" + compile "org.springframework:spring-tx:$springVersion" + compile "org.springframework:spring-jdbc:$springVersion" + compile "org.springframework:spring-context:$springVersion" + compile "org.springframework:spring-aop:$springVersion" + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" + compile "org.springframework.security:spring-security-web:$springSecurityVersion" + compile "org.springframework.security:spring-security-config:$springSecurityVersion" + compile "org.jasypt:jasypt:$jasyptVersion" + } + + test { + exclude '**/RestHttpClientTest*' + } + +} + +project('retry-and-more') { + description = 'Retry and More Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-ftp:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + compile("org.mockito:mockito-core:$mockitoVersion") { + exclude group: 'org.hamcrest' + } + compile "org.hamcrest:hamcrest-all:$hamcrestVersion" + } + + task runCircuitBreakerDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.CircuitBreakerDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runFileTransferDeleteAfterSuccessDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.FileTransferDeleteAfterSuccessDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runFileTransferRenameAfterFailureDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.FileTransferRenameAfterFailureDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runStatefulRetryDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.StatefulRetryDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runStatelessRetryDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.StatelessRetryDemo' + classpath = sourceSets.main.runtimeClasspath + } +} + +project('splitter-aggregator-reaper') { + description = 'Splitter-Aggregator-Reaper Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.splitteraggregator.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-core:$springIntegrationVersion" + compile "javax.inject:javax.inject:$javaxInjectVersion" + } +} + + +project('stored-procedures-derby') { + description = 'Derby Stored Procedures Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "org.apache.derby:derby:$derbyVersion" + } +} + +project('stored-procedures-oracle') { + description = 'Oracle Stored Procedures Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' + + repositories { + maven { url 'https://code.lds.org/nexus/content/groups/main-repo' } //Oracle JDBC Driver + } + + dependencies { + compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "com.oracle:ojdbc6:$oracleDriverVersion" + } + + test { + exclude '**/StringConversionServiceTest*' + } +} + +project('stored-procedures-ms') { + description = 'MS SQLServer Stored Procedures Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "net.sourceforge.jtds:jtds:$jtdsVersion" + compile "c3p0:c3p0:$c3p0Version" + } + + test { + exclude '**/StringConversionServiceTest*' + } +} + +project('stored-procedures-postgresql') { + description = 'PostgreSQL Stored Procedures Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "postgresql:postgresql:$postgresVersion" + compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" + compile "commons-pool:commons-pool:$commonsPoolVersion" + } +} + +project('tcp-client-server-multiplex') { + description = 'TCP Client Server Multiplexing Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" + + testCompile "org.springframework.integration:spring-integration-test:$springIntegrationVersion" + } +} + +project('travel') { + description = 'Travel Services Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.travel.Main' + + dependencies { + compile "org.springframework.integration:spring-integration-ws:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" + compile "org.springframework:spring-web:$springVersion" + } +} + +project('tx-synch') { + description = 'Transaction Synchronization Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.advice.TransactionSynchronizationDemo' + + dependencies { + compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-file:$springIntegrationVersion" + compile "com.h2database:h2:$h2Version" + } +} + +task wrapper(type: Wrapper) { + description = 'Generates gradlew[.bat] scripts' + gradleVersion = '1.12' + distributionUrl = "http://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip" +} diff --git a/dsl/si4demo/README.md b/dsl/si4demo/README.md index 1e9ecebcf..05e100bf2 100644 --- a/dsl/si4demo/README.md +++ b/dsl/si4demo/README.md @@ -6,9 +6,11 @@ It's currently using the spring-boot 1.1.0.M1 milestone so you may have to add t There are two demo applications: -__demo.Application__ is a Spring Boot application using Spring Integration 4.0 Java configuration features. +__org.springframework.integration.samples.javaconfig.annotations.Application__ is a Spring Boot application using +Spring Integration 4.0 Java configuration features. -__dsl.Application__ is the equivalent application using the new Java DSL that is currently being developed in the [extensions github repository](https://github.com/spring-projects/spring-integration-extensions/tree/master/spring-integration-java-dsl) +__org.springframework.integration.samples.javaconfig.dsl.Application__ is the equivalent application using the new Java +DSL that is currently being developed in the [extensions github repository](https://github.com/spring-projects/spring-integration-extensions/tree/master/spring-integration-java-dsl) In both cases, you can use Telnet or curl to search twitter diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml deleted file mode 100644 index 806e9ab95..000000000 --- a/dsl/si4demo/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - 4.0.0 - - org.springframework.integration - si4demo - 0.0.1-SNAPSHOT - - demo - Demo project - - - org.springframework.boot - spring-boot-starter-parent - 1.1.0.M1 - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-integration - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.integration - spring-integration-twitter - 4.0.0.RELEASE - - - org.springframework.integration - spring-integration-java-dsl - 1.0.0.M1 - - - - - UTF-8 - demo.Application - 1.7 - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/dsl/si4demo/src/main/java/demo/Application.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java similarity index 98% rename from dsl/si4demo/src/main/java/demo/Application.java rename to dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java index 6ff67d998..93c6ef323 100644 --- a/dsl/si4demo/src/main/java/demo/Application.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package demo; +package org.springframework.integration.samples.si4demo.annotations; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; diff --git a/dsl/si4demo/src/main/java/dsl/Application.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java similarity index 98% rename from dsl/si4demo/src/main/java/dsl/Application.java rename to dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java index 42c763b25..99716c9c2 100644 --- a/dsl/si4demo/src/main/java/dsl/Application.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package dsl; +package org.springframework.integration.samples.si4demo.dsl; import java.util.Scanner; diff --git a/dsl/si4demo/src/test/java/demo/ApplicationTests.java b/dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java similarity index 77% rename from dsl/si4demo/src/test/java/demo/ApplicationTests.java rename to dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java index b4f14b777..40d86611d 100644 --- a/dsl/si4demo/src/test/java/demo/ApplicationTests.java +++ b/dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java @@ -1,10 +1,12 @@ -package demo; +package org.springframework.integration.samples.si4demo; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.test.context.web.WebAppConfiguration; + import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.integration.samples.si4demo.annotations.Application; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = Application.class) diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..ddf3be4ea --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +version=2.2.0.BUILD-SNAPSHOT +springBootVersion=1.1.0.M2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..b979729db0ad460288cfe16f07072da7b1305e93 GIT binary patch literal 50518 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..d68fee2c3 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Apr 17 15:51:10 EEST 2014 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..91a7e269e --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..8a0b282aa --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index e3dac1d3c..b4ec04cfd 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -1,61 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - async-gateway - 2.2.0.BUILD-SNAPSHOT - Samples (Intermediate) - Async Gateway Demo - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + async-gateway + 2.2.0.BUILD-SNAPSHOT + Async Gateway Sample + Async Gateway Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-core + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 67f8ac82d..4de41cfff 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -1,74 +1,100 @@ - - 4.0.0 - - org.springframework.integration.samples - dynamic-poller - 2.2.0.BUILD-SNAPSHOT - jar - - dynamic-poller - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - org.springframework.integration.samples.poller.Main - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2 - - ${java.main.class} - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + dynamic-poller + 2.2.0.BUILD-SNAPSHOT + Dynamic Poller Sample + Dynamic Poller Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-core + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 3d2bb75b2..8969441ee 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -1,66 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - errorhandling - Samples (Intermediate) - Error Handling Sample - 2.2.0.BUILD-SNAPSHOT - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + errorhandling + 2.2.0.BUILD-SNAPSHOT + Error Handling Sample + Error Handling Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 8d9dc11e1..ffff23892 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -1,60 +1,100 @@ - - 4.0.0 - org.springframework.integration.samples - file-processing - 2.2.0.BUILD-SNAPSHOT - Samples (Intermediate) - File Processing - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - 2.2.1 - - - - - org.springframework.integration - spring-integration-file - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + file-processing + 2.2.0.BUILD-SNAPSHOT + File Processing Sample + File Processing Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + org.springframework.integration + spring-integration-file + 4.0.0.RELEASE + compile + + diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index ff848d91a..f8d84c97c 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -1,110 +1,136 @@ - - 4.0.0 - org.springframework.integration.samples - mail-attachments - Samples (Intermediate) - Mail Attachment Demo - 2.2.0.BUILD-SNAPSHOT - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - - - - 2.2.1 - - - - - org.springframework.integration - spring-integration-mail - ${spring.integration.version} - - - org.springframework.integration - spring-integration-file - ${spring.integration.version} - - - org.springframework.integration - spring-integration-test - ${spring.integration.version} - test - - - javax.activation - activation - 1.1.1 - - - javax.mail - mail - 1.4.5 - - - commons-io - commons-io - 2.4 - - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-test - ${spring.version} - test - - - org.subethamail - subethasmtp-wiser - 1.2 - test - - - - log4j - log4j - ${log4j.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.mailattachments.Main - - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + mail-attachments + 2.2.0.BUILD-SNAPSHOT + Mail Attachment Sample + Mail Attachment Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + commons-io + commons-io + 2.4 + compile + + + org.subethamail + subethasmtp-wiser + 1.2 + test + + + org.springframework.integration + spring-integration-test + 4.0.0.RELEASE + test + + + org.springframework.integration + spring-integration-mail + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + javax.mail + javax.mail-api + 1.4.7 + compile + + + com.sun.mail + mailapi + 1.4.7 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + org.springframework.integration + spring-integration-file + 4.0.0.RELEASE + compile + + diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 3f49ce29a..2106d8d44 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -1,144 +1,139 @@ - - 4.0.0 - - org.springframework.integration.sample - monitoring - 2.2.0.BUILD-SNAPSHOT - war - - monitoring - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - 1.5 - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework - spring-context - ${spring.version} - - - - org.springframework - spring-webmvc - ${spring.version} - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-jmx - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-twitter - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-groovy - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - - - - javax.servlet - servlet-api - 2.5 - provided - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - javax.servlet - jstl - 1.2 - - + + + 4.0.0 + org.springframework.integration.samples + monitoring + 2.2.0.BUILD-SNAPSHOT + war + Monitoring Application + Monitoring Application + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /monitoring + + + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework + spring-webmvc + 4.0.3.RELEASE + compile + + + javax.servlet + jstl + 1.2 + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jmx + 4.0.0.RELEASE + compile + + + org.springframework.integration + spring-integration-twitter + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-groovy + 4.0.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/monitoring/src/main/java/org/springframework/integration/mvc/controller/HomeController.java b/intermediate/monitoring/src/main/java/org/springframework/integration/mvc/controller/HomeController.java index 1c5a11ff6..47c7ea6c4 100644 --- a/intermediate/monitoring/src/main/java/org/springframework/integration/mvc/controller/HomeController.java +++ b/intermediate/monitoring/src/main/java/org/springframework/integration/mvc/controller/HomeController.java @@ -19,8 +19,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.model.TwitterMessage; +import org.springframework.integration.samples.storedprocedure.model.TwitterMessage; import org.springframework.integration.service.TwitterService; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; diff --git a/intermediate/monitoring/src/main/java/org/springframework/integration/model/TwitterMessage.java b/intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/model/TwitterMessage.java similarity index 97% rename from intermediate/monitoring/src/main/java/org/springframework/integration/model/TwitterMessage.java rename to intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/model/TwitterMessage.java index 3c1b25fd2..3d803fcb2 100644 --- a/intermediate/monitoring/src/main/java/org/springframework/integration/model/TwitterMessage.java +++ b/intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/model/TwitterMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.model; +package org.springframework.integration.samples.storedprocedure.model; import java.util.Date; diff --git a/intermediate/monitoring/src/main/java/org/springframework/integration/service/TwitterService.java b/intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/TwitterService.java similarity index 94% rename from intermediate/monitoring/src/main/java/org/springframework/integration/service/TwitterService.java rename to intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/TwitterService.java index 85cd33802..dccc7dcd6 100644 --- a/intermediate/monitoring/src/main/java/org/springframework/integration/service/TwitterService.java +++ b/intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/TwitterService.java @@ -17,7 +17,8 @@ import java.util.Collection; -import org.springframework.integration.model.TwitterMessage; +import org.springframework.integration.samples.storedprocedure.model.TwitterMessage; + /** * Provides some basic methods for controlling the flow of Twitter messages. diff --git a/intermediate/monitoring/src/main/java/org/springframework/integration/service/impl/DummyTwitter.java b/intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/impl/DummyTwitter.java similarity index 100% rename from intermediate/monitoring/src/main/java/org/springframework/integration/service/impl/DummyTwitter.java rename to intermediate/monitoring/src/main/java/org/springframework/integration/samples/storedprocedure/service/impl/DummyTwitter.java diff --git a/intermediate/monitoring/src/test/java/org/springframework/integration/SpringIntegrationTest.java b/intermediate/monitoring/src/main/java/org/springintegration/SpringIntegrationTest.java similarity index 91% rename from intermediate/monitoring/src/test/java/org/springframework/integration/SpringIntegrationTest.java rename to intermediate/monitoring/src/main/java/org/springintegration/SpringIntegrationTest.java index 8179cdc34..611f9d1ec 100644 --- a/intermediate/monitoring/src/test/java/org/springframework/integration/SpringIntegrationTest.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/SpringIntegrationTest.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package org.springframework.integration; - -import org.junit.Test; +package org.springintegration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -37,9 +35,4 @@ public static void main(String[] args) throws Exception { context.close(); } - @Test - public void test() { - // no op for maven - } - } diff --git a/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java b/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java index c3a1d4829..d7004fa8e 100644 --- a/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java @@ -21,16 +21,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; -import org.springframework.integration.model.TwitterMessage; +import org.springframework.integration.samples.storedprocedure.model.TwitterMessage; import org.springframework.integration.monitor.IntegrationMBeanExporter; import org.springframework.integration.service.TwitterService; import org.springframework.integration.support.MessageBuilder; import org.springframework.jmx.export.annotation.ManagedMetric; import org.springframework.jmx.export.annotation.ManagedResource; import org.springframework.jmx.support.MetricType; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.social.twitter.api.Tweet; import org.springframework.stereotype.Service; diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 27622d8eb..877ffa44f 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -1,84 +1,139 @@ - - 4.0.0 - org.springframework.integration.samples - multipart-http - 2.2.0.BUILD-SNAPSHOT - Samples (Intermediate) - HTTP Multipart Demo - war - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.2 - 1.3.2 - 1.2.17 - - - - 2.2.1 - - - - - org.springframework.integration - spring-integration-http - ${spring.integration.version} - - - com.fasterxml.jackson.core - jackson-databind - 2.3.2 - compile - true - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - commons-fileupload - commons-fileupload - ${commons-fileupload} - - - org.apache.commons - commons-io - 1.3.2 - - - log4j - log4j - ${log4j.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + multipart-http + 2.2.0.BUILD-SNAPSHOT + war + HTTP Multipart Demo + HTTP Multipart Demo + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /multipart-http + + + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework + spring-webmvc + 4.0.3.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-http + 4.0.0.RELEASE + compile + + + commons-io + commons-io + 2.4 + compile + + + log4j + log4j + 1.2.17 + compile + + + commons-fileupload + commons-fileupload + 1.2.2 + compile + + + com.fasterxml.jackson.core + jackson-databind + 2.3.2 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/pom.xml b/intermediate/pom.xml index 9b2f0bd6d..5a6d807e3 100644 --- a/intermediate/pom.xml +++ b/intermediate/pom.xml @@ -1,36 +1,53 @@ - - - 4.0.0 - org.springframework.integration.samples - intermediate-samples - 2.2.0.BUILD-SNAPSHOT - Spring Integration Samples - Intermediate - pom - - - 2.2.1 - - - - async-gateway - errorhandling - file-processing - multipart-http - rest-http - splitter-aggregator-reaper - stored-procedures-derby - tcp-client-server-multiplex - travel - mail-attachments - dynamic-poller - monitoring - retry-and-more - stored-procedures-ms - stored-procedures-oracle - stored-procedures-postgresql - tx-synch - - + + 4.0.0 + org.springframework.integration.samples + intermediate + 2.2.0.BUILD-SNAPSHOT + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 09e9edd0e..afdeb9c41 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -1,245 +1,175 @@ - - 4.0.0 - org.springframework.integration.samples - rest-http - 2.2.0.BUILD-SNAPSHOT - war - Spring Integration Rest HTTP Path Usage Demo - Spring Integration Rest HTTP Path Usage Demo - - - 2.2.1 - - - - 4.0.0.RC1 - 4.0.3.RELEASE - 3.1.4.RELEASE - 1.2 - 1.3.2 - 1.2.17 - 2.5 - 4.11 - 1.7 - 2.2 - - - - org.springframework.integration - spring-integration-http - ${spring.integration.version} - - - com.fasterxml.jackson.core - jackson-databind - 2.3.2 - compile - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-oxm - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework.security - spring-security-core - compile - ${spring.security.version} - - - org.springframework - spring-support - - - - - org.springframework.security - spring-security-config - compile - ${spring.security.version} - - - org.springframework - spring-support - - - - - org.springframework.security - spring-security-web - compile - ${spring.security.version} - - - log4j - log4j - ${log4j.version} - - - org.jasypt - jasypt - ${jasypt.version} - runtime - - - cglib - cglib - ${cglib.version} - runtime - - - - javax.servlet - servlet-api - ${javax.servlet.version} - provided - - - org.springframework - spring-test - ${spring.version} - test - - - org.springframework - spring-tx - - - - - junit - junit - ${junit.version} - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.0 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - clean - - - Copying jaxb.index to classes folder - - - - - - - - - - clean - - run - - - - - - maven-surefire-plugin - 2.14 - - - default-test - - - **/*Test*.java - - - - - default-integration-test - integration-test - - test - - - - none - - - **/*Test.java - - - - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.1 - - true - - - - run-tomcat - pre-integration-test - - run - - - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + rest-http + 2.2.0.BUILD-SNAPSHOT + war + Spring Integration Rest HTTP Path Usage Demo + Spring Integration Rest HTTP Path Usage Demo + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.14.v20131031 + + + /rest-http + + + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework + spring-context + 4.0.3.RELEASE + compile + + + org.springframework + spring-webmvc + 4.0.3.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.springframework.integration + spring-integration-http + 4.0.0.RELEASE + compile + + + org.springframework + spring-jdbc + 4.0.3.RELEASE + compile + + + org.springframework.security + spring-security-web + 3.2.3.RELEASE + compile + + + org.springframework + spring-oxm + 4.0.3.RELEASE + compile + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.jasypt + jasypt + 1.7 + compile + + + org.springframework + spring-tx + 4.0.3.RELEASE + compile + + + org.springframework + spring-aop + 4.0.3.RELEASE + compile + + + org.springframework.security + spring-security-config + 3.2.3.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + com.fasterxml.jackson.core + jackson-databind + 2.3.2 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/domain/jaxb.index b/intermediate/rest-http/src/main/resources/org/springframework/integration/samples/rest/domain/jaxb.index similarity index 100% rename from intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/domain/jaxb.index rename to intermediate/rest-http/src/main/resources/org/springframework/integration/samples/rest/domain/jaxb.index diff --git a/intermediate/rest-http/src/main/webapp/WEB-INF/logs/rest-http.log b/intermediate/rest-http/src/main/webapp/WEB-INF/logs/rest-http.log index ee28183fe..21d6cfc26 100644 --- a/intermediate/rest-http/src/main/webapp/WEB-INF/logs/rest-http.log +++ b/intermediate/rest-http/src/main/webapp/WEB-INF/logs/rest-http.log @@ -558,3 +558,270 @@ 2013-03-30 00:53:00,709 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - stopped _org.springframework.integration.errorLogger 2013-03-30 00:53:00,709 INFO [org.springframework.beans.factory.support.DefaultListableBeanFactory] - Destroying singletons in org.springframework.beans.factory.support.DefaultListableBeanFactory@58773ac1: defining beans [org.springframework.security.access.method.DelegatingMethodSecurityMetadataSource#0,org.springframework.security.access.vote.AffirmativeBased#0,org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor#0,org.springframework.security.methodSecurityMetadataSourceAdvisor,org.springframework.aop.config.internalAutoProxyCreator,org.springframework.security.filterChains,org.springframework.security.filterChainProxy,org.springframework.security.web.PortMapperImpl#0,org.springframework.security.web.PortResolverImpl#0,org.springframework.security.config.authentication.AuthenticationManagerFactoryBean#0,org.springframework.security.authentication.ProviderManager#0,org.springframework.security.web.context.HttpSessionSecurityContextRepository#0,org.springframework.security.web.authentication.session.SessionFixationProtectionStrategy#0,org.springframework.security.web.savedrequest.HttpSessionRequestCache#0,org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler#0,org.springframework.security.access.vote.AffirmativeBased#1,org.springframework.security.web.access.intercept.FilterSecurityInterceptor#0,org.springframework.security.web.access.DefaultWebInvocationPrivilegeEvaluator#0,org.springframework.security.authentication.AnonymousAuthenticationProvider#0,org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint#0,org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter#0,org.springframework.security.userDetailsServiceFactory,org.springframework.security.web.DefaultSecurityFilterChain#0,org.springframework.security.provisioning.InMemoryUserDetailsManager#0,org.springframework.security.authentication.dao.DaoAuthenticationProvider#0,org.springframework.security.authentication.DefaultAuthenticationEventPublisher#0,org.springframework.security.authenticationManager,jasyptStringDigester,passwordEncoder,channelInitializer,$autoCreateChannelCandidates,org.springframework.integration.internalDefaultConfiguringBeanFactoryPostProcessor,org.springframework.integration.internalMessagingAnnotationPostProcessor,org.springframework.integration.internalPublisherAnnotationBeanPostProcessor,org.springframework.integration.http.inbound.UriPathHandlerMapping#0,employeeSearchRequest,employeeSearchResponse,inboundEmployeeSearchRequestGateway,org.springframework.web.servlet.view.ContentNegotiatingViewResolver#0,marshaller,org.springframework.integration.config.ServiceActivatorFactoryBean#0,employeeServiceActivator,jaxbJacksonObjectMapper,employeeSearchService,org.springframework.context.annotation.internalConfigurationAnnotationProcessor,org.springframework.context.annotation.internalAutowiredAnnotationProcessor,org.springframework.context.annotation.internalRequiredAnnotationProcessor,org.springframework.context.annotation.internalCommonAnnotationProcessor,org.springframework.context.annotation.ConfigurationClassPostProcessor.importAwareProcessor,nullChannel,errorChannel,_org.springframework.integration.errorLogger,taskScheduler,org.springframework.integration.config.IdGeneratorConfigurer#0]; root of factory hierarchy 2013-03-30 00:53:00,709 INFO [org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler] - Shutting down ExecutorService 'taskScheduler' +2014-04-17 19:11:50,411 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization started +2014-04-17 19:11:50,461 INFO [org.springframework.web.context.support.XmlWebApplicationContext] - Refreshing Root WebApplicationContext: startup date [Thu Apr 17 19:11:50 EEST 2014]; root of context hierarchy +2014-04-17 19:11:50,484 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from ServletContext resource [/WEB-INF/config/web-application-config.xml] +2014-04-17 19:11:50,601 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from ServletContext resource [/WEB-INF/config/security-config.xml] +2014-04-17 19:11:50,630 INFO [org.springframework.security.core.SpringSecurityCoreVersion] - You are running with Spring Security Core 3.2.3.RELEASE +2014-04-17 19:11:50,630 INFO [org.springframework.security.config.SecurityNamespaceHandler] - Spring Security 'config' module version is 3.2.3.RELEASE +2014-04-17 19:11:50,661 INFO [org.springframework.security.config.http.FilterInvocationSecurityMetadataSourceParser] - Creating access control expression attribute 'hasRole('ROLE_REST_HTTP_USER')' for /services/employee/* +2014-04-17 19:11:50,671 INFO [org.springframework.security.config.http.AuthenticationConfigBuilder] - No login page configured. The default internal one will be used. Use the 'login-page' attribute to set the URL of the login page. +2014-04-17 19:11:50,677 INFO [org.springframework.security.config.http.HttpSecurityBeanDefinitionParser] - Checking sorted filter chain: [Root bean: class [org.springframework.security.web.context.SecurityContextPersistenceFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 200, Root bean: class [org.springframework.security.web.authentication.logout.LogoutFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 700, , order = 1100, Root bean: class [org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1300, Root bean: class [org.springframework.security.web.authentication.www.BasicAuthenticationFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1500, Root bean: class [org.springframework.security.web.savedrequest.RequestCacheAwareFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1600, Root bean: class [org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 1700, Root bean: class [org.springframework.security.web.authentication.AnonymousAuthenticationFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 2000, Root bean: class [org.springframework.security.web.session.SessionManagementFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 2100, Root bean: class [org.springframework.security.web.access.ExceptionTranslationFilter]; scope=; abstract=false; lazyInit=false; autowireMode=0; dependencyCheck=0; autowireCandidate=true; primary=false; factoryBeanName=null; factoryMethodName=null; initMethodName=null; destroyMethodName=null, order = 2200, , order = 2300] +2014-04-17 19:11:50,690 INFO [org.springframework.beans.factory.xml.XmlBeanDefinitionReader] - Loading XML bean definitions from class path resource [META-INF/spring/integration/applicationContext-http-int.xml] +2014-04-17 19:11:50,752 INFO [org.springframework.beans.factory.config.PropertiesFactoryBean] - Loading properties file from URL [jar:file:/C:/Users/artembilan/.gradle/caches/modules-2/files-2.1/org.springframework.integration/spring-integration-core/4.0.0.RC1/c69da0a1655a21b0c8d31e933295984f35fec993/spring-integration-core-4.0.0.RC1.jar!/META-INF/spring.integration.default.properties] +2014-04-17 19:11:50,758 INFO [org.springframework.integration.config.IntegrationRegistrar] - No bean named 'integrationHeaderChannelRegistry' has been explicitly defined. Therefore, a default DefaultHeaderChannelRegistry will be created. +2014-04-17 19:11:50,906 INFO [org.springframework.integration.config.DefaultConfiguringBeanFactoryPostProcessor] - No bean named 'errorChannel' has been explicitly defined. Therefore, a default PublishSubscribeChannel will be created. +2014-04-17 19:11:50,908 INFO [org.springframework.integration.config.DefaultConfiguringBeanFactoryPostProcessor] - No bean named 'taskScheduler' has been explicitly defined. Therefore, a default ThreadPoolTaskScheduler will be created. +2014-04-17 19:11:50,915 INFO [org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor] - JSR-330 'javax.inject.Inject' annotation found and supported for autowiring +2014-04-17 19:11:50,977 INFO [org.springframework.beans.factory.config.PropertiesFactoryBean] - Loading properties file from URL [jar:file:/C:/Users/artembilan/.gradle/caches/modules-2/files-2.1/org.springframework.integration/spring-integration-core/4.0.0.RC1/c69da0a1655a21b0c8d31e933295984f35fec993/spring-integration-core-4.0.0.RC1.jar!/META-INF/spring.integration.default.properties] +2014-04-17 19:11:50,979 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean 'integrationGlobalProperties' of type [class org.springframework.beans.factory.config.PropertiesFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:50,980 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean 'integrationGlobalProperties' of type [class java.util.Properties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:50,986 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean 'messageBuilderFactory' of type [class org.springframework.integration.support.DefaultMessageBuilderFactory] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:51,038 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean '(inner bean)#653fbbfc' of type [class org.springframework.integration.channel.MessagePublishingErrorHandler] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:51,039 INFO [org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler] - Initializing ExecutorService 'taskScheduler' +2014-04-17 19:11:51,041 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean 'taskScheduler' of type [class org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:51,041 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean 'integrationHeaderChannelRegistry' of type [class org.springframework.integration.channel.DefaultHeaderChannelRegistry] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:51,061 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean '(inner bean)#318155b1' of type [class org.springframework.security.access.annotation.SecuredAnnotationSecurityMetadataSource] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:51,074 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean 'org.springframework.security.access.method.DelegatingMethodSecurityMetadataSource#0' of type [class org.springframework.security.access.method.DelegatingMethodSecurityMetadataSource] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:51,080 INFO [org.springframework.context.support.PostProcessorRegistrationDelegate$BeanPostProcessorChecker] - Bean 'org.springframework.security.methodSecurityMetadataSourceAdvisor' of type [class org.springframework.security.access.intercept.aopalliance.MethodSecurityMetadataSourceAdvisor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying) +2014-04-17 19:11:51,250 INFO [org.springframework.beans.factory.config.PropertiesFactoryBean] - Loading properties file from class path resource [users.properties] +2014-04-17 19:11:52,016 INFO [org.springframework.security.web.DefaultSecurityFilterChain] - Creating filter chain: org.springframework.security.web.util.matcher.AnyRequestMatcher@1, [org.springframework.security.web.context.SecurityContextPersistenceFilter@1aa7d66e, org.springframework.security.web.authentication.logout.LogoutFilter@5cc85ffc, org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter@189f2184, org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter@57386162, org.springframework.security.web.authentication.www.BasicAuthenticationFilter@7388d94d, org.springframework.security.web.savedrequest.RequestCacheAwareFilter@6da14f7f, org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter@c53c04e, org.springframework.security.web.authentication.AnonymousAuthenticationFilter@18f493d7, org.springframework.security.web.session.SessionManagementFilter@2d036335, org.springframework.security.web.access.ExceptionTranslationFilter@4a3e1b5d, org.springframework.security.web.access.intercept.FilterSecurityInterceptor@587df3e4] +2014-04-17 19:11:52,332 INFO [org.springframework.oxm.jaxb.Jaxb2Marshaller] - Creating JAXBContext with context path [org.springframework.integration.samples.rest.domain] +2014-04-17 19:11:52,486 WARN [org.springframework.web.servlet.view.ContentNegotiatingViewResolver] - Did not find any ViewResolvers to delegate to; please configure them using the 'viewResolvers' property on the ContentNegotiatingViewResolver +2014-04-17 19:11:52,607 INFO [org.springframework.context.support.DefaultLifecycleProcessor] - Starting beans in phase -2147483648 +2014-04-17 19:11:52,609 INFO [org.springframework.context.support.DefaultLifecycleProcessor] - Starting beans in phase 0 +2014-04-17 19:11:52,612 INFO [org.springframework.integration.http.inbound.HttpRequestHandlingController] - started inboundEmployeeSearchRequestGateway +2014-04-17 19:11:52,612 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - Adding {service-activator:employeeServiceActivator} as a subscriber to the 'employeeSearchRequest' channel +2014-04-17 19:11:52,613 INFO [org.springframework.integration.channel.DirectChannel] - Channel 'org.springframework.web.context.WebApplicationContext:/rest-http.employeeSearchRequest' has 1 subscriber(s). +2014-04-17 19:11:52,614 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - started employeeServiceActivator +2014-04-17 19:11:52,614 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - Adding {logging-channel-adapter:_org.springframework.integration.errorLogger} as a subscriber to the 'errorChannel' channel +2014-04-17 19:11:52,615 INFO [org.springframework.integration.channel.PublishSubscribeChannel] - Channel 'org.springframework.web.context.WebApplicationContext:/rest-http.errorChannel' has 1 subscriber(s). +2014-04-17 19:11:52,616 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - started _org.springframework.integration.errorLogger +2014-04-17 19:11:52,624 INFO [org.springframework.integration.http.inbound.IntegrationRequestMappingHandlerMapping] - Mapped "{[/services/employee/{id}/search],methods=[GET || POST],params=[],headers=[],consumes=[],produces=[],custom=[]}" onto public abstract void org.springframework.web.HttpRequestHandler.handleRequest(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse) throws javax.servlet.ServletException,java.io.IOException +2014-04-17 19:11:52,628 INFO [org.springframework.web.context.ContextLoader] - Root WebApplicationContext: initialization completed in 2216 ms +2014-04-17 19:11:52,679 INFO [org.springframework.web.servlet.DispatcherServlet] - FrameworkServlet 'Spring Integration Rest HTTP Path Usage': initialization started +2014-04-17 19:11:52,682 INFO [org.springframework.web.context.support.XmlWebApplicationContext] - Refreshing WebApplicationContext for namespace 'Spring Integration Rest HTTP Path Usage-servlet': startup date [Thu Apr 17 19:11:52 EEST 2014]; parent: Root WebApplicationContext +2014-04-17 19:11:52,702 INFO [org.springframework.web.servlet.DispatcherServlet] - FrameworkServlet 'Spring Integration Rest HTTP Path Usage': initialization completed in 22 ms +2014-04-17 19:12:02,929 WARN [org.springframework.web.servlet.PageNotFound] - No mapping found for HTTP request with URI [/rest-http/] in DispatcherServlet with name 'Spring Integration Rest HTTP Path Usage' +2014-04-17 19:18:09,597 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - Adding {bridge:null} as a subscriber to the 'employeeSearchResponse' channel +2014-04-17 19:18:09,598 INFO [org.springframework.integration.channel.DirectChannel] - Channel 'org.springframework.web.context.WebApplicationContext:/rest-http.employeeSearchResponse' has 1 subscriber(s). +2014-04-17 19:18:09,599 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - started org.springframework.integration.endpoint.EventDrivenConsumer@61063288 +2014-04-17 19:18:09,622 WARN [org.springframework.integration.http.inbound.HttpRequestHandlingController] - failure occurred in gateway sendAndReceive +org.springframework.messaging.MessageHandlingException: org.springframework.security.access.AccessDeniedException: Access is denied + at org.springframework.integration.handler.MethodInvokingMessageProcessor.processMessage(MethodInvokingMessageProcessor.java:78) + at org.springframework.integration.handler.ServiceActivatingHandler.handleRequestMessage(ServiceActivatingHandler.java:71) + at org.springframework.integration.handler.AbstractReplyProducingMessageHandler.handleMessageInternal(AbstractReplyProducingMessageHandler.java:170) + at org.springframework.integration.handler.AbstractMessageHandler.handleMessage(AbstractMessageHandler.java:78) + at org.springframework.integration.dispatcher.AbstractDispatcher.tryOptimizedDispatch(AbstractDispatcher.java:116) + at org.springframework.integration.dispatcher.UnicastingDispatcher.doDispatch(UnicastingDispatcher.java:101) + at org.springframework.integration.dispatcher.UnicastingDispatcher.dispatch(UnicastingDispatcher.java:97) + at org.springframework.integration.channel.AbstractSubscribableChannel.doSend(AbstractSubscribableChannel.java:77) + at org.springframework.integration.channel.AbstractMessageChannel.send(AbstractMessageChannel.java:255) + at org.springframework.messaging.core.GenericMessagingTemplate.doSend(GenericMessagingTemplate.java:114) + at org.springframework.messaging.core.GenericMessagingTemplate.doSendAndReceive(GenericMessagingTemplate.java:154) + at org.springframework.messaging.core.GenericMessagingTemplate.doSendAndReceive(GenericMessagingTemplate.java:44) + at org.springframework.messaging.core.AbstractMessagingTemplate.sendAndReceive(AbstractMessagingTemplate.java:75) + at org.springframework.integration.gateway.MessagingGatewaySupport.doSendAndReceive(MessagingGatewaySupport.java:250) + at org.springframework.integration.gateway.MessagingGatewaySupport.sendAndReceiveMessage(MessagingGatewaySupport.java:224) + at org.springframework.integration.http.inbound.HttpRequestHandlingEndpointSupport.actualDoHandleRequest(HttpRequestHandlingEndpointSupport.java:505) + at org.springframework.integration.http.inbound.HttpRequestHandlingEndpointSupport.doHandleRequest(HttpRequestHandlingEndpointSupport.java:408) + at org.springframework.integration.http.inbound.HttpRequestHandlingController.handleRequest(HttpRequestHandlingController.java:150) + at org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter.handle(SimpleControllerHandlerAdapter.java:50) + at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:938) + at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:870) + at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:961) + at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:852) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:707) + at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:837) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:820) + at org.mortbay.jetty.servlet.ServletHolder.handle(ServletHolder.java:511) + at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1166) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:330) + at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:118) + at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:84) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:113) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:103) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:113) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:154) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:45) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.www.BasicAuthenticationFilter.doFilter(BasicAuthenticationFilter.java:150) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter.doFilter(DefaultLoginPageGeneratingFilter.java:155) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:199) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:110) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:87) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:192) + at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:160) + at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:344) + at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:261) + at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) + at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:88) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:108) + at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) + at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:388) + at org.mortbay.jetty.security.SecurityHandler.handle(SecurityHandler.java:216) + at org.mortbay.jetty.servlet.SessionHandler.handle(SessionHandler.java:182) + at org.mortbay.jetty.handler.ContextHandler.handle(ContextHandler.java:765) + at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:440) + at org.mortbay.jetty.handler.ContextHandlerCollection.handle(ContextHandlerCollection.java:230) + at org.mortbay.jetty.handler.HandlerCollection.handle(HandlerCollection.java:114) + at org.mortbay.jetty.handler.HandlerWrapper.handle(HandlerWrapper.java:152) + at org.mortbay.jetty.Server.handle(Server.java:326) + at org.mortbay.jetty.HttpConnection.handleRequest(HttpConnection.java:542) + at org.mortbay.jetty.HttpConnection$RequestHandler.headerComplete(HttpConnection.java:926) + at org.mortbay.jetty.HttpParser.parseNext(HttpParser.java:549) + at org.mortbay.jetty.HttpParser.parseAvailable(HttpParser.java:212) + at org.mortbay.jetty.HttpConnection.handle(HttpConnection.java:404) + at org.mortbay.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:410) + at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:582) +Caused by: org.springframework.security.access.AccessDeniedException: Access is denied + at org.springframework.security.access.vote.AffirmativeBased.decide(AffirmativeBased.java:83) + at org.springframework.security.access.intercept.AbstractSecurityInterceptor.beforeInvocation(AbstractSecurityInterceptor.java:206) + at org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor.invoke(MethodSecurityInterceptor.java:60) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:179) + at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:644) + at org.springframework.integration.samples.rest.service.EmployeeSearchService$$EnhancerBySpringCGLIB$$3f3a4466.getEmployee() + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:483) + at org.springframework.expression.spel.support.ReflectiveMethodExecutor.execute(ReflectiveMethodExecutor.java:63) + at org.springframework.expression.spel.ast.MethodReference.getValueInternal(MethodReference.java:122) + at org.springframework.expression.spel.ast.MethodReference.access$000(MethodReference.java:44) + at org.springframework.expression.spel.ast.MethodReference$MethodValueRef.getValue(MethodReference.java:258) + at org.springframework.expression.spel.ast.CompoundExpression.getValueInternal(CompoundExpression.java:84) + at org.springframework.expression.spel.ast.SpelNodeImpl.getTypedValue(SpelNodeImpl.java:114) + at org.springframework.expression.spel.standard.SpelExpression.getValue(SpelExpression.java:111) + at org.springframework.integration.util.AbstractExpressionEvaluator.evaluateExpression(AbstractExpressionEvaluator.java:159) + at org.springframework.integration.util.MessagingMethodInvokerHelper.processInternal(MessagingMethodInvokerHelper.java:268) + at org.springframework.integration.util.MessagingMethodInvokerHelper.process(MessagingMethodInvokerHelper.java:142) + at org.springframework.integration.handler.MethodInvokingMessageProcessor.processMessage(MethodInvokingMessageProcessor.java:75) + ... 75 more +2014-04-17 19:20:29,108 WARN [org.springframework.integration.http.inbound.HttpRequestHandlingController] - failure occurred in gateway sendAndReceive +org.springframework.messaging.MessageHandlingException: org.springframework.security.access.AccessDeniedException: Access is denied + at org.springframework.integration.handler.MethodInvokingMessageProcessor.processMessage(MethodInvokingMessageProcessor.java:78) + at org.springframework.integration.handler.ServiceActivatingHandler.handleRequestMessage(ServiceActivatingHandler.java:71) + at org.springframework.integration.handler.AbstractReplyProducingMessageHandler.handleMessageInternal(AbstractReplyProducingMessageHandler.java:170) + at org.springframework.integration.handler.AbstractMessageHandler.handleMessage(AbstractMessageHandler.java:78) + at org.springframework.integration.dispatcher.AbstractDispatcher.tryOptimizedDispatch(AbstractDispatcher.java:116) + at org.springframework.integration.dispatcher.UnicastingDispatcher.doDispatch(UnicastingDispatcher.java:101) + at org.springframework.integration.dispatcher.UnicastingDispatcher.dispatch(UnicastingDispatcher.java:97) + at org.springframework.integration.channel.AbstractSubscribableChannel.doSend(AbstractSubscribableChannel.java:77) + at org.springframework.integration.channel.AbstractMessageChannel.send(AbstractMessageChannel.java:255) + at org.springframework.messaging.core.GenericMessagingTemplate.doSend(GenericMessagingTemplate.java:114) + at org.springframework.messaging.core.GenericMessagingTemplate.doSendAndReceive(GenericMessagingTemplate.java:154) + at org.springframework.messaging.core.GenericMessagingTemplate.doSendAndReceive(GenericMessagingTemplate.java:44) + at org.springframework.messaging.core.AbstractMessagingTemplate.sendAndReceive(AbstractMessagingTemplate.java:75) + at org.springframework.integration.gateway.MessagingGatewaySupport.doSendAndReceive(MessagingGatewaySupport.java:250) + at org.springframework.integration.gateway.MessagingGatewaySupport.sendAndReceiveMessage(MessagingGatewaySupport.java:224) + at org.springframework.integration.http.inbound.HttpRequestHandlingEndpointSupport.actualDoHandleRequest(HttpRequestHandlingEndpointSupport.java:505) + at org.springframework.integration.http.inbound.HttpRequestHandlingEndpointSupport.doHandleRequest(HttpRequestHandlingEndpointSupport.java:408) + at org.springframework.integration.http.inbound.HttpRequestHandlingController.handleRequest(HttpRequestHandlingController.java:150) + at org.springframework.web.servlet.mvc.SimpleControllerHandlerAdapter.handle(SimpleControllerHandlerAdapter.java:50) + at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:938) + at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:870) + at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:961) + at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:852) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:707) + at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:837) + at javax.servlet.http.HttpServlet.service(HttpServlet.java:820) + at org.mortbay.jetty.servlet.ServletHolder.handle(ServletHolder.java:511) + at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1166) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:330) + at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:118) + at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:84) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:113) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:103) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:113) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:154) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:45) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.www.BasicAuthenticationFilter.doFilter(BasicAuthenticationFilter.java:150) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter.doFilter(DefaultLoginPageGeneratingFilter.java:155) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:199) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:110) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:87) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:342) + at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:192) + at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:160) + at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:344) + at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:261) + at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) + at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:88) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:108) + at org.mortbay.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1157) + at org.mortbay.jetty.servlet.ServletHandler.handle(ServletHandler.java:388) + at org.mortbay.jetty.security.SecurityHandler.handle(SecurityHandler.java:216) + at org.mortbay.jetty.servlet.SessionHandler.handle(SessionHandler.java:182) + at org.mortbay.jetty.handler.ContextHandler.handle(ContextHandler.java:765) + at org.mortbay.jetty.webapp.WebAppContext.handle(WebAppContext.java:440) + at org.mortbay.jetty.handler.ContextHandlerCollection.handle(ContextHandlerCollection.java:230) + at org.mortbay.jetty.handler.HandlerCollection.handle(HandlerCollection.java:114) + at org.mortbay.jetty.handler.HandlerWrapper.handle(HandlerWrapper.java:152) + at org.mortbay.jetty.Server.handle(Server.java:326) + at org.mortbay.jetty.HttpConnection.handleRequest(HttpConnection.java:542) + at org.mortbay.jetty.HttpConnection$RequestHandler.headerComplete(HttpConnection.java:926) + at org.mortbay.jetty.HttpParser.parseNext(HttpParser.java:549) + at org.mortbay.jetty.HttpParser.parseAvailable(HttpParser.java:212) + at org.mortbay.jetty.HttpConnection.handle(HttpConnection.java:404) + at org.mortbay.io.nio.SelectChannelEndPoint.run(SelectChannelEndPoint.java:410) + at org.mortbay.thread.QueuedThreadPool$PoolThread.run(QueuedThreadPool.java:582) +Caused by: org.springframework.security.access.AccessDeniedException: Access is denied + at org.springframework.security.access.vote.AffirmativeBased.decide(AffirmativeBased.java:83) + at org.springframework.security.access.intercept.AbstractSecurityInterceptor.beforeInvocation(AbstractSecurityInterceptor.java:206) + at org.springframework.security.access.intercept.aopalliance.MethodSecurityInterceptor.invoke(MethodSecurityInterceptor.java:60) + at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:179) + at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:644) + at org.springframework.integration.samples.rest.service.EmployeeSearchService$$EnhancerBySpringCGLIB$$3f3a4466.getEmployee() + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) + at java.lang.reflect.Method.invoke(Method.java:483) + at org.springframework.expression.spel.support.ReflectiveMethodExecutor.execute(ReflectiveMethodExecutor.java:63) + at org.springframework.expression.spel.ast.MethodReference.getValueInternal(MethodReference.java:95) + at org.springframework.expression.spel.ast.MethodReference.access$000(MethodReference.java:44) + at org.springframework.expression.spel.ast.MethodReference$MethodValueRef.getValue(MethodReference.java:258) + at org.springframework.expression.spel.ast.CompoundExpression.getValueInternal(CompoundExpression.java:84) + at org.springframework.expression.spel.ast.SpelNodeImpl.getTypedValue(SpelNodeImpl.java:114) + at org.springframework.expression.spel.standard.SpelExpression.getValue(SpelExpression.java:111) + at org.springframework.integration.util.AbstractExpressionEvaluator.evaluateExpression(AbstractExpressionEvaluator.java:159) + at org.springframework.integration.util.MessagingMethodInvokerHelper.processInternal(MessagingMethodInvokerHelper.java:268) + at org.springframework.integration.util.MessagingMethodInvokerHelper.process(MessagingMethodInvokerHelper.java:142) + at org.springframework.integration.handler.MethodInvokingMessageProcessor.processMessage(MethodInvokingMessageProcessor.java:75) + ... 75 more +2014-04-17 19:22:37,330 WARN [org.springframework.web.servlet.PageNotFound] - No mapping found for HTTP request with URI [/rest-http/services] in DispatcherServlet with name 'Spring Integration Rest HTTP Path Usage' +2014-04-17 19:22:46,728 WARN [org.springframework.web.servlet.PageNotFound] - No mapping found for HTTP request with URI [/rest-http/] in DispatcherServlet with name 'Spring Integration Rest HTTP Path Usage' +2014-04-17 19:24:05,011 INFO [org.springframework.web.context.support.XmlWebApplicationContext] - Closing WebApplicationContext for namespace 'Spring Integration Rest HTTP Path Usage-servlet': startup date [Thu Apr 17 19:11:52 EEST 2014]; parent: Root WebApplicationContext +2014-04-17 19:24:05,015 INFO [org.springframework.web.context.support.XmlWebApplicationContext] - Closing Root WebApplicationContext: startup date [Thu Apr 17 19:11:50 EEST 2014]; root of context hierarchy +2014-04-17 19:24:05,016 INFO [org.springframework.context.support.DefaultLifecycleProcessor] - Stopping beans in phase 0 +2014-04-17 19:24:05,017 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - Removing {bridge:null} as a subscriber to the 'employeeSearchResponse' channel +2014-04-17 19:24:05,017 INFO [org.springframework.integration.channel.DirectChannel] - Channel 'org.springframework.web.context.WebApplicationContext:/rest-http.employeeSearchResponse' has 0 subscriber(s). +2014-04-17 19:24:05,018 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - stopped org.springframework.integration.endpoint.EventDrivenConsumer@61063288 +2014-04-17 19:24:05,018 INFO [org.springframework.integration.http.inbound.HttpRequestHandlingController] - stopped inboundEmployeeSearchRequestGateway +2014-04-17 19:24:05,018 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - Removing {service-activator:employeeServiceActivator} as a subscriber to the 'employeeSearchRequest' channel +2014-04-17 19:24:05,019 INFO [org.springframework.integration.channel.DirectChannel] - Channel 'org.springframework.web.context.WebApplicationContext:/rest-http.employeeSearchRequest' has 0 subscriber(s). +2014-04-17 19:24:05,019 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - stopped employeeServiceActivator +2014-04-17 19:24:05,020 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - Removing {logging-channel-adapter:_org.springframework.integration.errorLogger} as a subscriber to the 'errorChannel' channel +2014-04-17 19:24:05,020 INFO [org.springframework.integration.channel.PublishSubscribeChannel] - Channel 'org.springframework.web.context.WebApplicationContext:/rest-http.errorChannel' has 0 subscriber(s). +2014-04-17 19:24:05,020 INFO [org.springframework.integration.endpoint.EventDrivenConsumer] - stopped _org.springframework.integration.errorLogger +2014-04-17 19:24:05,021 INFO [org.springframework.context.support.DefaultLifecycleProcessor] - Stopping beans in phase -2147483648 +2014-04-17 19:24:05,026 INFO [org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler] - Shutting down ExecutorService 'taskScheduler' diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index d68cc6ae5..d78a2b016 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -1,97 +1,118 @@ - - 4.0.0 - org.springframework.integration.samples - retry-and-more - 2.2.0.BUILD-SNAPSHOT - Samples (Intermediate) - Retry and More - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - - - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - org.springframework.integration - spring-integration-amqp - ${spring.integration.version} - - - org.springframework.integration - spring-integration-file - ${spring.integration.version} - - - org.springframework.integration - spring-integration-ftp - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - org.mockito - mockito-all - 1.8.5 - - - - org.springframework - spring-test - ${spring.version} - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.5 - 1.5 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2 - - ${java.main.class} - - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + retry-and-more + 2.2.0.BUILD-SNAPSHOT + Retry and More Sample + Retry and More Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration + spring-integration-stream + 4.0.0.RELEASE + compile + + + org.springframework.integration + spring-integration-ftp + 4.0.0.RELEASE + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + compile + + + org.springframework.integration + spring-integration-amqp + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + compile + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + org.springframework.integration + spring-integration-file + 4.0.0.RELEASE + compile + + diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index f32686516..fbd7e1b47 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -1,102 +1,106 @@ - - 4.0.0 - - org.springframework.integration.samples - splitter-aggregator-reaper - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Intermediate) - Splitter-Aggregator-Reaper - http://www.springsource.org/spring-integration - - A demonstration of implementing the Splitter and Aggregator Enterprise - Integration Patterns (EIP) together - - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.16 - 4.10 - 1 - 4.0.3.RELEASE - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.splitteraggregator.Main - - - - - - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - javax.inject - javax.inject - ${inject.version} - - - - - - log4j - log4j - ${log4j.version} - - - - - - junit - junit - ${junit.version} - test - - - - org.springframework - spring-test - ${spring.version} - test - - + + + 4.0.0 + org.springframework.integration.samples + splitter-aggregator-reaper + 2.2.0.BUILD-SNAPSHOT + Splitter-Aggregator-Reaper Sample + Splitter-Aggregator-Reaper Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + javax.inject + javax.inject + 1 + compile + + + org.springframework.integration + spring-integration-core + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java b/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java index 215475718..26ebd114a 100644 --- a/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java +++ b/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,6 +32,7 @@ * * @author Christopher Hunt * @author Gunnar Hillert + * @author Artem Bilan * */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 1267c77e3..45b8dce0d 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -1,111 +1,106 @@ - - 4.0.0 - - org.springframework.integration.samples - derby-stored-procedures - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Intermediate) - Stored Procedures Derby - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-jdbc - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - - org.apache.derby - derby - 10.9.1.0 - - - + + + 4.0.0 + org.springframework.integration.samples + stored-procedures-derby + 2.2.0.BUILD-SNAPSHOT + Derby Stored Procedures Sample + Derby Stored Procedures Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.apache.derby + derby + 10.10.1.1 + compile + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jdbc + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/Main.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java similarity index 93% rename from intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/Main.java rename to intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index 0d0689620..f42c169f3 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/Main.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration; +package org.springframework.integration.samples.storedprocedure; import java.util.List; import java.util.Scanner; @@ -22,8 +22,8 @@ import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.model.CoffeeBeverage; -import org.springframework.integration.service.CoffeeService; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.service.CoffeeService; /** diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/jdbc/storedproc/derby/DerbyStoredProcedures.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/jdbc/storedproc/derby/DerbyStoredProcedures.java similarity index 95% rename from intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/jdbc/storedproc/derby/DerbyStoredProcedures.java rename to intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/jdbc/storedproc/derby/DerbyStoredProcedures.java index f44180d35..93734cf31 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/jdbc/storedproc/derby/DerbyStoredProcedures.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/jdbc/storedproc/derby/DerbyStoredProcedures.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.jdbc.storedproc.derby; +package org.springframework.integration.samples.storedprocedure.jdbc.storedproc.derby; import java.sql.Connection; import java.sql.DriverManager; diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/model/CoffeeBeverage.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java similarity index 97% rename from intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/model/CoffeeBeverage.java rename to intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java index 744404725..7973d889d 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/model/CoffeeBeverage.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.model; +package org.springframework.integration.samples.storedprocedure.model; /** * diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/service/CoffeeService.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java similarity index 89% rename from intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/service/CoffeeService.java rename to intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java index efbb978b7..4ee596f42 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/service/CoffeeService.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.service; +package org.springframework.integration.samples.storedprocedure.service; import java.util.List; import org.springframework.integration.annotation.Payload; -import org.springframework.integration.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; /** diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java similarity index 86% rename from intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java rename to intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java index 582d55597..976b41514 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java @@ -10,12 +10,12 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.springframework.integration.support; +package org.springframework.integration.samples.storedprocedure.support; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.integration.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; import org.springframework.jdbc.core.RowMapper; /** diff --git a/intermediate/stored-procedures-derby/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/intermediate/stored-procedures-derby/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index 6bfab703f..9b37e3862 100644 --- a/intermediate/stored-procedures-derby/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/intermediate/stored-procedures-derby/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -20,7 +20,7 @@ + service-interface="org.springframework.integration.samples.storedprocedure.service.CoffeeService"> @@ -35,7 +35,7 @@ - + diff --git a/intermediate/stored-procedures-derby/src/main/resources/derby-stored-procedures.sql b/intermediate/stored-procedures-derby/src/main/resources/derby-stored-procedures.sql index f92324086..d3eccb5c3 100644 --- a/intermediate/stored-procedures-derby/src/main/resources/derby-stored-procedures.sql +++ b/intermediate/stored-procedures-derby/src/main/resources/derby-stored-procedures.sql @@ -9,6 +9,6 @@ INSERT INTO COFFEE_BEVERAGES (ID, COFFEE_NAME, COFFEE_DESCRIPTION) VALUES (2, 'C INSERT INTO COFFEE_BEVERAGES (ID, COFFEE_NAME, COFFEE_DESCRIPTION) VALUES (3, 'Mocha', 'Mmmmh, chocolate.'); INSERT INTO COFFEE_BEVERAGES (ID, COFFEE_NAME, COFFEE_DESCRIPTION) VALUES (4, 'Latte', 'If you are more into milk than into foam.'); -CREATE PROCEDURE FIND_COFFEE( IN COFFEE_NAME INTEGER, OUT COFFEE_DESCRIPTION VARCHAR(100)) PARAMETER STYLE JAVA LANGUAGE JAVA EXTERNAL NAME 'org.springframework.integration.jdbc.storedproc.derby.DerbyStoredProcedures.findCoffee'; -CREATE PROCEDURE FIND_ALL_COFFEE_BEVERAGES() PARAMETER STYLE JAVA LANGUAGE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 1 EXTERNAL NAME 'org.springframework.integration.jdbc.storedproc.derby.DerbyStoredProcedures.findAllCoffeeBeverages'; +CREATE PROCEDURE FIND_COFFEE( IN COFFEE_NAME INTEGER, OUT COFFEE_DESCRIPTION VARCHAR(100)) PARAMETER STYLE JAVA LANGUAGE JAVA EXTERNAL NAME 'org.springframework.integration.samples.storedprocedure.jdbc.storedproc.derby.DerbyStoredProcedures.findCoffee'; +CREATE PROCEDURE FIND_ALL_COFFEE_BEVERAGES() PARAMETER STYLE JAVA LANGUAGE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 1 EXTERNAL NAME 'org.springframework.integration.samples.storedprocedure.jdbc.storedproc.derby.DerbyStoredProcedures.findAllCoffeeBeverages'; diff --git a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindAllTest.java b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindAllTest.java index 4ed29597c..4d67eb01e 100644 --- a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindAllTest.java +++ b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindAllTest.java @@ -16,14 +16,16 @@ package org.springframework.integration; +import static org.junit.Assert.assertTrue; + import java.util.List; import org.junit.Test; + import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.model.CoffeeBeverage; -import org.springframework.integration.service.CoffeeService; -import static org.junit.Assert.assertTrue; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.service.CoffeeService; /** * @author Gunnar Hillert diff --git a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindCoffeeTest.java b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindCoffeeTest.java index b3a116ccf..a5816c0c9 100644 --- a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindCoffeeTest.java +++ b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindCoffeeTest.java @@ -16,11 +16,13 @@ package org.springframework.integration; +import static org.junit.Assert.assertEquals; + import org.junit.Test; + import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.service.CoffeeService; -import static org.junit.Assert.assertEquals; +import org.springframework.integration.samples.storedprocedure.service.CoffeeService; /** * @author Gunnar Hillert diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index e0f63f77c..506bb3cc3 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -1,118 +1,112 @@ - - 4.0.0 - - org.springframework.integration.samples.samples - ms-stored-procedures - - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Intermediate) - Stored Procedures Microsoft - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.samples.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-jdbc - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - - - - net.sourceforge.jtds - jtds - 1.2.6 - - - c3p0 - c3p0 - 0.9.1.2 - - + + + 4.0.0 + org.springframework.integration.samples + stored-procedures-ms + 2.2.0.BUILD-SNAPSHOT + MS SQLServer Stored Procedures Sample + MS SQLServer Stored Procedures Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + c3p0 + c3p0 + 0.9.1.2 + compile + + + net.sourceforge.jtds + jtds + 1.2.6 + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jdbc + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/Main.java b/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java similarity index 95% rename from intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/Main.java rename to intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index fccdbe7b1..ecb5468f7 100644 --- a/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/Main.java +++ b/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.samples; +package org.springframework.integration.samples.storedprocedure; import java.util.Scanner; @@ -21,7 +21,7 @@ import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.samples.service.StringConversionService; +import org.springframework.integration.samples.storedprocedure.service.StringConversionService; /** diff --git a/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/service/StringConversionService.java b/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java similarity index 93% rename from intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/service/StringConversionService.java rename to intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java index ba089dd3f..452967570 100644 --- a/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/service/StringConversionService.java +++ b/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.samples.service; +package org.springframework.integration.samples.storedprocedure.service; /** diff --git a/intermediate/stored-procedures-ms/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/intermediate/stored-procedures-ms/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index 3d67ea5c0..fa298ff5b 100644 --- a/intermediate/stored-procedures-ms/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/intermediate/stored-procedures-ms/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -20,7 +20,7 @@ + service-interface="org.springframework.integration.samples.storedprocedure.service.StringConversionService"> diff --git a/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java b/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java index 385206e3b..9286a3ec1 100644 --- a/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java +++ b/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.samples.service.StringConversionService; +import org.springframework.integration.samples.storedprocedure.service.StringConversionService; /** * Verify that the Spring Integration Application Context starts successfully. diff --git a/intermediate/stored-procedures-oracle/README.md b/intermediate/stored-procedures-oracle/README.md index 9876b001a..9c5417eed 100644 --- a/intermediate/stored-procedures-oracle/README.md +++ b/intermediate/stored-procedures-oracle/README.md @@ -107,9 +107,9 @@ END; ```SQL create or replace FUNCTION GET_COOL_NUMBER - RETURN NUMBER + RETURN NUMBER IS cool_number NUMBER(11,2); -BEGIN +BEGIN cool_number := 12345; RETURN cool_number; END; @@ -124,15 +124,15 @@ END; You should see the following output: - 16:05:19.556 INFO [main][org.springframework.integration.Main] + 16:05:19.556 INFO [main][org.springframework.integration.samples.storedprocedure.Main] ========================================================= - + Welcome to Spring Integration's Stored Procedure/Function Sample for Oracle - + For more information please visit: http://www.springsource.org/spring-integration - + ========================================================= Please enter a choice and press : 1. Execute Sample 1 (Capitalize String) @@ -142,9 +142,9 @@ You should see the following output: Select **Opion 1**. ========================================================= - + Please press 'q + Enter' to quit the application. - + ========================================================= Please enter a string and press : hello world Converting String to Uppcase using Stored Procedure... @@ -190,10 +190,10 @@ end; ``` ```SQL -create or replace +create or replace FUNCTION find_all_coffee_beverages return types.cursortype AS - l_cursor types.cursorType; + l_cursor types.cursorType; BEGIN OPEN l_cursor FOR SELECT "ID", "COFFEE_NAME", "COFFEE_DESCRIPTION" FROM "COFFEE_BEVERAGES"; RETURN l_cursor; @@ -202,7 +202,7 @@ END; #### Find Specific Coffee Beverage ```SQL -create or replace +create or replace FUNCTION find_coffee(coffee_id IN integer) RETURN VARCHAR2 is description VARCHAR2(1000); begin @@ -211,7 +211,7 @@ begin end; ``` ### Execute the Sample - + * running the "Main" class from within STS (Right-click on Main class --> Run As --> Java Application) * or from the command line: - mvn package @@ -219,15 +219,15 @@ end; You should see the following output: - 16:05:19.556 INFO [main][org.springframework.integration.Main] + 16:05:19.556 INFO [main][org.springframework.integration.samples.storedprocedure.Main] ========================================================= - + Welcome to Spring Integration's Stored Procedure/Function Sample for Oracle - + For more information please visit: http://www.springsource.org/spring-integration - + ========================================================= Please enter a choice and press : 1. Execute Sample 1 (Capitalize String) diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 4b21e4f76..851da6ce2 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -1,115 +1,106 @@ - - 4.0.0 - - org.springframework.integration.samples - oracle-stored-procedures - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Intermediate) - Stored Procedures Oracle - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - code.lds.org - https://code.lds.org/nexus/content/groups/main-repo - - - - - - - maven-eclipse-plugin - 2.8 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2 - - org.springframework.integration.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - - org.springframework.integration - spring-integration-jdbc - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - - com.oracle - ojdbc6 - 11.2.0.3 - - - + + + 4.0.0 + org.springframework.integration.samples + stored-procedures-oracle + 2.2.0.BUILD-SNAPSHOT + Oracle Stored Procedures Sample + Oracle Stored Procedures Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jdbc + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + com.oracle + ojdbc6 + 11.2.0.3 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/Main.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java similarity index 94% rename from intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/Main.java rename to intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index eade49371..13366645b 100644 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/Main.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -13,16 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration; +package org.springframework.integration.samples.storedprocedure; import java.util.List; import java.util.Scanner; import org.apache.log4j.Logger; + import org.springframework.context.support.GenericXmlApplicationContext; -import org.springframework.integration.model.CoffeeBeverage; -import org.springframework.integration.service.CoffeeService; -import org.springframework.integration.service.StringConversionService; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.service.CoffeeService; +import org.springframework.integration.samples.storedprocedure.service.StringConversionService; /** diff --git a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/model/CoffeeBeverage.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java similarity index 97% rename from intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/model/CoffeeBeverage.java rename to intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java index b752537fb..21141b70d 100644 --- a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/model/CoffeeBeverage.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.model; +package org.springframework.integration.samples.storedprocedure.model; /** * diff --git a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/service/CoffeeService.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java similarity index 89% rename from intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/service/CoffeeService.java rename to intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java index da648bd89..145702813 100644 --- a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/service/CoffeeService.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.service; +package org.springframework.integration.samples.storedprocedure.service; import java.util.List; import org.springframework.integration.annotation.Payload; -import org.springframework.integration.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; import org.springframework.transaction.annotation.Transactional; diff --git a/basic/amqp/src/main/java/org/springframework/integration/service/StringConversionService.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java similarity index 90% rename from basic/amqp/src/main/java/org/springframework/integration/service/StringConversionService.java rename to intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java index c0434b24a..e18be7202 100644 --- a/basic/amqp/src/main/java/org/springframework/integration/service/StringConversionService.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/service/StringConversionService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.service; +package org.springframework.integration.samples.storedprocedure.service; /** * Provides string manipulation services. @@ -28,4 +28,6 @@ public interface StringConversionService { */ String convertToUpperCase(String stringToConvert); + Integer getNumber(); + } diff --git a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java similarity index 86% rename from intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java rename to intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java index 3f246061d..bd50c2490 100644 --- a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java @@ -10,12 +10,12 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.springframework.integration.support; +package org.springframework.integration.samples.storedprocedure.support; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.integration.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; import org.springframework.jdbc.core.RowMapper; /** diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/StringConversionService.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/StringConversionService.java deleted file mode 100644 index aba92fede..000000000 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/StringConversionService.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.integration.service; - -import org.springframework.integration.annotation.Payload; - -import java.util.Map; - -/** - * Provides string manipulation services. - */ -public interface StringConversionService { - - /** - * Converts a String to Upper Case. - * - * @param stringToConvert The string to convert to upper case - * @return The converted upper case string. - */ - String convertToUpperCase(String stringToConvert); - - Integer getNumber(); - -} diff --git a/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample1-context.xml b/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample1-context.xml index c7decc010..fa30f6a78 100644 --- a/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample1-context.xml +++ b/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample1-context.xml @@ -14,7 +14,7 @@ + service-interface="org.springframework.integration.samples.storedprocedure.service.StringConversionService"> diff --git a/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample2-context.xml b/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample2-context.xml index 54cc1dcae..b996a0a56 100644 --- a/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample2-context.xml +++ b/intermediate/stored-procedures-oracle/src/main/resources/META-INF/spring/integration/spring-integration-sample2-context.xml @@ -20,7 +20,7 @@ + service-interface="org.springframework.integration.samples.storedprocedure.service.CoffeeService"> @@ -39,18 +39,20 @@ request-channel="findAllProcedureRequestChannel" is-function="true" stored-procedure-name="FIND_ALL_COFFEE_BEVERAGES" expect-single-result="true" > - + - + + + diff --git a/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java b/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java index ec4af2fc5..639cda36b 100644 --- a/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java +++ b/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java @@ -21,7 +21,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.service.StringConversionService; +import org.springframework.integration.samples.storedprocedure.service.StringConversionService; /** * Verify that the Spring Integration Application Context starts successfully. diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 027bdafb9..f4ac1d38e 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -1,112 +1,118 @@ - - 4.0.0 - - org.springframework.integration.samples - postgresql-stored-procedures - 2.2.0.BUILD-SNAPSHOT - jar - - Samples (Intermediate) - Stored Procedures PostgreSQL - http://www.springsource.org/spring-integration - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - - - - - maven-eclipse-plugin - 2.9 - - - org.springframework.ide.eclipse.core.springnature - - - org.springframework.ide.eclipse.core.springbuilder - - true - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - org.springframework.integration.Main - - - - - - - - - - - junit - junit - ${junit.version} - test - - - - - - org.springframework.integration - spring-integration-jdbc - ${spring.integration.version} - - - - - - log4j - log4j - ${log4j.version} - - - - - - postgresql - postgresql - 9.1-901-1.jdbc4 - - - - commons-dbcp - commons-dbcp - 1.4 - - + + + 4.0.0 + org.springframework.integration.samples + stored-procedures-postgresql + 2.2.0.BUILD-SNAPSHOT + PostgreSQL Stored Procedures Sample + PostgreSQL Stored Procedures Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jdbc + 4.0.0.RELEASE + compile + + + commons-pool + commons-pool + 1.5.4 + compile + + + commons-dbcp + commons-dbcp + 1.2.2 + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + postgresql + postgresql + 9.1-901-1.jdbc4 + compile + + diff --git a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/Main.java b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java similarity index 92% rename from intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/Main.java rename to intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index a0503f980..f2fd99540 100644 --- a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/Main.java +++ b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration; +package org.springframework.integration.samples.storedprocedure; import java.util.List; import java.util.Scanner; import org.apache.log4j.Logger; + import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; - -import org.springframework.integration.model.CoffeeBeverage; -import org.springframework.integration.service.CoffeeService; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.service.CoffeeService; /** diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/model/CoffeeBeverage.java b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java similarity index 97% rename from intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/model/CoffeeBeverage.java rename to intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java index b752537fb..21141b70d 100644 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/model/CoffeeBeverage.java +++ b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/model/CoffeeBeverage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.model; +package org.springframework.integration.samples.storedprocedure.model; /** * diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/CoffeeService.java b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java similarity index 89% rename from intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/CoffeeService.java rename to intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java index da648bd89..145702813 100644 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/service/CoffeeService.java +++ b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/service/CoffeeService.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.service; +package org.springframework.integration.samples.storedprocedure.service; import java.util.List; import org.springframework.integration.annotation.Payload; -import org.springframework.integration.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; import org.springframework.transaction.annotation.Transactional; diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java similarity index 86% rename from intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java rename to intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java index 3f246061d..bd50c2490 100644 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/support/CoffeBeverageMapper.java +++ b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/support/CoffeBeverageMapper.java @@ -10,12 +10,12 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.springframework.integration.support; +package org.springframework.integration.samples.storedprocedure.support; import java.sql.ResultSet; import java.sql.SQLException; -import org.springframework.integration.model.CoffeeBeverage; +import org.springframework.integration.samples.storedprocedure.model.CoffeeBeverage; import org.springframework.jdbc.core.RowMapper; /** diff --git a/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index f8e0c2da3..90d33564d 100644 --- a/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/intermediate/stored-procedures-postgresql/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -7,7 +7,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/spring-integration-jdbc.xsd + http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"> @@ -27,7 +27,7 @@ + service-interface="org.springframework.integration.samples.storedprocedure.service.CoffeeService"> @@ -46,16 +46,18 @@ request-channel="findAllProcedureRequestChannel" expect-single-result="true" stored-procedure-name="FIND_ALL_COFFEE_BEVERAGES"> + row-mapper="coffeBeverageMapper" /> - + + + diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index dad27d6e6..052fabd77 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -1,79 +1,106 @@ - - 4.0.0 - org.springframework.integration.samples - tcp-client-server-multiplex - 2.2.0.BUILD-SNAPSHOT - Samples (Intermediate) - TCP Client Server Multiplexing Sample - jar - - - 2.2.1 - - - - UTF-8 - 4.0.3.RELEASE - 4.0.0.RC1 - 1.2.17 - 4.10 - - - - org.springframework.integration - spring-integration-ip - ${spring.integration.version} - - - org.springframework.integration - spring-integration-test - ${spring.integration.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-test - ${spring.version} - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + tcp-client-server-multiplex + 2.2.0.BUILD-SNAPSHOT + TCP Client Server Multiplexing Sample + TCP Client Server Multiplexing Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-test + 4.0.0.RELEASE + test + + + log4j + log4j + 1.2.17 + compile + + + org.springframework.integration + spring-integration-ip + 4.0.0.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index bd25a77d0..ed6e1d08c 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -1,92 +1,112 @@ - - 4.0.0 - org.springframework.integration.samples - travel - Samples (Intermediate) - Travel Services - 2.2.0.BUILD-SNAPSHOT - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 1.2.17 - 4.10 - 4.0.3.RELEASE - org.springframework.integration.samples.travel.Main - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - org.springframework.integration - spring-integration-ws - ${spring.integration.version} - - - org.springframework.integration - spring-integration-http - ${spring.integration.version} - - - org.springframework - spring-web - ${spring.version} - - - log4j - log4j - ${log4j.version} - - - - junit - junit - ${junit.version} - test - - - org.springframework - spring-test - ${spring.version} - test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - ${java.main.class} - - - - - - - repo.spring.io.milestone - SpringSource Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + + 4.0.0 + org.springframework.integration.samples + travel + 2.2.0.BUILD-SNAPSHOT + Travel Services Sample + Travel Services Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-http + 4.0.0.RELEASE + compile + + + org.springframework.integration + spring-integration-ws + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.springframework + spring-web + 4.0.3.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml old mode 100755 new mode 100644 index 96cd3bf6a..2726ed1d4 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -1,107 +1,112 @@ - - 4.0.0 - org.springframework.integration.samples - tx-synch - 2.2.0.BUILD-SNAPSHOT - Samples (Intermediate) - Transaction Synchronization - jar - - - 2.2.1 - - - - UTF-8 - 4.0.0.RC1 - 4.0.3.RELEASE - 1.2.17 - 4.10 - - - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - org.springframework.integration - spring-integration-jdbc - ${spring.integration.version} - - - org.springframework.integration - spring-integration-file - ${spring.integration.version} - - - org.springframework.integration - spring-integration-ftp - ${spring.integration.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - com.h2database - h2 - 1.3.166 - - - log4j - log4j - ${log4j.version} - - - org.mockito - mockito-all - 1.8.5 - - - - org.springframework - spring-test - ${spring.version} - - - junit - junit - ${junit.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.6 - 1.6 - -Xlint:all - true - true - - - - org.codehaus.mojo - exec-maven-plugin - 1.2 - - org.springframework.integration.samples.advice.TransactionSynchronizationDemo - - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - + + 4.0.0 + org.springframework.integration.samples + tx-synch + 2.2.0.BUILD-SNAPSHOT + Transaction Synchronization Sample + Transaction Synchronization Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@gopivotal.com + + project lead + + + + markfisher + Mark Fisher + mfisher@gopivotal.com + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@gopivotal.com + + + abilan + Artem Bilan + abilan@gopivotal.com + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + com.h2database + h2 + 1.3.175 + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework.integration + spring-integration-jdbc + 4.0.0.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework + spring-test + 4.0.3.RELEASE + test + + + org.springframework.integration + spring-integration-file + 4.0.0.RELEASE + compile + + diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 86208e71b..000000000 --- a/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - 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 - - - - Bamboo - https://build.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 - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..12f6d75f1 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,16 @@ +rootProject.name = 'spring-integration-samples' + +['advanced', 'applications', 'basic', 'intermediate', 'dsl'].each { + def projectDir = new File(rootDir, it) + include ":${it}" + projectDir.eachDir { dir -> + include ":${dir.name}" + project(":${dir.name}").projectDir = new File(projectDir.absolutePath, dir.name) + if ('cafe' == dir.name) { + dir.eachDir { cafe -> + include ":${cafe.name}" + project(":${cafe.name}").projectDir = new File(dir.absolutePath, cafe.name) + } + } + } +} From 4b9d65f021119d419b35008b013f2cef5093c508 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 29 May 2014 08:38:55 +0300 Subject: [PATCH 016/356] Increase `FileProcessingTest` timeouts --- .../samples/fileprocessing/FileProcessingTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java b/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java index 462e22ae4..2fe37616d 100644 --- a/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java +++ b/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java @@ -1,5 +1,5 @@ /** - * + * */ package org.springframework.integration.samples.fileprocessing; @@ -21,7 +21,7 @@ public class FileProcessingTest { private int fileCount = 5; private Logger logger = Logger.getLogger(FileProcessingTest.class); - + @Before public void createDirectory(){ File directory = new File("input"); @@ -32,7 +32,7 @@ public void createDirectory(){ } @Test - public void testSequentialFileProcessing() throws Exception { + public void testSequentialFileProcessing() throws Exception { logger.info("\n\n#### Starting Sequential processing test ####"); logger.info("Populating directory with files"); for (int i = 0; i < fileCount; i++) { @@ -42,12 +42,12 @@ public void testSequentialFileProcessing() throws Exception { out.close(); } logger.info("Populated directory with files"); - Thread.sleep(2000); + Thread.sleep(5000); logger.info("Starting Spring Integration Sequential File processing"); ApplicationContext ac = new ClassPathXmlApplicationContext("META-INF/spring/integration/sequentialFileProcessing-config.xml"); PollableChannel filesOutChannel = ac.getBean("filesOutChannel", PollableChannel.class); for (int i = 0; i < fileCount; i++) { - logger.info("Finished processing " + filesOutChannel.receive(10000).getPayload()); + logger.info("Finished processing " + filesOutChannel.receive(20000).getPayload()); } } @Test From 3b12f7eada120c2bc9f70ce5fe07a2e09e9e747a Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 29 May 2014 09:17:47 +0300 Subject: [PATCH 017/356] `AC.close()` in file and ftp tests --- .../ftp/FtpOutboundChannelAdapterSample.java | 2 +- .../integration/samples/mongodb/util/DemoUtils.java | 5 +++-- .../samples/fileprocessing/FileProcessingTest.java | 13 ++++++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java index 4e5d17461..19cd4b1b3 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java @@ -75,7 +75,7 @@ public void runDemo() throws Exception{ assertTrue(new File(TestSuite.FTP_ROOT_DIR + File.separator + "b.txt").exists()); LOGGER.info("Successfully transfered file 'a.txt' and 'b.txt' to a remote FTP location."); - + ctx.close(); } @After diff --git a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java index 1150977cc..5ad7ff279 100644 --- a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java +++ b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java @@ -15,11 +15,12 @@ */ package org.springframework.integration.samples.mongodb.util; +import com.mongodb.MongoClient; + import org.springframework.data.mongodb.MongoDbFactory; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.SimpleMongoDbFactory; -import com.mongodb.Mongo; /** * * @author Oleg Zhurakousky @@ -27,7 +28,7 @@ public class DemoUtils { public static MongoDbFactory prepareMongoFactory(String... additionalCollectionToDrop) throws Exception{ - MongoDbFactory mongoDbFactory = new SimpleMongoDbFactory(new Mongo(), "test"); + MongoDbFactory mongoDbFactory = new SimpleMongoDbFactory(new MongoClient(), "test"); MongoTemplate template = new MongoTemplate(mongoDbFactory); template.dropCollection("messages"); template.dropCollection("data"); diff --git a/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java b/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java index 2fe37616d..6f20ca739 100644 --- a/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java +++ b/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java @@ -10,7 +10,8 @@ import org.apache.log4j.Logger; import org.junit.Before; import org.junit.Test; -import org.springframework.context.ApplicationContext; + +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.messaging.PollableChannel; @@ -42,13 +43,14 @@ public void testSequentialFileProcessing() throws Exception { out.close(); } logger.info("Populated directory with files"); - Thread.sleep(5000); + Thread.sleep(2000); logger.info("Starting Spring Integration Sequential File processing"); - ApplicationContext ac = new ClassPathXmlApplicationContext("META-INF/spring/integration/sequentialFileProcessing-config.xml"); + ConfigurableApplicationContext ac = new ClassPathXmlApplicationContext("META-INF/spring/integration/sequentialFileProcessing-config.xml"); PollableChannel filesOutChannel = ac.getBean("filesOutChannel", PollableChannel.class); for (int i = 0; i < fileCount; i++) { - logger.info("Finished processing " + filesOutChannel.receive(20000).getPayload()); + logger.info("Finished processing " + filesOutChannel.receive(10000).getPayload()); } + ac.stop(); } @Test public void testConcurrentFileProcessing() throws Exception { @@ -63,10 +65,11 @@ public void testConcurrentFileProcessing() throws Exception { logger.info("Populated directory with files"); Thread.sleep(2000); logger.info("Starting Spring Integration Sequential File processing"); - ApplicationContext ac = new ClassPathXmlApplicationContext("/META-INF/spring/integration/concurrentFileProcessing-config.xml"); + ConfigurableApplicationContext ac = new ClassPathXmlApplicationContext("/META-INF/spring/integration/concurrentFileProcessing-config.xml"); PollableChannel filesOutChannel = ac.getBean("filesOutChannel", PollableChannel.class); for (int i = 0; i < fileCount; i++) { logger.info("Finished processing " + filesOutChannel.receive(10000).getPayload()); } + ac.stop(); } } From 95d8fc7d99c52e8224e65144d997a8e88a66b5a8 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 29 May 2014 09:28:34 +0300 Subject: [PATCH 018/356] Fix `FileProcessingTest` configs `Caused by: org.springframework.integration.MessageDispatchingException: Dispatcher has no subscribers` --- .../concurrentFileProcessing-config.xml | 17 +++++++++-------- .../sequentialFileProcessing-config.xml | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/intermediate/file-processing/src/main/resources/META-INF/spring/integration/concurrentFileProcessing-config.xml b/intermediate/file-processing/src/main/resources/META-INF/spring/integration/concurrentFileProcessing-config.xml index 4d73df8ce..105f2c7fb 100644 --- a/intermediate/file-processing/src/main/resources/META-INF/spring/integration/concurrentFileProcessing-config.xml +++ b/intermediate/file-processing/src/main/resources/META-INF/spring/integration/concurrentFileProcessing-config.xml @@ -9,19 +9,20 @@ xmlns:int-file="http://www.springframework.org/schema/integration/file" xmlns:task="http://www.springframework.org/schema/task"> - - - - - + - + + + + + + - + diff --git a/intermediate/file-processing/src/main/resources/META-INF/spring/integration/sequentialFileProcessing-config.xml b/intermediate/file-processing/src/main/resources/META-INF/spring/integration/sequentialFileProcessing-config.xml index 82792b1f8..e04e74baf 100644 --- a/intermediate/file-processing/src/main/resources/META-INF/spring/integration/sequentialFileProcessing-config.xml +++ b/intermediate/file-processing/src/main/resources/META-INF/spring/integration/sequentialFileProcessing-config.xml @@ -9,18 +9,19 @@ xmlns:int-file="http://www.springframework.org/schema/integration/file" xmlns:task="http://www.springframework.org/schema/task"> - - - - - + - + + + + + + - + From cc07c37e7a0495235e679988a0eb192c3cea633a Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 29 May 2014 08:52:40 -0400 Subject: [PATCH 019/356] Add Eclipse bin/ Directory to .gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b8cceec8b..1b7197835 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ application.log application.log* target/ +bin/ log.roo .project .classpath @@ -16,4 +17,4 @@ activemq-data /.gradle -build/ \ No newline at end of file +build/ From 4c1f7d452c3d5af0b950ee22defe267bab869f8b Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Sun, 15 Jun 2014 09:52:11 -0400 Subject: [PATCH 020/356] INTSAMPLES-130 Fix Eclipse WTP for Web Samples JIRA: https://jira.spring.io/browse/INTSAMPLES-130 Enable `Run As | Run on Server ...` when using eclipse. The wtp config was lost when the samples were converted to gradle. Upgrade to SI-4.0.2 and Boot 1.1.0.RELEASE Polishing according upgrading --- build.gradle | 8 +++++++- .../samples/si4demo/annotations/Application.java | 3 ++- .../integration/samples/si4demo/dsl/Application.java | 3 ++- gradle.properties | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 9e4db1cd7..3df93cba7 100644 --- a/build.gradle +++ b/build.gradle @@ -186,7 +186,7 @@ subprojects { subproject -> postgresVersion = '9.1-901-1.jdbc4' subethasmtpVersion = '1.2' slf4jVersion = '1.7.6' - springIntegrationVersion = '4.0.1.RELEASE' + springIntegrationVersion = '4.0.2.RELEASE' springIntegrationDslVersion = '1.0.0.M1' springVersion = '4.0.5.RELEASE' springSecurityVersion = '3.2.4.RELEASE' @@ -351,6 +351,7 @@ project('loanshark') { description = 'Loan Shark Sample' apply plugin: 'jetty' + apply plugin: 'eclipse-wtp' dependencies { compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion" @@ -473,6 +474,7 @@ project('http') { apply plugin: 'application' apply plugin: 'jetty' + apply plugin: 'eclipse-wtp' mainClassName = 'org.springframework.integration.samples.http.HttpClientDemo' @@ -717,6 +719,7 @@ project('ws-inbound-gateway') { description = 'WS Inbound Gateway Sample' apply plugin: 'jetty' + apply plugin: 'eclipse-wtp' dependencies { compile "org.springframework.integration:spring-integration-xml:$springIntegrationVersion" @@ -828,6 +831,7 @@ project('monitoring') { apply plugin: 'jetty' apply plugin: 'application' + apply plugin: 'eclipse-wtp' mainClassName = 'org.springintegration.SpringIntegrationTest' @@ -844,6 +848,7 @@ project('multipart-http') { description = 'HTTP Multipart Demo' apply plugin: 'jetty' + apply plugin: 'eclipse-wtp' dependencies { compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" @@ -858,6 +863,7 @@ project('rest-http') { description = 'Spring Integration Rest HTTP Path Usage Demo' apply plugin: 'jetty' + apply plugin: 'eclipse-wtp' dependencies { compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion" diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java index 93c6ef323..85088e8f3 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java @@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.social.TwitterAutoConfiguration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -63,7 +64,7 @@ */ @Configuration @ComponentScan -@EnableAutoConfiguration +@EnableAutoConfiguration(exclude = TwitterAutoConfiguration.class) public class Application { public static void main(String[] args) throws Exception { diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java index 99716c9c2..a3d495933 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java @@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.social.TwitterAutoConfiguration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -69,7 +70,7 @@ @Configuration @ComponentScan @IntegrationComponentScan -@EnableAutoConfiguration +@EnableAutoConfiguration(exclude = TwitterAutoConfiguration.class) public class Application { public static void main(String[] args) throws Exception { diff --git a/gradle.properties b/gradle.properties index ddf3be4ea..896b55a0f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ version=2.2.0.BUILD-SNAPSHOT -springBootVersion=1.1.0.M2 +springBootVersion=1.1.0.RELEASE From 53dfc4914f4eb5f16e9fd984c37d8d13bd4ef3b5 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 19 Jun 2014 16:18:23 +0300 Subject: [PATCH 021/356] Upgrade to SI Java DSL M2 --- build.gradle | 2 +- .../integration/samples/si4demo/dsl/Application.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3df93cba7..ebcd8f126 100644 --- a/build.gradle +++ b/build.gradle @@ -187,7 +187,7 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.6' springIntegrationVersion = '4.0.2.RELEASE' - springIntegrationDslVersion = '1.0.0.M1' + springIntegrationDslVersion = '1.0.0.M2' springVersion = '4.0.5.RELEASE' springSecurityVersion = '3.2.4.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java index a3d495933..e64c84f36 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java @@ -25,6 +25,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; import org.springframework.core.env.Environment; import org.springframework.http.HttpMethod; import org.springframework.integration.annotation.IntegrationComponentScan; @@ -123,6 +124,7 @@ public MessageChannel requestChannel() { } @Bean + @DependsOn("errorFlow") public IntegrationFlow flow() { return IntegrationFlows.from("requestChannel") .transform(new ObjectToStringTransformer()) From 95ec35c7681ee7f58cf35acd0698c0b674ea848f Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 23 Jun 2014 14:20:44 +0300 Subject: [PATCH 022/356] INTSAMPLES-131: Fix `README.md` for Gradle JIRA: https://jira.spring.io/browse/INTSAMPLES-131 INTSAMPLES-131: PR comments --- applications/cafe-scripted/README.md | 8 +++----- applications/loan-broker/README.md | 8 ++++---- basic/amqp/README.md | 7 +++---- basic/enricher/README.md | 4 ++-- basic/ftp/README.md | 2 +- basic/helloworld/README.md | 10 ++++++---- basic/http/README.md | 20 ++++++++++--------- basic/jdbc/README.md | 6 +++--- basic/jms/README.md | 7 ++++--- basic/jpa/README.md | 7 ++++--- basic/oddeven/README.md | 7 ++++--- basic/tcp-amqp/README.md | 7 ++++--- basic/tcp-client-server/README.md | 8 ++++---- basic/ws-outbound-gateway/README.md | 7 ++++--- basic/xml/README.md | 6 +++--- build.gradle | 2 +- intermediate/dynamic-poller/README.md | 5 +++-- intermediate/mail-attachments/README.md | 4 ++-- intermediate/multipart-http/README.md | 3 ++- intermediate/rest-http/readme.md | 10 ++++++---- .../splitter-aggregator-reaper/README.md | 6 +++--- .../stored-procedures-derby/README.md | 6 +++--- intermediate/stored-procedures-ms/README.md | 4 ++-- .../stored-procedures-oracle/README.md | 12 +++++++---- .../stored-procedures-postgresql/README.md | 8 ++------ intermediate/travel/README.md | 5 +++-- 26 files changed, 95 insertions(+), 84 deletions(-) diff --git a/applications/cafe-scripted/README.md b/applications/cafe-scripted/README.md index 74b4b5497..12e518918 100644 --- a/applications/cafe-scripted/README.md +++ b/applications/cafe-scripted/README.md @@ -5,11 +5,9 @@ This is the scripted implementation of the classic **cafe** sample application. # Instructions for running the CafeDemo sample -The script language is passed as a command line argument. This may be run directly from maven: +The script language is passed as a command line argument. This may be run directly from Gradle: - $ mvn clean compile - - $ mvn exec:exec -Dlang=[language] + $ gradlew :cafe-scripted:runCafeDemoApp -Plang=[language] ## Groovy Control Bus @@ -17,7 +15,7 @@ This sample also demonstrates the use of Spring Integration's **groovy control b To demonstrate the control bus, while the CafeDemoApp is running, execute in a separate window: - $ mvn exec:exec -Pcontrol-bus + $ gradlew :cafe-scripted:runControlBus This will use groovy scripts to diff --git a/applications/loan-broker/README.md b/applications/loan-broker/README.md index bff505189..96f2ecfe9 100644 --- a/applications/loan-broker/README.md +++ b/applications/loan-broker/README.md @@ -1,11 +1,11 @@ Loan Broker Application ======================= -The Loan Broker sample is distributed as a Maven project, so you can run it in two ways. +The Loan Broker sample is distributed as a Gradle project, so you can run it in two ways. -### Maven (command line): +### Gradle (command line): -Execute **mvn install**. You should see output that looks similar to this: +Execute **gradlew :loan-broker:run**. You should see output that looks similar to this: . . . . . INFO : org.springframework.integration.loanbroker.demo.LoanBrokerDemo - @@ -30,7 +30,7 @@ Execute **mvn install**. You should see output that looks similar to this: This extension to the loan broker sample shows how to exchange messages between Spring Integration applications (and other technologies) using UDP. Any loan quotes over 5.2% will be sent to the loanshark application. -* Deploy the **loanshark** sample to a web container (e.g. **mvn tomcat:run**); or +* Deploy the **loanshark** sample to a web container (e.g. **gradlew :loan-broker:jettyRun**); or * run the perl (**udps.pl**) or groovy (**udps.groovy**) scripts from the command line. Run the **LoanBrokerSharkDetectorDemo** test case. You can see the banks that were detected as loan sharks in the **loanshark web UI**. diff --git a/basic/amqp/README.md b/basic/amqp/README.md index 280774d32..103da0e0c 100644 --- a/basic/amqp/README.md +++ b/basic/amqp/README.md @@ -15,14 +15,13 @@ If you imported the example into your IDE, you can just run class **org.springfr * Right-click on Main class --> Run As --> Java Application -Alternatively, you can start the sample from the command line ([Maven](http://maven.apache.org/) required): +Alternatively, you can start the sample from the command line ([Gradle](http://www.gradle.org) required): -* mvn package -* mvn exec:java +* gradlew :amqp:run # Used Spring Integration components -### Spring Integration Modules (Maven dependencies) +### Spring Integration Modules (Maven/Gradle dependencies) * spring-integration-core * spring-integration-amqp diff --git a/basic/enricher/README.md b/basic/enricher/README.md index 57e28e6e2..c31afde60 100644 --- a/basic/enricher/README.md +++ b/basic/enricher/README.md @@ -11,8 +11,8 @@ You can run the sample application by either * running the "Main" class from within STS (Right-click on Main class --> Run As --> Java Application) * or from the command line execute: - - mvn package - - mvn exec:java + + $ gradlew :enricher:run This example illustrates the usage of the Content Enricher. diff --git a/basic/ftp/README.md b/basic/ftp/README.md index 9bfb3a53e..fbb53c829 100644 --- a/basic/ftp/README.md +++ b/basic/ftp/README.md @@ -13,7 +13,7 @@ This example demonstrates the following aspects of the FTP support available wit The samples work out of the box using an embedded Apache FTP Server. Simply execute: - $ mvn clean package + $ gradlew :ftp:run and the samples are build as well as executed. The samples are part of a JUnit test suite: diff --git a/basic/helloworld/README.md b/basic/helloworld/README.md index a7be3b2cf..8ffd42271 100644 --- a/basic/helloworld/README.md +++ b/basic/helloworld/README.md @@ -12,9 +12,10 @@ The Hello World application demonstrates a simple message flow represented by th Message -> Channel -> ServiceActivator -> QueueChannel -To run the sample simply execute **HelloWorldApp** in package **org.springframework.integration.samples.helloworld**. You can also execute that class using the [Exec Maven Plugin](http://mojo.codehaus.org/exec-maven-plugin/): +To run the sample simply execute **HelloWorldApp** in package **org.springframework.integration.samples.helloworld**. +You can also execute that class using the [Gralde](http://www.gradle.org): - $ mvn clean package exec:java -P hello + $ gradlew :helloworld:runHelloWorldApp You should see the following output: @@ -26,9 +27,10 @@ This simple application will print out the current system time twice every 20 se More specifically, an **Inbound Channel Adapter** polls for the current system time 2 times every 20 seconds (20000 milliseconds). The resulting message contains as payload the time in milliseconds and the message is sent to a **Logging Channel Adapter**, which will print the time to the command prompt. -To run the sample simply execute **PollerApp** in package **org.springframework.integration.samples.helloworld**. You can also execute that class using the [Exec Maven Plugin](http://mojo.codehaus.org/exec-maven-plugin/): +To run the sample simply execute **PollerApp** in package **org.springframework.integration.samples.helloworld**. +You can also execute that class using the [Gralde](http://www.gradle.org): - $ mvn clean package exec:java -P poller + $ gradlew :helloworld:runPollerApp You should see output like the following: diff --git a/basic/http/README.md b/basic/http/README.md index 15a482901..4a7b3f759 100644 --- a/basic/http/README.md +++ b/basic/http/README.md @@ -12,15 +12,17 @@ The sample consists of two parts: ### Server -#### Command Line Using Maven +#### Command Line Using Gradle -The easiest way to run the **server** is to use the [Maven Jetty Plugin](http://docs.codehaus.org/display/JETTY/Maven+Jetty+Plugin). Simply execute: +The easiest way to run the **server** is to use the [Gralde Jetty Plugin](http://www.gradle.org/docs/current/userguide/jetty_plugin.html). + Simply execute: - $ mvn jetty:run + $ gradlew :http:jettyRun -This command starts a Jetty servlet container running on port 8080 serving the application. Alternatively you can also package the war-file and deploy it manually to a servlet container of your choosing. For that to happen execute: +This command starts a Jetty servlet container running on port 8080 serving the application. +Alternatively you can also package the war-file and deploy it manually to a servlet container of your choosing. For that to happen execute: - $ mvn clean package + $ gradlew :http:build The resulting war-file will be located in the **target** folder. @@ -30,13 +32,13 @@ If you are using [STS](http://www.springsource.com/developer/sts) and the projec ### Client -#### Command Line Using Maven +#### Command Line Using Gradle -In order to run the **client** using Maven, execute: +In order to run the **client** using Gradle, execute: - $ mvn clean package exec:java + $ gradlew :http:run -This will package the application and run it using the [Exec Maven Plugin](http://mojo.codehaus.org/exec-maven-plugin/) +This will package the application and run it using the [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html) #### Using an IDE such as SpringSource Tool Suite™ (STS) diff --git a/basic/jdbc/README.md b/basic/jdbc/README.md index 4db2cbe1d..2bd293acb 100644 --- a/basic/jdbc/README.md +++ b/basic/jdbc/README.md @@ -19,9 +19,9 @@ You can run the application by either * running the "Main" class from within STS (Right-click on Main class --> Run As --> Java Application) * or from the command line: - - mvn package - - mvn exec:java - + + $ gradlew :jdbc:run + Make an appropriate choice for searching a Person or creating a Person. For creating the person record, select the appropriate steps as prompted by the application. diff --git a/basic/jms/README.md b/basic/jms/README.md index 73f18571e..6a382121d 100644 --- a/basic/jms/README.md +++ b/basic/jms/README.md @@ -17,9 +17,10 @@ It also shows an example of using Spring profiles to modify the configuration fo The Stdout and Stdin Channel Adapters will allow you to interact with JMS via the console. It uses an embedded ActiveMQ broker. -To run the sample, simply execute the **Main** class located in the the *org.springframework.integration.samples.jms* package either from your favorite IDE or by using Maven. When using Maven you can start the sample by executing: +To run the sample, simply execute the **Main** class located in the the *org.springframework.integration.samples.jms* + package either from your favorite IDE or by using Gradle. When using Gradle you can start the sample by executing: - $ mvn clean package exec:java + $ gradlew :jms:run You will then be prompted to run one of two demos: @@ -51,4 +52,4 @@ When running either one of the demos you will see the following prompt: * **ChannelAdapterDemo** will simply echo the response -There are also test cases that exercise both demos; utilizing Spring 3.0 profiles to route the output to a QueueChannel instead of stdout. \ No newline at end of file +There are also test cases that exercise both demos; utilizing Spring 3.0 profiles to route the output to a QueueChannel instead of stdout. diff --git a/basic/jpa/README.md b/basic/jpa/README.md index aa44e6afc..76d5a36ec 100644 --- a/basic/jpa/README.md +++ b/basic/jpa/README.md @@ -22,10 +22,11 @@ Hibernate works out of the box and there are 2 options on how to execute the sam * running the "Main" class from within STS (Right-click on Main class --> Run As --> Java Application) * or from the command line: - - mvn clean package - - mvn exec:exec + $ gradlew :jpa:run -For **OpenJPA** and **EclipseLink** to work, you must provide a [Java Agent](http://docs.oracle.com/javase/6/docs/api/java/lang/instrument/package-summary.html). When using the Maven Exec Plugin, this is taken care of for you behind the scenes automatically. However, when running the sample from within STS start the Main class with the following JVM flags: +For **OpenJPA** and **EclipseLink** to work, you must provide a [Java Agent](http://docs.oracle.com/javase/6/docs/api/java/lang/instrument/package-summary.html). +When using the Gradle Application Plugin, this is taken care of for you behind the scenes automatically. However, +when running the sample from within STS start the Main class with the following JVM flags: -javaagent:/path/to/.m2/repository/org/springframework/spring-instrument/3.1.1.RELEASE/spring-instrument-3.1.1.RELEASE.jar -javaagent:/path/to/.m2/repository/org/apache/openjpa/openjpa/2.2.0/openjpa-2.2.0.jar diff --git a/basic/oddeven/README.md b/basic/oddeven/README.md index c6c85f284..48b80a52d 100644 --- a/basic/oddeven/README.md +++ b/basic/oddeven/README.md @@ -36,13 +36,14 @@ The following Spring Integration components are being used: ## Running the Samples -To run the two samples, simply execute either **CronOddEvenDemo** or **IntervalOddEvenDemoTestApp** in package **org.springframework.integration.samples.oddeven**. You can also execute those two samples using the [Exec Maven Plugin](http://mojo.codehaus.org/exec-maven-plugin/): +To run the two samples, simply execute either **CronOddEvenDemo** or **IntervalOddEvenDemoTestApp** in package **org.springframework.integration.samples.oddeven**. +You can also execute those two samples using the [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html): - $ mvn clean package exec:java -P cron + $ gradlew :oddeven:runCronOddEvenDemo which will execute **CronOddEvenDemo**. In order to run **IntervalOddEvenDemoTestApp**, execute: - $ mvn clean package exec:java -P interval + $ gradlew :oddeven:runIntervalOddEvenDemoTestApp For both samples you should see the output similar to this: diff --git a/basic/tcp-amqp/README.md b/basic/tcp-amqp/README.md index c2bbd29e1..b673e0868 100644 --- a/basic/tcp-amqp/README.md +++ b/basic/tcp-amqp/README.md @@ -28,9 +28,10 @@ If you imported the example into your IDE, you can just run class **org.springfr * Right-click on Main class --> Run As --> Java Application -Alternatively, you can start the sample from the command line ([Maven](http://maven.apache.org/) required): +Alternatively, you can start the sample from the command line +([Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html)): -* mvn exec:java + $ gradlew :tcp-amqp:run ## Run Telnet @@ -59,4 +60,4 @@ Some further resources: * RabbitMQ - [http://www.rabbitmq.com/](http://www.rabbitmq.com/) * Spring AMQP - [http://www.springsource.org/spring-amqp](http://www.springsource.org/spring-amqp) -[netcat]: http://en.wikipedia.org/wiki/Netcat \ No newline at end of file +[netcat]: http://en.wikipedia.org/wiki/Netcat diff --git a/basic/tcp-client-server/README.md b/basic/tcp-client-server/README.md index dca9e14a3..c6cf67194 100644 --- a/basic/tcp-client-server/README.md +++ b/basic/tcp-client-server/README.md @@ -19,9 +19,9 @@ Several variations of the sample are provided: The Client-Server Demo illustrates the use of a *Gateway* as an entry point into the integration flow. The message generated by the *Gateway* is sent over *TCP* by the *Outbound Gateway* to the *Inbound Gateway*. In turn the *Inbound Gateway* sends the message to an echo service (Class *EchoService*) and the echoed response comes back over *TCP*. The demo uses explicit *Transformer*s to convert the *byte array* payloads to *Strings*. -You can execute this sample simply via Maven: +You can execute this sample simply via Gradle: - $ mvn clean package exec:java + $ gradlew :tcp-client-server:run Alternatively, you can also execute the **Main** method in class *org.springframework.integration.samples.tcpclientserver.Main*. In both cases you should see the following console output: @@ -54,7 +54,7 @@ Alternatively, you can also execute the **Main** method in class *org.springfram The respective open server socket it dynamically selected. Alternatively, you can also customize the port by providing an additional system property at startup e.g. - $ mvn clean package exec:java -DavailableServerSocket=7777 + $ gradlew :tcp-client-server:run -DavailableServerSocket=7777 #### Connect via Telnet @@ -143,4 +143,4 @@ You can run the example by executing JUnit test **TcpServerCustomSerializerTest* [Deserializer]: http://static.springsource.org/spring/docs/current/javadoc-api/org/springframework/core/serializer/Deserializer.html [Serializer]: http://static.springsource.org/spring/docs/current/javadoc-api/org/springframework/core/serializer/Serializer.html [Telnet]: http://en.wikipedia.org/wiki/Telnet -[Transmission Control Protocol]: http://en.wikipedia.org/wiki/Transmission_Control_Protocol \ No newline at end of file +[Transmission Control Protocol]: http://en.wikipedia.org/wiki/Transmission_Control_Protocol diff --git a/basic/ws-outbound-gateway/README.md b/basic/ws-outbound-gateway/README.md index eb9cd67b9..954cf2686 100644 --- a/basic/ws-outbound-gateway/README.md +++ b/basic/ws-outbound-gateway/README.md @@ -19,8 +19,9 @@ Fahrenheit (90F) to Celsius (32.2C) and the result is printed to the console: ## Running the Sample -To run the sample simply execute **WebServiceDemoTestApp** in package *org.springframework.integration.samples.ws*. You can also execute that class using the [Exec Maven Plugin](http://mojo.codehaus.org/exec-maven-plugin/): +To run the sample simply execute **WebServiceDemoTestApp** in package *org.springframework.integration.samples.ws*. +You can also execute that class using the [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html): - $ mvn clean package exec:java + $ gradlew :ws-outbound-gateway:run -[Simple Object Access Protocol]: http://en.wikipedia.org/wiki/SOAP \ No newline at end of file +[Simple Object Access Protocol]: http://en.wikipedia.org/wiki/SOAP diff --git a/basic/xml/README.md b/basic/xml/README.md index 874d8ddd9..0c1f59b10 100644 --- a/basic/xml/README.md +++ b/basic/xml/README.md @@ -10,9 +10,10 @@ This example demonstrates the following aspects of the [Extensible Markup Langua ## Running the Sample -To run the sample, execute the class **org.springframework.integration.samples.xml.BookOrderProcessingTestApp**. Alternatively, you can run the sample using [Maven][] by executing: +To run the sample, execute the class **org.springframework.integration.samples.xml.BookOrderProcessingTestApp**. +Alternatively, you can run the sample using [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html) by executing: - $ mvn clean package exec:java + $ gradlew :xml:run You should see the following output: @@ -35,6 +36,5 @@ You should see the following output: [Extensible Markup Language]: http://en.wikipedia.org/wiki/XML -[Maven]: http://maven.apache.org/ [XPath]: http://en.wikipedia.org/wiki/XPath [XSLT]: http://en.wikipedia.org/wiki/XSLT diff --git a/build.gradle b/build.gradle index ebcd8f126..f45904faa 100644 --- a/build.gradle +++ b/build.gradle @@ -960,7 +960,7 @@ project('stored-procedures-oracle') { mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' repositories { - maven { url 'https://code.lds.org/nexus/content/groups/main-repo' } //Oracle JDBC Driver + mavenLocal() //Oracle JDBC Driver } dependencies { diff --git a/intermediate/dynamic-poller/README.md b/intermediate/dynamic-poller/README.md index 99921203a..0c52319a4 100644 --- a/intermediate/dynamic-poller/README.md +++ b/intermediate/dynamic-poller/README.md @@ -12,8 +12,9 @@ When changing the polling period, the change to the trigger will occur after the You can run the application by either: * running the "Main" class from within STS (Right-click on Main class --> Run As --> Java Application) -* or from the command line using the [Exec Maven Plugin](http://mojo.codehaus.org/exec-maven-plugin/): - - mvn package exec:java +* or from the command line using the [Gralde](http://www.gradle.org): + + $ gradlew :dynamic-poller:runHelloWorldApp You should see output like the following: diff --git a/intermediate/mail-attachments/README.md b/intermediate/mail-attachments/README.md index 5e71a4a93..f13caa247 100644 --- a/intermediate/mail-attachments/README.md +++ b/intermediate/mail-attachments/README.md @@ -28,8 +28,8 @@ You can run this sample by either. * running the "Main" class from within STS (Right-click on Main class --> Run As --> Java Application) * or from the command line: - - mvn package - - mvn exec:java + + $ gradlew :mail-attachments:run Once started, the configured mail server will be polled for new email messages every 5 seconds. diff --git a/intermediate/multipart-http/README.md b/intermediate/multipart-http/README.md index f130c1bfa..f5f3d1a1d 100644 --- a/intermediate/multipart-http/README.md +++ b/intermediate/multipart-http/README.md @@ -19,7 +19,8 @@ To run this sample: 1. Deploy project * If you are using STS and project is imported as Eclipse project in your workspace you can just execute **Run on Server** - * You can also run **mvn clean install** and generate the WAR file that you can deploy the conventional way + * You can also run **gradlew :multipart-http:build** and generate the WAR file that you can deploy the conventional + way 2. run the simple test client program: **org.springframework.integration.samples.multipart.MultipartClient** You should see the following output from the server: diff --git a/intermediate/rest-http/readme.md b/intermediate/rest-http/readme.md index ed65de67c..a60b5a218 100644 --- a/intermediate/rest-http/readme.md +++ b/intermediate/rest-http/readme.md @@ -11,15 +11,17 @@ The *Client* program is provided as a [JUnit][] test: * RestHttpClientTest -This test-case can be used to test the HTTP Path usage. It uses Spring's [RestTemplate][] to assemble and send HTTP requests. The *Server*, on the other hand, is using Spring Integration's HTTP Endpoint configuration. The provided project itself is a web project and you can build the project using [Maven][] and deploy the resulting war under `target/rest-http-*.war` to Servlet Containers such as [Jetty][] or [Apache Tomcat][]: +This test-case can be used to test the HTTP Path usage. It uses Spring's [RestTemplate][] to assemble and send HTTP requests. The *Server*, on the other hand, is using Spring Integration's HTTP Endpoint configuration. +The provided project itself is a web project and you can build the project using [Gradle][] and deploy the resulting +war under `target/rest-http-*.war` to Servlet Containers such as [Jetty][] or [Apache Tomcat][]: - $ mvn clean verify + $ gradlew :rest-http:build # To run this sample 1. Deploy the project - If you are using [Spring Tool Suite][] (STS) and project is imported as Eclipse project in your workspace you can just execute 'Run on Server' - - You can also run 'mvn clean verify' and generate the WAR file that you can deploy to Servlet Containers + - You can also run **gradlew :rest-http:build** and generate the WAR file that you can deploy to Servlet Containers 2. Run the simple JUnit Test: **org.springframework.integration.samples.rest.RestHttpClientTest** - You may change the URI Variable value in the test to see different results. @@ -79,7 +81,7 @@ They are stored in `src/main/resources/users.properties`. [cURL]: http://en.wikipedia.org/wiki/CURL [Jetty]: http://www.eclipse.org/jetty/ [JUnit]: http://junit.org/ -[Maven]: http://maven.apache.org/ +[Gradle]: http://www.gradle.org [RestTemplate]: http://static.springsource.org/spring/docs/current/javadoc-api/org/springframework/web/client/RestTemplate.html [Spring Security]: http://www.springsource.org/spring-security [Spring Tool Suite]: http://www.springsource.org/sts diff --git a/intermediate/splitter-aggregator-reaper/README.md b/intermediate/splitter-aggregator-reaper/README.md index 57de1aba8..482d93fcd 100644 --- a/intermediate/splitter-aggregator-reaper/README.md +++ b/intermediate/splitter-aggregator-reaper/README.md @@ -9,8 +9,8 @@ Demonstration of how to implement the Splitter/Aggregator [Enterprise Integratio * running the "Main" class from within STS (Right-click on Main class --> Run As --> Java Application) * or from the command line: - - mvn package - - mvn exec:java + + $ gradlew :splitter-aggregator-reaper:run You should see the following output: @@ -47,4 +47,4 @@ http://www.springsource.org/spring-integration [aggregating]: http://static.springsource.org/spring-integration/reference/html/messaging-routing-chapter.html#aggregator [Enterprise Integration Patterns]: http://www.eaipatterns.com/ [message store reaper]: http://static.springsource.org/spring-integration/reference/html/messaging-routing-chapter.html#aggregator-config -[splitting]: http://static.springsource.org/spring-integration/reference/html/messaging-routing-chapter.html#splitter \ No newline at end of file +[splitting]: http://static.springsource.org/spring-integration/reference/html/messaging-routing-chapter.html#splitter diff --git a/intermediate/stored-procedures-derby/README.md b/intermediate/stored-procedures-derby/README.md index b7e179539..f68ab98a8 100644 --- a/intermediate/stored-procedures-derby/README.md +++ b/intermediate/stored-procedures-derby/README.md @@ -11,14 +11,14 @@ returns a **ResultSet**. # Setup -Just make sure you have Maven set up and that the project builds successfully. +Just make sure you have Gradle set up and that the project builds successfully. # Run the Sample * running the "Main" class from within STS (Right-click on Main class --> Run As --> Java Application) * or from the command line: - - mvn package - - mvn exec:java + + $ gradlew :stored-procedures-derby:run * Follow the screen (command line) instructions. diff --git a/intermediate/stored-procedures-ms/README.md b/intermediate/stored-procedures-ms/README.md index b10ba4f2d..071c9026b 100644 --- a/intermediate/stored-procedures-ms/README.md +++ b/intermediate/stored-procedures-ms/README.md @@ -110,8 +110,8 @@ You may have to update the *Microsoft SQL Server* properties in: * running the "Main" class from within STS (Right-click on Main class --> Run As --> Java Application) * or from the command line: - - mvn package - - mvn exec:java + + $ gradlew :stored-procedures-ms:run -------------------------------------------------------------------------------- diff --git a/intermediate/stored-procedures-oracle/README.md b/intermediate/stored-procedures-oracle/README.md index 9c5417eed..b5efa92a0 100644 --- a/intermediate/stored-procedures-oracle/README.md +++ b/intermediate/stored-procedures-oracle/README.md @@ -38,6 +38,10 @@ Nevertheless, the example should work with other versions as well. ``` +After that you can run the sample application using [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html): + + $ gradlew :stored-procedures-oracle:run + ### Common Oracle Setup #### Create Tablespace @@ -119,8 +123,8 @@ END; * running the "Main" class from within STS (Right-click on Main class --> Run As --> Java Application) * or from the command line: - - mvn package - - mvn exec:java + + $ gradlew :stored-procedures-oracle:run You should see the following output: @@ -214,8 +218,8 @@ end; * running the "Main" class from within STS (Right-click on Main class --> Run As --> Java Application) * or from the command line: - - mvn package - - mvn exec:java + + $ gradlew :stored-procedures-oracle:run You should see the following output: diff --git a/intermediate/stored-procedures-postgresql/README.md b/intermediate/stored-procedures-postgresql/README.md index 4be737c86..9d9e0f5a1 100644 --- a/intermediate/stored-procedures-postgresql/README.md +++ b/intermediate/stored-procedures-postgresql/README.md @@ -10,10 +10,6 @@ The second procedure returns a **ResultSet**. # Setup -## Maven - -Please make sure you have *Maven* set up and that the project builds successfully using `mvn clean package`. - ## PostgreSQL Please ensure that you can connect to a running instance of a *PostgreSQL server*. The sample was tested using **PostgreSQL v9.2.1**. @@ -80,8 +76,8 @@ Please configure the necessary credentials in order to connect to your database * running the "Main" class from within STS (Right-click on Main class --> Run As --> Java Application) * or from the command line: - - mvn package - - mvn exec:java + + $ gradlew :stored-procedures-postgresql:run * Follow the screen (command line) instructions. diff --git a/intermediate/travel/README.md b/intermediate/travel/README.md index 6d648a6ae..cc22b6d32 100644 --- a/intermediate/travel/README.md +++ b/intermediate/travel/README.md @@ -46,9 +46,10 @@ This sample uses the [MapQuest API][], specifically the [MapQuest Traffic Web Se ## Running the Sample -To run the sample execute **Main** in package **org.springframework.integration.samples.travel**. You can also execute that class using the [Exec Maven Plugin](http://mojo.codehaus.org/exec-maven-plugin/): +To run the sample execute **Main** in package **org.springframework.integration.samples.travel**. +You can also execute that class using the [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html): - $ mvn clean package exec:java -Dmapquest.apikey="your_mapquest_api_key_url_decoded" + $ gradlew :travel:run -Dmapquest.apikey="your_mapquest_api_key_url_decoded" You should see the following output: From a93ee7fb35913de603dcca9970fea28bcfe956cf Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Sat, 28 Jun 2014 16:08:54 +0300 Subject: [PATCH 023/356] Comment out the Oracle Driver dependency CI Build: https://build.spring.io/browse/INTSAMPLES-NIGHTLY-1053/log --- build.gradle | 3 ++- intermediate/stored-procedures-oracle/README.md | 12 ++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index f45904faa..9ea800ad6 100644 --- a/build.gradle +++ b/build.gradle @@ -965,7 +965,8 @@ project('stored-procedures-oracle') { dependencies { compile "org.springframework.integration:spring-integration-jdbc:$springIntegrationVersion" - compile "com.oracle:ojdbc6:$oracleDriverVersion" +//TODO Uncomment it when the ojdbc6 artifact is available in the mavenLocal() +// compile "com.oracle:ojdbc6:$oracleDriverVersion" } test { diff --git a/intermediate/stored-procedures-oracle/README.md b/intermediate/stored-procedures-oracle/README.md index b5efa92a0..a5956cc77 100644 --- a/intermediate/stored-procedures-oracle/README.md +++ b/intermediate/stored-procedures-oracle/README.md @@ -28,16 +28,8 @@ Nevertheless, the example should work with other versions as well. $ mvn install:install-file -DgroupId=com.oracle -DartifactId=ojdbc6 -Dversion=11.2.0.3 -Dpackaging=jar -Dfile=~/dev/ojdbc6.jar -DgeneratePom=true -- Now you can add the dependency to the Maven pom.xml file. Please check the pom.xml for this project and verify that it matches your installed Oracle JDBC driver - -```XML - - com.oracle - ojdbc6 - 11.2.0.3 - -``` - +- Now you can uncomment the `ojdbc6` dependency in the build.gradle file for `stored-procedures-oracle` project. + After that you can run the sample application using [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html): $ gradlew :stored-procedures-oracle:run From 9eccb86adf21eb7d3019714faf1adde63e84e01d Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 8 Jul 2014 15:27:40 -0400 Subject: [PATCH 024/356] Update to Spring Integration 4.0.3 --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9ea800ad6..92ecc1f06 100644 --- a/build.gradle +++ b/build.gradle @@ -139,6 +139,7 @@ subprojects { subproject -> repositories { maven { url 'http://repo.spring.io/libs-milestone' } +// maven { url 'http://repo.spring.io/libs-staging-local' } } if (!(subproject.name in ['advanced', 'applications', 'basic', 'intermediate', 'cafe'])) { @@ -186,7 +187,7 @@ subprojects { subproject -> postgresVersion = '9.1-901-1.jdbc4' subethasmtpVersion = '1.2' slf4jVersion = '1.7.6' - springIntegrationVersion = '4.0.2.RELEASE' + springIntegrationVersion = '4.0.3.RELEASE' springIntegrationDslVersion = '1.0.0.M2' springVersion = '4.0.5.RELEASE' springSecurityVersion = '3.2.4.RELEASE' From 35e5156bdb8903605c1df6dd2205b07ab6da6689 Mon Sep 17 00:00:00 2001 From: liujiong1982 Date: Mon, 21 Jul 2014 22:15:19 +0800 Subject: [PATCH 025/356] INTSAMPLES-133:Use Update the retry-and-more Sample to use Syntax Polishing - add info to README. Also, use "localhost" for amqp connection factories. --- .../spring-integration-context.xml | 2 +- .../spring-integration-context.xml | 2 +- intermediate/retry-and-more/README.md | 6 +++++ .../samples/advice/CircuitBreakerDemo.java | 7 +++++- .../FileTransferDeleteAfterSuccessDemo.java | 2 ++ .../FileTransferRenameAfterFailureDemo.java | 2 ++ .../samples/advice/StatefulRetryDemo.java | 7 +++++- .../samples/advice/StatelessRetryDemo.java | 7 +++++- .../stateful-retry-advice-context.xml | 2 +- .../stateless-retry-advice-context.xml | 25 ++++--------------- 10 files changed, 36 insertions(+), 26 deletions(-) diff --git a/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index a888f97c4..0780ab185 100644 --- a/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -42,7 +42,7 @@ - + diff --git a/basic/tcp-amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/basic/tcp-amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index bbc13dd29..bc55412f9 100644 --- a/basic/tcp-amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/basic/tcp-amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -37,7 +37,7 @@ - + diff --git a/intermediate/retry-and-more/README.md b/intermediate/retry-and-more/README.md index 36ea39258..6e8bf545c 100644 --- a/intermediate/retry-and-more/README.md +++ b/intermediate/retry-and-more/README.md @@ -3,6 +3,7 @@ Handler Advice Sample "retry-and-more" This sample shows how to use the 2.2.0 Handler Advice feature. + ##Stateless Retry Advice Demo This class (`StatelessRetryDemo`) demonstrates stateless retry. @@ -18,6 +19,10 @@ In each case enter 'fail n' where n is the number of times you want the service e.g. 'fail 2' will succeed in each case on the third try, 'fail 3' will fail permanently after the third try. +__NOTE: Starting with Spring Integration 4.0, stateless retry has convenient namespace support; this sample has been updated to show its use.__ + +It shows the retry advice declared (for each profile) as a top level bean ``. Declaring it as a top level bean allows it to be used in multiple places (or via profiles). You can also declare it within the advice chain using `` (with no 'id'). In that case, it cannot be reused in other advice chains. + ##Stateful Retry Advice Demo @@ -25,6 +30,7 @@ This class (`StatefulRetryDemo`) demonstrates stateful retry. It is similar to the default version of the stateless retry but uses AMQP; you will see that the exception are thrown back to the container and the retries are re-delivered by AMQP. +NOTE: Starting with Spring Integration 4.0, __stateless retry__ has convenient namespace support; stateful retry requires the retry advice to be configured using `` definitions as is shown here. ##Circuit Breaker Advice Demo diff --git a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/CircuitBreakerDemo.java b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/CircuitBreakerDemo.java index 592c19a0b..18ca06533 100644 --- a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/CircuitBreakerDemo.java +++ b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/CircuitBreakerDemo.java @@ -16,6 +16,7 @@ package org.springframework.integration.samples.advice; import org.apache.log4j.Logger; + import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -28,7 +29,7 @@ public class CircuitBreakerDemo { private static final Logger LOGGER = Logger.getLogger(CircuitBreakerDemo.class); - public static void main(String[] args) { + public static void main(String[] args) throws Exception { LOGGER.info("\n=========================================================" + "\n " + "\n Welcome to Spring Integration! " @@ -51,8 +52,12 @@ public static void main(String[] args) { + "\n Service will succeed only in the last quarter " + "\n minute. Breaker will open after 2 failures and " + "\n will go half-open after 15 seconds. " + + "\n Demo will terminate in 2 minutes. " + "\n " + "\n=========================================================" ); + Thread.sleep(120000); + context.close(); } + } diff --git a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferDeleteAfterSuccessDemo.java b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferDeleteAfterSuccessDemo.java index 5cbb98e53..7ab0df06b 100644 --- a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferDeleteAfterSuccessDemo.java +++ b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferDeleteAfterSuccessDemo.java @@ -20,6 +20,7 @@ import org.apache.commons.net.ftp.FTPFile; import org.apache.log4j.Logger; + import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; @@ -74,6 +75,7 @@ public static void main(String[] args) throws Exception { + "\n=========================================================" ); System.in.read(); + context.close(); System.exit(0); } } diff --git a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferRenameAfterFailureDemo.java b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferRenameAfterFailureDemo.java index fbe9006d0..eb3c256fd 100644 --- a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferRenameAfterFailureDemo.java +++ b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferRenameAfterFailureDemo.java @@ -19,6 +19,7 @@ import org.apache.commons.net.ftp.FTPFile; import org.apache.log4j.Logger; + import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; @@ -70,6 +71,7 @@ public static void main(String[] args) throws Exception { + "\n=========================================================" ); System.in.read(); + context.close(); System.exit(0); } } diff --git a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/StatefulRetryDemo.java b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/StatefulRetryDemo.java index 647f20db0..d8136e3f0 100644 --- a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/StatefulRetryDemo.java +++ b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/StatefulRetryDemo.java @@ -16,6 +16,7 @@ package org.springframework.integration.samples.advice; import org.apache.log4j.Logger; + import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -28,7 +29,7 @@ public class StatefulRetryDemo { private static final Logger LOGGER = Logger.getLogger(StatefulRetryDemo.class); - public static void main(String[] args) { + public static void main(String[] args) throws Exception { LOGGER.info("\n=========================================================" + "\n " + "\n Welcome to Spring Integration! " @@ -50,8 +51,12 @@ public static void main(String[] args) { + "\n Please enter some text and press return. " + "\n 'fail 2' will fail twice, then succeed " + "\n 'fail 3' will fail and never succeed " + + "\n Demo will terminate in 60 seconds. " + "\n " + "\n=========================================================" ); + Thread.sleep(60000); + context.close(); } + } diff --git a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/StatelessRetryDemo.java b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/StatelessRetryDemo.java index c16df9de5..5b8df82f5 100644 --- a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/StatelessRetryDemo.java +++ b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/StatelessRetryDemo.java @@ -16,6 +16,7 @@ package org.springframework.integration.samples.advice; import org.apache.log4j.Logger; + import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -28,7 +29,7 @@ public class StatelessRetryDemo { private static final Logger LOGGER = Logger.getLogger(StatelessRetryDemo.class); - public static void main(String[] args) { + public static void main(String[] args) throws Exception { LOGGER.info("\n=========================================================" + "\n " + "\n Welcome to Spring Integration! " @@ -50,8 +51,12 @@ public static void main(String[] args) { + "\n Please enter some text and press return. " + "\n 'fail 2' will fail twice, then succeed " + "\n 'fail 3' will fail and never succeed " + + "\n Demo will terminate in 60 seconds. " + "\n " + "\n=========================================================" ); + Thread.sleep(60000); + context.close(); } + } diff --git a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateful-retry-advice-context.xml b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateful-retry-advice-context.xml index 36e425779..cc19749b3 100644 --- a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateful-retry-advice-context.xml +++ b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateful-retry-advice-context.xml @@ -62,7 +62,7 @@ - + diff --git a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateless-retry-advice-context.xml b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateless-retry-advice-context.xml index 60db37099..f3b32c991 100644 --- a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateless-retry-advice-context.xml +++ b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/stateless-retry-advice-context.xml @@ -37,36 +37,21 @@ - + - - - - - - - - - - - - + + + - - - - - - - + From 90d5ee928213c2e6abee1b43f2920da9484cd091 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 29 Jul 2014 15:22:46 +0300 Subject: [PATCH 026/356] INTSAMPLES-134: SFTP: Use Apache SSHD SshServer JIRA: https://jira.spring.io/browse/INTSAMPLES-134 INTSAMPLES-134: `sun.misc.BASE64Decoder` -> `org.apache.sshd.common.util.Base64` INTSAMPLES-134: PR comments and fix for Windows INTSAMPLES-134 Test Samples with Remote Server - change 'user' property to 'username' to avoid conflict with environment variable. - create temporary files using the remote file template in 'si.sftp.sample'. - clean up after test completion. - use a caching session factory. --- basic/sftp/.gitignore | 3 +- basic/sftp/README.md | 9 +- basic/sftp/remote-source-dir/a.txt | 1 - basic/sftp/remote-source-dir/b.txt | 1 - basic/sftp/remote-source-dir/c.bar | 1 - basic/sftp/remote-target-dir/.nothing | 0 .../samples/sftp/EmbeddedSftpServer.java | 168 ++++++++++++++++++ .../sftp/SftpInboundReceiveSample.java | 56 +++++- .../sftp/SftpOutboundGatewaySample.java | 43 +++-- .../sftp/SftpOutboundTransferSample.java | 43 +++-- .../samples/sftp/SftpTestUtils.java | 124 +++++++++++++ .../src/test/resources/META-INF/keys/sftp_rsa | 53 +++--- .../test/resources/META-INF/keys/sftp_rsa.pub | 1 + .../SftpInboundReceiveSample-context.xml | 24 +-- .../SftpOutboundGatewaySample-context.xml | 22 +-- .../SftpOutboundTransferSample-context.xml | 21 ++- .../spring/integration/SftpSampleCommon.xml | 20 +++ basic/sftp/src/test/resources/user.properties | 8 +- build.gradle | 6 +- 19 files changed, 494 insertions(+), 110 deletions(-) delete mode 100644 basic/sftp/remote-source-dir/a.txt delete mode 100644 basic/sftp/remote-source-dir/b.txt delete mode 100644 basic/sftp/remote-source-dir/c.bar delete mode 100644 basic/sftp/remote-target-dir/.nothing create mode 100644 basic/sftp/src/test/java/org/springframework/integration/samples/sftp/EmbeddedSftpServer.java create mode 100644 basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpTestUtils.java create mode 100644 basic/sftp/src/test/resources/META-INF/keys/sftp_rsa.pub create mode 100644 basic/sftp/src/test/resources/META-INF/spring/integration/SftpSampleCommon.xml diff --git a/basic/sftp/.gitignore b/basic/sftp/.gitignore index d6ef06951..139fb7c9e 100644 --- a/basic/sftp/.gitignore +++ b/basic/sftp/.gitignore @@ -1,3 +1,4 @@ /local-dir /target -/src/test/resources/META-INF/keys/sftp_rsa +hostkey.ser +si.sftp.sample diff --git a/basic/sftp/README.md b/basic/sftp/README.md index 001325779..dfc9b4727 100644 --- a/basic/sftp/README.md +++ b/basic/sftp/README.md @@ -6,11 +6,18 @@ This example demonstrates the following aspects of the SFTP support available wi 1. SFTP Inbound Channel Adapter (transfers files from remote to local directory) 2. SFTP Outbound Channel Adapter (transfers files from local to the remote directory) -In order to run this sample you need to: +In order to run this sample for the 'real' SFTP Server you need to: 1. generate private/public keys. Below is simple directions what needs to be done 2. update user.properties file with appropriate values 3. run the sample + +By default this sample uses an [Apache MINA](http://mina.apache.org/sshd-project) embedded `SshServer` with predefined +private and public keys. +Note, the embedded Server is started only when the `port` property remains as `-1`. In this case the target port +for the Embedded Server is selected randomly. For a real SFTP server you should specify correct `host/port` properties. + +NOTE: The test cases will create/delete a directory `si.sftp.sample`. ## INBOUND CHANNEL ADAPTER diff --git a/basic/sftp/remote-source-dir/a.txt b/basic/sftp/remote-source-dir/a.txt deleted file mode 100644 index 8c7e5a667..000000000 --- a/basic/sftp/remote-source-dir/a.txt +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/basic/sftp/remote-source-dir/b.txt b/basic/sftp/remote-source-dir/b.txt deleted file mode 100644 index 7371f47a6..000000000 --- a/basic/sftp/remote-source-dir/b.txt +++ /dev/null @@ -1 +0,0 @@ -B \ No newline at end of file diff --git a/basic/sftp/remote-source-dir/c.bar b/basic/sftp/remote-source-dir/c.bar deleted file mode 100644 index 96d80cd6c..000000000 --- a/basic/sftp/remote-source-dir/c.bar +++ /dev/null @@ -1 +0,0 @@ -C \ No newline at end of file diff --git a/basic/sftp/remote-target-dir/.nothing b/basic/sftp/remote-target-dir/.nothing deleted file mode 100644 index e69de29bb..000000000 diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/EmbeddedSftpServer.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/EmbeddedSftpServer.java new file mode 100644 index 000000000..3dbb4388f --- /dev/null +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/EmbeddedSftpServer.java @@ -0,0 +1,168 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.sftp; + +import java.io.IOException; +import java.io.InputStream; +import java.math.BigInteger; +import java.nio.ByteBuffer; +import java.security.KeyFactory; +import java.security.PublicKey; +import java.security.spec.RSAPublicKeySpec; +import java.util.Collections; + +import org.apache.sshd.SshServer; +import org.apache.sshd.common.NamedFactory; +import org.apache.sshd.common.file.FileSystemView; +import org.apache.sshd.common.file.nativefs.NativeFileSystemFactory; +import org.apache.sshd.common.file.nativefs.NativeFileSystemView; +import org.apache.sshd.common.util.Base64; +import org.apache.sshd.server.Command; +import org.apache.sshd.server.PublickeyAuthenticator; +import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; +import org.apache.sshd.server.session.ServerSession; +import org.apache.sshd.server.sftp.SftpSubsystem; + +import org.springframework.beans.factory.InitializingBean; +import org.springframework.context.SmartLifecycle; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.FileSystemResource; +import org.springframework.util.SocketUtils; +import org.springframework.util.StreamUtils; + +/** + * @author Artem Bilan + */ +public class EmbeddedSftpServer implements InitializingBean, SmartLifecycle { + + public static final int PORT = SocketUtils.findAvailableTcpPort(); + + private final SshServer server = SshServer.setUpDefaultServer(); + + private volatile int port; + + private volatile boolean running; + + public void setPort(int port) { + this.port = port; + } + + @Override + public void afterPropertiesSet() throws Exception { + final PublicKey allowedKey = decodePublicKey(); + this.server.setPublickeyAuthenticator(new PublickeyAuthenticator() { + + @Override + public boolean authenticate(String username, PublicKey key, ServerSession session) { + return key.equals(allowedKey); + } + + }); + this.server.setPort(this.port); + this.server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider("hostkey.ser")); + this.server.setSubsystemFactories(Collections.>singletonList(new SftpSubsystem.Factory())); + final String virtualDir = new FileSystemResource("").getFile().getAbsolutePath(); + this.server.setFileSystemFactory(new NativeFileSystemFactory() { + + @Override + public FileSystemView createFileSystemView(org.apache.sshd.common.Session session) { + return new NativeFileSystemView(session.getUsername(), false) { + + @Override + public String getVirtualUserDir() { + return virtualDir; + } + }; + } + + }); + } + + private PublicKey decodePublicKey() throws Exception { + InputStream stream = new ClassPathResource("META-INF/keys/sftp_rsa.pub").getInputStream(); + byte[] decodeBuffer = Base64.decodeBase64(StreamUtils.copyToByteArray(stream)); + ByteBuffer bb = ByteBuffer.wrap(decodeBuffer); + int len = bb.getInt(); + byte[] type = new byte[len]; + bb.get(type); + if ("ssh-rsa".equals(new String(type))) { + BigInteger e = decodeBigInt(bb); + BigInteger m = decodeBigInt(bb); + RSAPublicKeySpec spec = new RSAPublicKeySpec(m, e); + return KeyFactory.getInstance("RSA").generatePublic(spec); + + } + else { + throw new IllegalArgumentException("Only supports RSA"); + } + } + + private BigInteger decodeBigInt(ByteBuffer bb) { + int len = bb.getInt(); + byte[] bytes = new byte[len]; + bb.get(bytes); + return new BigInteger(bytes); + } + + @Override + public boolean isAutoStartup() { + return PORT == this.port; + } + + @Override + public int getPhase() { + return Integer.MAX_VALUE; + } + + @Override + public void start() { + try { + server.start(); + this.running = true; + } + catch (IOException e) { + throw new IllegalStateException(e); + } + } + + @Override + public void stop(Runnable callback) { + stop(); + callback.run(); + } + + @Override + public void stop() { + if (this.running) { + try { + server.stop(true); + } + catch (InterruptedException e) { + throw new IllegalStateException(e); + } + finally { + this.running = false; + } + } + } + + @Override + public boolean isRunning() { + return this.running; + } + +} diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSample.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSample.java index 77900a4f3..3ab713494 100644 --- a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSample.java +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSample.java @@ -15,24 +15,68 @@ */ package org.springframework.integration.samples.sftp; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.io.File; + import org.junit.Test; -import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.endpoint.SourcePollingChannelAdapter; +import org.springframework.integration.file.remote.RemoteFileTemplate; +import org.springframework.integration.file.remote.session.CachingSessionFactory; +import org.springframework.integration.file.remote.session.SessionFactory; +import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel; +import com.jcraft.jsch.ChannelSftp.LsEntry; + /** * @author Oleg Zhurakousky + * @author Gary Russell * */ public class SftpInboundReceiveSample { @Test public void runDemo(){ - ApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/SftpInboundReceiveSample-context.xml", this.getClass()); - PollableChannel localFileChannel = context.getBean("receiveChannel", PollableChannel.class); - System.out.println("Received first file message: " + localFileChannel.receive()); - System.out.println("Received second file message: " + localFileChannel.receive()); - System.out.println("No third file was received " + localFileChannel.receive(1000)); + ConfigurableApplicationContext context = + new ClassPathXmlApplicationContext("/META-INF/spring/integration/SftpInboundReceiveSample-context.xml", this.getClass()); + RemoteFileTemplate template = null; + String file1 = "a.txt"; + String file2 = "b.txt"; + String file3 = "c.bar"; + new File("local-dir", file1).delete(); + new File("local-dir", file2).delete(); + try { + PollableChannel localFileChannel = context.getBean("receiveChannel", PollableChannel.class); + @SuppressWarnings("unchecked") + SessionFactory sessionFactory = context.getBean(CachingSessionFactory.class); + template = new RemoteFileTemplate(sessionFactory); + SftpTestUtils.createTestFiles(template, file1, file2, file3); + + SourcePollingChannelAdapter adapter = context.getBean(SourcePollingChannelAdapter.class); + adapter.start(); + + Message received = localFileChannel.receive(); + assertNotNull("Expected file", received); + System.out.println("Received first file message: " + received); + received = localFileChannel.receive(); + assertNotNull("Expected file", received); + System.out.println("Received second file message: " + received); + received = localFileChannel.receive(1000); + assertNull("Expected null", received); + System.out.println("No third file was received as expected"); + } + finally { + SftpTestUtils.cleanUp(template, file1, file2, file3); + context.close(); + assertTrue("Could note delete retrieved file", new File("local-dir", file1).delete()); + assertTrue("Could note delete retrieved file", new File("local-dir", file2).delete()); + } } + } diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundGatewaySample.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundGatewaySample.java index 9745c8be6..ca8f33de3 100644 --- a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundGatewaySample.java +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundGatewaySample.java @@ -20,11 +20,16 @@ import java.io.File; import java.util.List; -import java.util.Random; import org.junit.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.file.remote.RemoteFileTemplate; +import org.springframework.integration.file.remote.session.CachingSessionFactory; +import org.springframework.integration.file.remote.session.SessionFactory; + +import com.jcraft.jsch.ChannelSftp.LsEntry; /** * Demonstrates use of the outbound gateway to use ls, get and rm. @@ -40,24 +45,23 @@ public void testLsGetRm() throws Exception { ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext( "classpath:/META-INF/spring/integration/SftpOutboundGatewaySample-context.xml"); ToSftpFlowGateway toFtpFlow = ctx.getBean(ToSftpFlowGateway.class); - try { - String tmpDir = System.getProperty("java.io.tmpdir"); + RemoteFileTemplate template = null; + String file1 = "1.ftptest"; + String file2 = "2.ftptest"; + File tmpDir = new File(System.getProperty("java.io.tmpdir")); + try { // remove the previous output files if necessary - new File(new File(tmpDir), "1.ftptest").delete(); - new File(new File(tmpDir), "2.ftptest").delete(); - - // create a couple of files in a temp dir - File dir = new File(tmpDir + "/" + new Random().nextInt()); - dir.mkdir(); - File f1 = new File(dir, "1.ftptest"); - f1.createNewFile(); - File f2 = new File(dir, "2.ftptest"); - f2.createNewFile(); + new File(tmpDir, file1).delete(); + new File(tmpDir, file2).delete(); + @SuppressWarnings("unchecked") + SessionFactory sessionFactory = ctx.getBean(CachingSessionFactory.class); + template = new RemoteFileTemplate(sessionFactory); + SftpTestUtils.createTestFiles(template, file1, file2); // execute the flow (ls, get, rm, aggregate results) - List rmResults = toFtpFlow.lsGetAndRmFiles(dir.getAbsolutePath()); + List rmResults = toFtpFlow.lsGetAndRmFiles("si.sftp.sample"); //Check everything went as expected, and clean up @@ -65,13 +69,16 @@ public void testLsGetRm() throws Exception { for (Boolean result : rmResults) { assertTrue(result); } - assertTrue("Expected remote dir to be empty", dir.delete()); - assertTrue("Could note delete retrieved file", new File(new File(tmpDir), "1.ftptest").delete()); - assertTrue("Could note delete retrieved file", new File(new File(tmpDir), "2.ftptest").delete()); - } finally { + + } + finally { + SftpTestUtils.cleanUp(template, file1, file2); ctx.close(); + assertTrue("Could note delete retrieved file", new File(tmpDir, file1).delete()); + assertTrue("Could note delete retrieved file", new File(tmpDir, file2).delete()); } } + } diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSample.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSample.java index 28e0e7db7..c9ddc96de 100644 --- a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSample.java +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSample.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,15 +20,21 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.file.remote.RemoteFileTemplate; +import org.springframework.integration.file.remote.session.CachingSessionFactory; +import org.springframework.integration.file.remote.session.SessionFactory; +import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; +import com.jcraft.jsch.ChannelSftp.LsEntry; + /** * * @author Oleg Zhurakousky * @author Gunnar Hillert + * @author Gary Russell * */ public class SftpOutboundTransferSample { @@ -38,29 +44,34 @@ public void testOutbound() throws Exception{ final String sourceFileName = "README.md"; final String destinationFileName = sourceFileName +"_foo"; - final String destinationFilePath = "remote-target-dir/" + destinationFileName; final ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext("/META-INF/spring/integration/SftpOutboundTransferSample-context.xml", SftpOutboundTransferSample.class); - ac.start(); - - final File file = new File(sourceFileName); - - Assert.isTrue(file.exists(), String.format("File '%s' does not exist.", sourceFileName)); + @SuppressWarnings("unchecked") + SessionFactory sessionFactory = ac.getBean(CachingSessionFactory.class); + RemoteFileTemplate template = new RemoteFileTemplate(sessionFactory); + SftpTestUtils.createTestFiles(template); // Just the directory - final Message message = MessageBuilder.withPayload(file).build(); - final MessageChannel inputChannel = ac.getBean("inputChannel", MessageChannel.class); + try { + final File file = new File(sourceFileName); - inputChannel.send(message); - Thread.sleep(2000); + Assert.isTrue(file.exists(), String.format("File '%s' does not exist.", sourceFileName)); - Assert.isTrue(new File(destinationFilePath).exists(), String.format("File '%s' does not exist.", destinationFilePath)); + final Message message = MessageBuilder.withPayload(file).build(); + final MessageChannel inputChannel = ac.getBean("inputChannel", MessageChannel.class); - System.out.println(String.format("Successfully transferred '%s' file to a " + - "remote location under the name '%s'", sourceFileName, destinationFileName)); + inputChannel.send(message); + Thread.sleep(2000); - ac.stop(); + Assert.isTrue(SftpTestUtils.fileExists(template, destinationFileName)); + System.out.println(String.format("Successfully transferred '%s' file to a " + + "remote location under the name '%s'", sourceFileName, destinationFileName)); + } + finally { + SftpTestUtils.cleanUp(template, destinationFileName); + ac.close(); + } } } diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpTestUtils.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpTestUtils.java new file mode 100644 index 000000000..c1a1d4c02 --- /dev/null +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpTestUtils.java @@ -0,0 +1,124 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.integration.samples.sftp; + +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; + +import java.io.ByteArrayInputStream; +import java.io.IOException; + +import org.springframework.beans.DirectFieldAccessor; +import org.springframework.integration.file.remote.RemoteFileTemplate; +import org.springframework.integration.file.remote.SessionCallback; +import org.springframework.integration.file.remote.session.Session; + +import com.jcraft.jsch.ChannelSftp; +import com.jcraft.jsch.ChannelSftp.LsEntry; +import com.jcraft.jsch.SftpATTRS; +import com.jcraft.jsch.SftpException; + +/** + * @author Gary Russell + * @since 4.1 + * + */ +public class SftpTestUtils { + + public static void createTestFiles(RemoteFileTemplate template, final String... fileNames) { + if (template != null) { + final ByteArrayInputStream stream = new ByteArrayInputStream("foo".getBytes()); + template.execute(new SessionCallback() { + + @Override + public Void doInSession(Session session) throws IOException { + try { + session.mkdir("si.sftp.sample"); + } + catch (Exception e) { + assertThat(e.getMessage(), containsString("failed to create")); + } + for (int i = 0; i < fileNames.length; i++) { + stream.reset(); + session.write(stream, "si.sftp.sample/" + fileNames[i]); + } + return null; + } + }); + } + } + + public static void cleanUp(RemoteFileTemplate template, final String... fileNames) { + if (template != null) { + template.execute(new SessionCallback() { + + @Override + public Void doInSession(Session session) throws IOException { + // TODO: avoid DFAs with Spring 4.1 (INT-3412) + ChannelSftp channel = (ChannelSftp) new DirectFieldAccessor(new DirectFieldAccessor(session) + .getPropertyValue("targetSession")).getPropertyValue("channel"); + for (int i = 0; i < fileNames.length; i++) { + try { + session.remove("si.sftp.sample/" + fileNames[i]); + } + catch (IOException e) {} + } + try { + // should be empty + channel.rmdir("si.sftp.sample"); + } + catch (SftpException e) { + fail("Expected remote directory to be empty " + e.getMessage()); + } + return null; + } + }); + } + } + + public static boolean fileExists(RemoteFileTemplate template, final String... fileNames) { + if (template != null) { + return template.execute(new SessionCallback() { + + @Override + public Boolean doInSession(Session session) throws IOException { + // TODO: avoid DFAs with Spring 4.1 (INT-3412) + ChannelSftp channel = (ChannelSftp) new DirectFieldAccessor(new DirectFieldAccessor(session) + .getPropertyValue("targetSession")).getPropertyValue("channel"); + for (int i = 0; i < fileNames.length; i++) { + try { + SftpATTRS stat = channel.stat("si.sftp.sample/" + fileNames[i]); + if (stat == null) { + System.out.println("stat returned null for " + fileNames[i]); + return false; + } + } + catch (SftpException e) { + System.out.println("Remote file not present: " + e.getMessage() + ": " + fileNames[i]); + return false; + } + } + return true; + } + }); + } + else { + return false; + } + } + +} diff --git a/basic/sftp/src/test/resources/META-INF/keys/sftp_rsa b/basic/sftp/src/test/resources/META-INF/keys/sftp_rsa index 05a66c803..59c7bab7e 100644 --- a/basic/sftp/src/test/resources/META-INF/keys/sftp_rsa +++ b/basic/sftp/src/test/resources/META-INF/keys/sftp_rsa @@ -1,30 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -Proc-Type: 4,ENCRYPTED -DEK-Info: DES-EDE3-CBC,89FEB82756CA8E56 - -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 -----END RSA PRIVATE KEY----- diff --git a/basic/sftp/src/test/resources/META-INF/keys/sftp_rsa.pub b/basic/sftp/src/test/resources/META-INF/keys/sftp_rsa.pub new file mode 100644 index 000000000..e790fbc53 --- /dev/null +++ b/basic/sftp/src/test/resources/META-INF/keys/sftp_rsa.pub @@ -0,0 +1 @@ +AAAAB3NzaC1yc2EAAAADAQABAAABAQDMQB/vTCY6QEF+/P73ZQZzgj5LBUG8gKPbAXdWcE/X0g3jgsPpxb7+NGiqNpP+oVIQsL9Q7TBsv1/X7xc6sd6SmM/UTP8LF0zlf0GSvEehC2BT98GCiDqI8BKpZjG6O8+pPEBY8M5iGOLtDUSzlhzyV7kPcADYLHl/z1fssU+x2UML7BoSmgh0XPc2u+Gv6+58SVk2ipAZOmaWZDyzWAc3sczz/DkQeR/cpj047HVc1Zb/M5a4ajYI18Ka+mVhKeiQnHc3NKwE6ZxcwlacbVK/feypfperHQOlj6Ee6f6huhnVx9x42V11A41Toh98WI2EVDequ4EcTxHHJntJhpbd diff --git a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml index 133727721..4743fe8f4 100644 --- a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml +++ b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpInboundReceiveSample-context.xml @@ -3,29 +3,31 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-sftp="http://www.springframework.org/schema/integration/sftp" - xmlns:task="http://www.springframework.org/schema/task" - xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/integration/sftp http://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd"> - + - - - + + + + + + + - - + + diff --git a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundGatewaySample-context.xml b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundGatewaySample-context.xml index c939e0c62..d22cf30b6 100644 --- a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundGatewaySample-context.xml +++ b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundGatewaySample-context.xml @@ -1,26 +1,28 @@ + http://www.springframework.org/schema/integration/sftp http://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd"> - + - + + + + - + - - + + + expression="payload.remoteDirectory + payload.filename"/> diff --git a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml index 82ab84814..ea53f6967 100644 --- a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml +++ b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpOutboundTransferSample-context.xml @@ -3,20 +3,23 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-sftp="http://www.springframework.org/schema/integration/sftp" - xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/integration/sftp http://www.springframework.org/schema/integration/sftp/spring-integration-sftp.xsd"> - + - - - + + + + + + + - - + + @@ -25,6 +28,6 @@ session-factory="sftpSessionFactory" channel="inputChannel" remote-filename-generator-expression="payload.getName() + '_foo'" - remote-directory="${remote.directory}"/> + remote-directory="si.sftp.sample"/> diff --git a/basic/sftp/src/test/resources/META-INF/spring/integration/SftpSampleCommon.xml b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpSampleCommon.xml new file mode 100644 index 000000000..065f6c151 --- /dev/null +++ b/basic/sftp/src/test/resources/META-INF/spring/integration/SftpSampleCommon.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + diff --git a/basic/sftp/src/test/resources/user.properties b/basic/sftp/src/test/resources/user.properties index 3780ad08f..ece0bb293 100644 --- a/basic/sftp/src/test/resources/user.properties +++ b/basic/sftp/src/test/resources/user.properties @@ -1,5 +1,7 @@ -user= -passphrase= +host=localhost +# -1 means the embedded Apache MINA SshServer. Change it to any real port, if you are going to test sample against real SFTP Server +port=-1 +username=user +passphrase=password #private.keyfile=file:/home/someuser/.ssh/id_rsa private.keyfile=classpath:META-INF/keys/sftp_rsa -remote.directory=<> diff --git a/build.gradle b/build.gradle index 92ecc1f06..0b76df18b 100644 --- a/build.gradle +++ b/build.gradle @@ -150,6 +150,7 @@ subprojects { subproject -> ext { activeMqVersion = '5.9.0' + apacheSshdVersion = '0.10.1' aspectjVersion = '1.8.0' commonsDigesterVersion = '2.0' commonsDbcpVersion = '1.2.2' @@ -652,10 +653,7 @@ project('sftp') { dependencies { compile "org.springframework.integration:spring-integration-sftp:$springIntegrationVersion" - } - - test { - exclude '**/*Sample*' + compile "org.apache.sshd:sshd-core:$apacheSshdVersion" } } From 28116776c29dab796d0a948d2377b650e22fd1ed Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 7 Aug 2014 11:02:27 +0300 Subject: [PATCH 027/356] INTSAMPLES-132 AMQP Publisher Confirms/Returns JIRA: https://jira.spring.io/browse/INTSAMPLES-132 Polishing - PR Comments --- basic/amqp/README.md | 46 ++++++++++- .../amqp/SamplePubConfirmsReturns.java | 75 ++++++++++++++++++ .../amqp/{Main.java => SampleSimple.java} | 13 ++-- .../spring-integration-confirms-context.xml | 77 +++++++++++++++++++ .../spring-integration-context.xml | 6 +- basic/amqp/src/main/resources/log4j.xml | 4 + build.gradle | 23 +++++- gradle.properties | 2 +- 8 files changed, 229 insertions(+), 17 deletions(-) create mode 100644 basic/amqp/src/main/java/org/springframework/integration/samples/amqp/SamplePubConfirmsReturns.java rename basic/amqp/src/main/java/org/springframework/integration/samples/amqp/{Main.java => SampleSimple.java} (89%) create mode 100644 basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-confirms-context.xml diff --git a/basic/amqp/README.md b/basic/amqp/README.md index 103da0e0c..d4231a941 100644 --- a/basic/amqp/README.md +++ b/basic/amqp/README.md @@ -11,13 +11,51 @@ Once the application is started, you enter some text on the command prompt and a # How to Run the Sample -If you imported the example into your IDE, you can just run class **org.springframework.integration.samples.amqp.Main**. For example in [SpringSource Tool Suite](http://www.springsource.com/developer/sts) (STS) do: +If you imported the example into your IDE, you can just run class **org.springframework.integration.samples.amqp.SampleSimple**. For example in [SpringSource Tool Suite](http://www.springsource.com/developer/sts) (STS) do: -* Right-click on Main class --> Run As --> Java Application +* Right-click on SampleSimple class --> Run As --> Java Application -Alternatively, you can start the sample from the command line ([Gradle](http://www.gradle.org) required): +Alternatively, you can start the sample from the command line: -* gradlew :amqp:run +* ./gradlew :amqp:runSimple + +Enter some data (e.g. 'foo') on the console; you will see a [tapInbound] log and 'Received: foo'. + +Ctrl-C to terminate. + +The __SamplePubConfirmsReturns__ class is similar, but demonstrates publisher confirms and returns. + +* Right-click on SamplePubConfirmsReturns class --> Run As --> Java Application + +Or: + +* ./gradlew :amqp:runPubConfirmsReturns + +When you enter a message in the console you will see the message received, together with a send confirmation: + +```` +foo +Received: foo +foo sent ok +```` + +When you enter 'fail', the message is sent with a bad routing key; you will see the message is sent ok, but returned because it is not routable: + +```` +fail +fail returned:NO_ROUTE +fail sent ok +```` + +When you enter 'nack', the message is sent to a non-existent exchange; the broker reacts to this by closing the channel with an error and Spring AMQP generates a Nack: + +```` +nack +nack send failed (nack) +11:54:00.818 ERROR [pool-1-thread-1][org.springframework.amqp.rabbit.connection.CachingConnectionFactory] Channel shutdown: channel error; protocol method: #method(reply-code=404, reply-text=NOT_FOUND - no exchange 'badExchange' in vhost '/', class-id=60, method-id=40) +```` + +Ctrl-C to terminate. # Used Spring Integration components diff --git a/basic/amqp/src/main/java/org/springframework/integration/samples/amqp/SamplePubConfirmsReturns.java b/basic/amqp/src/main/java/org/springframework/integration/samples/amqp/SamplePubConfirmsReturns.java new file mode 100644 index 000000000..10ff8af28 --- /dev/null +++ b/basic/amqp/src/main/java/org/springframework/integration/samples/amqp/SamplePubConfirmsReturns.java @@ -0,0 +1,75 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.integration.samples.amqp; + +import org.apache.log4j.Logger; + +import org.springframework.context.support.AbstractApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +/** + * Starts the Spring Context and will initialize the Spring Integration message flow. + * + * @author Gary Russell. + * @since 4.0 + * + */ +public final class SamplePubConfirmsReturns { + + private static final Logger LOGGER = Logger.getLogger(SamplePubConfirmsReturns.class); + + private SamplePubConfirmsReturns() { } + + /** + * Load the Spring Integration Application Context + * + * @param args - command line arguments + */ + public static void main(final String... args) { + + LOGGER.info("\n=========================================================" + + "\n " + + "\n Welcome to Spring Integration! " + + "\n " + + "\n For more information please visit: " + + "\n http://www.springsource.org/spring-integration " + + "\n " + + "\n=========================================================" ); + + @SuppressWarnings("resource") + final AbstractApplicationContext context = + new ClassPathXmlApplicationContext("classpath:META-INF/spring/integration/spring-integration-confirms-context.xml"); + + context.registerShutdownHook(); + + LOGGER.info("\n=========================================================" + + "\n " + + "\n This is the AMQP Sample with confirms/returns - " + + "\n " + + "\n Please enter some text and press return. The entered " + + "\n Message will be sent to the configured RabbitMQ Queue," + + "\n then again immediately retrieved from the Message " + + "\n Broker and ultimately printed to the command line. " + + "\n Send 'fail' to demonstrate a return because the " + + "\n message couldn't be routed to a queue. " + + "\n Send 'nack' to demonstrate a NACK because the " + + "\n exchange doesn't exist, causing the channel to be " + + "\n closed in error by the broker. " + + "\n " + + "\n=========================================================" ); + + } +} diff --git a/basic/amqp/src/main/java/org/springframework/integration/samples/amqp/Main.java b/basic/amqp/src/main/java/org/springframework/integration/samples/amqp/SampleSimple.java similarity index 89% rename from basic/amqp/src/main/java/org/springframework/integration/samples/amqp/Main.java rename to basic/amqp/src/main/java/org/springframework/integration/samples/amqp/SampleSimple.java index 5bab07c76..752c8ae6e 100644 --- a/basic/amqp/src/main/java/org/springframework/integration/samples/amqp/Main.java +++ b/basic/amqp/src/main/java/org/springframework/integration/samples/amqp/SampleSimple.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,14 +24,14 @@ * Starts the Spring Context and will initialize the Spring Integration message flow. * * @author Gunnar Hillert - * @version 1.0 + * @since 1.0 * */ -public final class Main { +public final class SampleSimple { - private static final Logger LOGGER = Logger.getLogger(Main.class); + private static final Logger LOGGER = Logger.getLogger(SampleSimple.class); - private Main() { } + private SampleSimple() { } /** * Load the Spring Integration Application Context @@ -49,8 +49,9 @@ public static void main(final String... args) { + "\n " + "\n=========================================================" ); + @SuppressWarnings("resource") final AbstractApplicationContext context = - new ClassPathXmlApplicationContext("classpath:META-INF/spring/integration/*-context.xml"); + new ClassPathXmlApplicationContext("classpath:META-INF/spring/integration/spring-integration-context.xml"); context.registerShutdownHook(); diff --git a/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-confirms-context.xml b/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-confirms-context.xml new file mode 100644 index 000000000..323687827 --- /dev/null +++ b/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-confirms-context.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index 0780ab185..8dac90e7e 100644 --- a/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -34,10 +34,12 @@ - + + - diff --git a/basic/amqp/src/main/resources/log4j.xml b/basic/amqp/src/main/resources/log4j.xml index 40d94ca5b..094beea28 100644 --- a/basic/amqp/src/main/resources/log4j.xml +++ b/basic/amqp/src/main/resources/log4j.xml @@ -19,6 +19,10 @@ + + + + diff --git a/build.gradle b/build.gradle index 0b76df18b..424a45e11 100644 --- a/build.gradle +++ b/build.gradle @@ -388,14 +388,29 @@ project('loanshark') { project('amqp') { description = 'AMQP Basic Sample' - apply plugin: 'application' - - mainClassName = 'org.springframework.integration.samples.amqp.Main' - dependencies { compile "org.springframework.integration:spring-integration-stream:$springIntegrationVersion" compile "org.springframework.integration:spring-integration-amqp:$springIntegrationVersion" } + + task runSimple(type: JavaExec) { + main 'org.springframework.integration.samples.amqp.SampleSimple' + classpath = sourceSets.main.runtimeClasspath + standardInput = System.in + // useful for debugging the GradleWorkerMain + // jvmArgs "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000" + + } + + task runPubConfirmsReturns(type: JavaExec) { + main 'org.springframework.integration.samples.amqp.SamplePubConfirmsReturns' + classpath = sourceSets.main.runtimeClasspath + standardInput = System.in + // useful for debugging the GradleWorkerMain + // jvmArgs "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000" + + } + } project('control-bus') { diff --git a/gradle.properties b/gradle.properties index 896b55a0f..4e776fbd3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version=2.2.0.BUILD-SNAPSHOT +version=3.0.0.BUILD-SNAPSHOT springBootVersion=1.1.0.RELEASE From 3296463fb80338787a148dfd2a4f81e7fd7d18b9 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 27 Aug 2014 17:46:54 -0400 Subject: [PATCH 028/356] TCP Sample - Use Replace expression-based transformers with now that it can handle `byte[]`. --- .../spring/integration/tcpClientServerDemo-context.xml | 10 ++++------ .../tcpServerConnectionDeserialize-context.xml | 5 ++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-context.xml b/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-context.xml index c9c6e66dd..145703a3d 100644 --- a/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-context.xml +++ b/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-context.xml @@ -33,9 +33,8 @@ request-timeout="10000" reply-timeout="10000"/> - + @@ -57,10 +56,9 @@ - + output-channel="toSA"/> - + Run As --> Java Application) +* or from the command line: + + $ gradlew :cafe-dsl:run + + diff --git a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/Application.java b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/Application.java new file mode 100644 index 000000000..55aed541c --- /dev/null +++ b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/Application.java @@ -0,0 +1,165 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.dsl.cafe; + +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.integration.annotation.Gateway; +import org.springframework.integration.annotation.IntegrationComponentScan; +import org.springframework.integration.annotation.MessagingGateway; +import org.springframework.integration.dsl.IntegrationFlow; +import org.springframework.integration.dsl.IntegrationFlows; +import org.springframework.integration.dsl.channel.MessageChannels; +import org.springframework.integration.dsl.support.Pollers; +import org.springframework.integration.samples.cafe.Delivery; +import org.springframework.integration.samples.cafe.Drink; +import org.springframework.integration.samples.cafe.DrinkType; +import org.springframework.integration.samples.cafe.Order; +import org.springframework.integration.samples.cafe.OrderItem; +import org.springframework.integration.scheduling.PollerMetadata; +import org.springframework.integration.stream.CharacterStreamWritingMessageHandler; + +/** + * @author Artem Bilan + * @since 3.0 + */ +@Configuration +@EnableAutoConfiguration +@IntegrationComponentScan +public class Application { + + public static void main(String[] args) throws InterruptedException { + ConfigurableApplicationContext ctx = SpringApplication.run(Application.class, args); + + Cafe cafe = ctx.getBean(Cafe.class); + for (int i = 1; i <= 100; i++) { + Order order = new Order(i); + order.addItem(DrinkType.LATTE, 2, false); + order.addItem(DrinkType.MOCHA, 3, true); + cafe.placeOrder(order); + } + + Thread.sleep(60000); + + ctx.close(); + } + + @MessagingGateway + public interface Cafe { + + @Gateway(requestChannel = "orders") + void placeOrder(Order order); + + } + + private AtomicInteger hotDrinkCounter = new AtomicInteger(); + + private AtomicInteger coldDrinkCounter = new AtomicInteger(); + + @Bean + public Executor taskExecutor() { + return Executors.newCachedThreadPool(); + } + + @Bean(name = PollerMetadata.DEFAULT_POLLER) + public PollerMetadata poller() { + return Pollers.fixedDelay(1000).get(); + } + + @Bean + public IntegrationFlow ordersFlow() { + return IntegrationFlows.from("orders") + .split(Order::getItems, null) + .channel(MessageChannels.executor(this.taskExecutor())) + .route(orderItem -> orderItem.isIced() ? "coldDrinks" : "hotDrinks") + .get(); + } + + @Bean + public IntegrationFlow coldDrinksFlow() { + return IntegrationFlows.from(MessageChannels.queue("coldDrinks", 10)) + .handle((orderItem, h) -> { + try { + Thread.sleep(1000); + } + catch (InterruptedException e) { + Thread.currentThread().interrupt(); + return null; + } + System.out.println(Thread.currentThread().getName() + + " prepared cold drink #" + this.coldDrinkCounter.incrementAndGet() + " for order #" + + orderItem.getOrderNumber() + ": " + orderItem); + + return orderItem; + }) + .channel("preparedDrinks") + .get(); + } + + @Bean + public IntegrationFlow hotDrinksFlow() { + return IntegrationFlows.from(MessageChannels.queue("hotDrinks", 10)) + .handle((orderItem, h) -> { + try { + Thread.sleep(5000); + } + catch (InterruptedException e) { + Thread.currentThread().interrupt(); + return null; + } + System.out.println(Thread.currentThread().getName() + + " prepared hot drink #" + this.hotDrinkCounter.incrementAndGet() + " for order #" + + orderItem.getOrderNumber() + ": " + orderItem); + + return orderItem; + }) + .channel("preparedDrinks") + .get(); + } + + + @Bean + public IntegrationFlow preparedDrinksFlow() { + return IntegrationFlows.from("preparedDrinks") + .transform(orderItem -> + new Drink(orderItem.getOrderNumber(), + orderItem.getDrinkType(), + orderItem.isIced(), + orderItem.getShots()) + ) + .aggregate(aggregator -> + aggregator.outputProcessor(g -> + new Delivery(g.getMessages() + .stream() + .map(message -> (Drink) message.getPayload()) + .collect(Collectors.toList())) + ) + .correlationStrategy(m -> ((Drink) m.getPayload()).getOrderNumber()) + , null) + .handle(CharacterStreamWritingMessageHandler.stdout()) + .get(); + } + +} diff --git a/dsl/cafe-dsl/src/test/java/org/springframework/integration/samples/dsl/cafe/ApplicationTests.java b/dsl/cafe-dsl/src/test/java/org/springframework/integration/samples/dsl/cafe/ApplicationTests.java new file mode 100644 index 000000000..a7de4b5da --- /dev/null +++ b/dsl/cafe-dsl/src/test/java/org/springframework/integration/samples/dsl/cafe/ApplicationTests.java @@ -0,0 +1,37 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.dsl.cafe; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +/** + * @author Artem Bilan + * @since 3.0 + */ +@RunWith(SpringJUnit4ClassRunner.class) +@SpringApplicationConfiguration(classes = Application.class) +public class ApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/gradle.properties b/gradle.properties index 4e776fbd3..03ec998d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ version=3.0.0.BUILD-SNAPSHOT -springBootVersion=1.1.0.RELEASE +springBootVersion=1.1.6.RELEASE From a97acde67b14b2f69b2a78b03ed6d63d6efeacdd Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Sun, 7 Sep 2014 11:10:36 -0500 Subject: [PATCH 031/356] SpringOne 2014 XML to @Config (A-E) AXML thru EDSL. FMail is the same as EDSL with placeholders GIMAP is empty --- build.gradle | 10 +- dsl/si4demo/README.md | 46 +++++++- .../si4demo/springone/GMailProperties.java | 49 +++++++++ .../samples/si4demo/springone/a/AXML.java | 40 +++++++ .../si4demo/springone/b/BXMLAndPojo.java | 59 ++++++++++ .../samples/si4demo/springone/c/CNoXML.java | 103 ++++++++++++++++++ .../samples/si4demo/springone/d/DBoot.java | 101 +++++++++++++++++ .../samples/si4demo/springone/e/EDSL.java | 69 ++++++++++++ .../samples/si4demo/springone/f/FMail.java | 67 ++++++++++++ .../samples/si4demo/springone/g/GIMAP.java | 55 ++++++++++ .../src/main/resources/AXML-context.xml | 24 ++++ .../main/resources/BXMLAndPojo-context.xml | 22 ++++ .../src/main/resources/application.yml | 12 +- dsl/si4demo/src/main/resources/logback.xml | 14 +++ 14 files changed, 663 insertions(+), 8 deletions(-) create mode 100644 dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/GMailProperties.java create mode 100644 dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/a/AXML.java create mode 100644 dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/b/BXMLAndPojo.java create mode 100644 dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/c/CNoXML.java create mode 100644 dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/d/DBoot.java create mode 100644 dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java create mode 100644 dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java create mode 100644 dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java create mode 100644 dsl/si4demo/src/main/resources/AXML-context.xml create mode 100644 dsl/si4demo/src/main/resources/BXMLAndPojo-context.xml create mode 100644 dsl/si4demo/src/main/resources/logback.xml diff --git a/build.gradle b/build.gradle index a1d7fb041..371cb19dd 100644 --- a/build.gradle +++ b/build.gradle @@ -520,13 +520,21 @@ project('si4demo') { dependencies { compile 'org.springframework.boot:spring-boot-starter-web' compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-twitter:$springIntegrationVersion" + compile "org.springframework.integration:spring-integration-mail:$springIntegration41Version" + compile "org.springframework.integration:spring-integration-twitter:$springIntegration41Version" compile "org.springframework.integration:spring-integration-java-dsl:$springIntegrationDslVersion" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile "com.sun.mail:smtp:$javaxMailVersion" + compile "com.sun.mail:pop3:$javaxMailVersion" + compile "com.sun.mail:imap:$javaxMailVersion" + compile "com.rometools:rome:1.5.0" testCompile 'org.springframework.boot:spring-boot-starter-test' } mainClassName = 'org.springframework.integration.samples.si4demo.dsl.Application' + } project('cafe-dsl') { diff --git a/dsl/si4demo/README.md b/dsl/si4demo/README.md index 05e100bf2..2e3ffffae 100644 --- a/dsl/si4demo/README.md +++ b/dsl/si4demo/README.md @@ -1,9 +1,7 @@ -#Spring Integration 4.0 Java Config/DSL Demo +#Spring Integration 4.0/4.1 Java Config/DSL Demo This sample is the demo used in the [Spring Integration 4.0 Webinar](https://spring.io/blog/2014/05/15/webinar-replay-spring-integration-4-0-the-new-frontier) -It's currently using the spring-boot 1.1.0.M1 milestone so you may have to add the __repo.spring.io/repo__ repository to your settings.xml. - There are two demo applications: __org.springframework.integration.samples.javaconfig.annotations.Application__ is a Spring Boot application using @@ -37,3 +35,45 @@ Twitter now requires authentication to perform searches; visit the [twitter deve accessTokenSecret: +Additional examples were added to this project at __SpringOne2GX 2014__ - see the __springone__ package. + +This demonstrates moving from completely XML configuration, through Java Configuration, and ultimately to the DSL. + +##AXML + +This example is pure XML - it's a simple flow... + + gateway -> transformer -> service-activator + +The transformer concatentates the payload to itself (String), the service upper cases the payload. The result is returned to the gateway. "foo" becomes "FOOFOO". + +##BXMLAndPojo + +This takes the same example and shows how to configure it using "classic" Spring Integration annotations, available since 2.0. + +##CNoXML + +This takes the same example and configures it using standard Java Configuration (available since 4.0). Many of the standard annotations are now available on __@Bean__ definitions; note that the output channel must be configured on the handler, not the annotation. __@IntegrationComponentScan__ detects __@MessagingGateway__ interfaces and creates gateways. + +##DBoot + +This takes the same example as __C...__ and configures it using Spring Boot. The configuration is slightly more concise. + +Note: Other applications in this project use the embedded web server (for http adapters). The boot apps in this section disable the embedded server by using the __SpringApplicationBuilder__ ... + + new SpringApplicationBuilder(DBoot.class) + .web(false) + .run(args); + +##EDSL + +This takes the same example and configures it using the Spring Integration Java DSL. It requires Spring Integration 4.1.0.M1 and DSL 1.0.0.M3. + +##FMail + +This adds a recipient list router and sends a copy of the payload to an SMTP Email server (add credentials to __application.yml__). + +##GIMAP + +This is a separate application that demonstrates the DSL configuring an IMAP idle channel adapter, to receive emails sent by __FEmail__. + diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/GMailProperties.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/GMailProperties.java new file mode 100644 index 000000000..78ef5e4f5 --- /dev/null +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/GMailProperties.java @@ -0,0 +1,49 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.integration.samples.si4demo.springone; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * @author Gary Russell + * + */ +@Component +@ConfigurationProperties(prefix="gmail") +public class GMailProperties { + + private String user; + + private String password; + + public String getUser() { + return user; + } + + public void setUser(String user) { + this.user = user; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + +} diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/a/AXML.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/a/AXML.java new file mode 100644 index 000000000..902b106a6 --- /dev/null +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/a/AXML.java @@ -0,0 +1,40 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.integration.samples.si4demo.springone.a; + +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +/** + * + * @author Gary Russell + * + */ +public class AXML { + + public static void main(String[] args) throws Exception { + ConfigurableApplicationContext ctx = + new ClassPathXmlApplicationContext("AXML-context.xml"); + System.out.println(ctx.getBean(FooService.class).foo("foo")); + ctx.close(); + } + + public static interface FooService { + + String foo(String request); + + } +} diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/b/BXMLAndPojo.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/b/BXMLAndPojo.java new file mode 100644 index 000000000..be62c7f3b --- /dev/null +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/b/BXMLAndPojo.java @@ -0,0 +1,59 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.integration.samples.si4demo.springone.b; + +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.annotation.MessageEndpoint; +import org.springframework.integration.annotation.ServiceActivator; +import org.springframework.integration.annotation.Transformer; + +/** + * + * @author Gary Russell + * + */ +public class BXMLAndPojo { + + public static void main(String[] args) throws Exception { + ConfigurableApplicationContext ctx = + new ClassPathXmlApplicationContext("BXMLAndPojo-context.xml"); + System.out.println(ctx.getBean(FooService.class).foo("foo")); + ctx.close(); + } + + public static interface FooService { + + String foo(String request); + + } + + @MessageEndpoint + public static class MyComponents { + + @Transformer(inputChannel="foo", outputChannel="bar") + public String transform(String foo) { + return foo + foo; + } + + @ServiceActivator(inputChannel="bar") + public String service(String foo) { + return foo.toUpperCase(); + } + + } + +} diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/c/CNoXML.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/c/CNoXML.java new file mode 100644 index 000000000..717851dc4 --- /dev/null +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/c/CNoXML.java @@ -0,0 +1,103 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.integration.samples.si4demo.springone.c; + +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.integration.annotation.IntegrationComponentScan; +import org.springframework.integration.annotation.MessagingGateway; +import org.springframework.integration.annotation.ServiceActivator; +import org.springframework.integration.annotation.Transformer; +import org.springframework.integration.channel.DirectChannel; +import org.springframework.integration.config.EnableIntegration; +import org.springframework.integration.handler.ServiceActivatingHandler; +import org.springframework.integration.transformer.MessageTransformingHandler; +import org.springframework.integration.transformer.MethodInvokingTransformer; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; + +/** + * + * @author Gary Russell + * + */ +public class CNoXML { + + public static void main(String[] args) throws Exception { + ConfigurableApplicationContext ctx = + new AnnotationConfigApplicationContext(CConfig.class); + System.out.println(ctx.getBean(FooService.class).foo("foo")); + ctx.close(); + } + + @MessagingGateway(defaultRequestChannel="foo") + public static interface FooService { + + String foo(String request); + + } + + @Configuration + @EnableIntegration + @IntegrationComponentScan + public static class CConfig { + + @Bean + public MessageChannel foo() { + return new DirectChannel(); + } + + @Transformer(inputChannel="foo") + @Bean + public MessageHandler transform() { + MessageTransformingHandler transformingHandler = new MessageTransformingHandler(new MethodInvokingTransformer(helpers(), "duplicate")); + transformingHandler.setOutputChannel(bar()); + return transformingHandler; + } + + @Bean + public MessageChannel bar() { + return new DirectChannel(); + } + + @ServiceActivator(inputChannel="bar") + @Bean + public MessageHandler service() { + return new ServiceActivatingHandler(new MethodInvokingTransformer(helpers(), "upper")); + } + + @Bean + public MyHelpers helpers() { + return new MyHelpers(); + } + + } + + public static class MyHelpers { + + public String duplicate(String foo) { + return foo + foo; + } + + public String upper(String foo) { + return foo.toUpperCase(); + } + + } + +} diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/d/DBoot.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/d/DBoot.java new file mode 100644 index 000000000..3d3ef9550 --- /dev/null +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/d/DBoot.java @@ -0,0 +1,101 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.integration.samples.si4demo.springone.d; + +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.integration.annotation.IntegrationComponentScan; +import org.springframework.integration.annotation.MessagingGateway; +import org.springframework.integration.annotation.ServiceActivator; +import org.springframework.integration.annotation.Transformer; +import org.springframework.integration.channel.DirectChannel; +import org.springframework.integration.handler.ServiceActivatingHandler; +import org.springframework.integration.transformer.MessageTransformingHandler; +import org.springframework.integration.transformer.MethodInvokingTransformer; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; + +/** + * + * @author Gary Russell + * + */ +@Configuration +@EnableAutoConfiguration +@IntegrationComponentScan +public class DBoot { + + public static void main(String[] args) throws Exception { + ConfigurableApplicationContext ctx = + new SpringApplicationBuilder(DBoot.class) + .web(false) + .run(args); + System.out.println(ctx.getBean(FooService.class).foo("foo")); + ctx.close(); + } + + @MessagingGateway(defaultRequestChannel="foo") + public static interface FooService { + + String foo(String request); + + } + + @Bean + public MessageChannel foo() { + return new DirectChannel(); + } + + @Transformer(inputChannel="foo") + @Bean + public MessageHandler transform() { + MessageTransformingHandler transformingHandler = new MessageTransformingHandler(new MethodInvokingTransformer(helpers(), "duplicate")); + transformingHandler.setOutputChannel(bar()); + return transformingHandler; + } + + @Bean + public MessageChannel bar() { + return new DirectChannel(); + } + + @ServiceActivator(inputChannel="bar") + @Bean + public MessageHandler service() { + return new ServiceActivatingHandler(new MethodInvokingTransformer(helpers(), "upper")); + } + + @Bean + public MyHelpers helpers() { + return new MyHelpers(); + } + + public static class MyHelpers { + + public String duplicate(String foo) { + return foo + foo; + } + + public String upper(String foo) { + return foo.toUpperCase(); + } + + } + +} diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java new file mode 100644 index 000000000..b071d388b --- /dev/null +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java @@ -0,0 +1,69 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.integration.samples.si4demo.springone.e; + +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.integration.annotation.IntegrationComponentScan; +import org.springframework.integration.annotation.MessagingGateway; +import org.springframework.integration.channel.DirectChannel; +import org.springframework.integration.dsl.IntegrationFlow; +import org.springframework.integration.dsl.IntegrationFlows; +import org.springframework.messaging.MessageChannel; + +/** + * + * @author Gary Russell + * + */ +@Configuration +@EnableAutoConfiguration +@IntegrationComponentScan +public class EDSL { + + public static void main(String[] args) throws Exception { + ConfigurableApplicationContext ctx = + new SpringApplicationBuilder(EDSL.class) + .web(false) + .run(args); + System.out.println(ctx.getBean(FooService.class).foo("foo")); + ctx.close(); + } + + @MessagingGateway(defaultRequestChannel="foo") + public static interface FooService { + + String foo(String request); + + } + + @Bean + public MessageChannel foo() { + return new DirectChannel(); + } + + @Bean + IntegrationFlow flow() { + return IntegrationFlows.from(foo()) + .transform("payload + payload") + .handle(String.class, (p, h) -> p.toUpperCase()) + .get(); + } + +} diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java new file mode 100644 index 000000000..40bc3d0f8 --- /dev/null +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java @@ -0,0 +1,67 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.integration.samples.si4demo.springone.f; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.integration.annotation.IntegrationComponentScan; +import org.springframework.integration.annotation.MessagingGateway; +import org.springframework.integration.dsl.IntegrationFlow; +import org.springframework.integration.samples.si4demo.springone.GMailProperties; + +/** + * + * @author Gary Russell + * + */ +@Configuration +@EnableConfigurationProperties(GMailProperties.class) +@EnableAutoConfiguration +@IntegrationComponentScan +public class FMail { + + @Autowired + GMailProperties gmail; + + public static void main(String[] args) throws Exception { + ConfigurableApplicationContext ctx = + SpringApplication.run(FMail.class); + System.out.println(ctx.getBean(FooService.class).foo("foo")); + ctx.close(); + } + + @MessagingGateway(defaultRequestChannel="foo.input") + public static interface FooService { + + String foo(String request); + + } + + @Bean + IntegrationFlow foo() { + return f -> f + .transform("payload + payload") + .handle(String.class, (p, h) -> p.toUpperCase()) + //RLR + ; + } + +} diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java new file mode 100644 index 000000000..ac93156a9 --- /dev/null +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java @@ -0,0 +1,55 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.integration.samples.si4demo.springone.g; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.integration.dsl.IntegrationFlow; +import org.springframework.integration.samples.si4demo.springone.GMailProperties; + +/** + * + * @author Gary Russell + * + */ +@Configuration +@EnableConfigurationProperties(GMailProperties.class) + +@EnableAutoConfiguration +public class GIMAP { + + @Autowired + GMailProperties gmail; + + public static void main(String[] args) throws Exception { + ConfigurableApplicationContext ctx = + SpringApplication.run(GIMAP.class); + System.out.println("Hit Enter to terminate"); + System.in.read(); + ctx.close(); + } + + @Bean + IntegrationFlow imapIdle() { + return null; + } + +} diff --git a/dsl/si4demo/src/main/resources/AXML-context.xml b/dsl/si4demo/src/main/resources/AXML-context.xml new file mode 100644 index 000000000..fb71889f4 --- /dev/null +++ b/dsl/si4demo/src/main/resources/AXML-context.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + diff --git a/dsl/si4demo/src/main/resources/BXMLAndPojo-context.xml b/dsl/si4demo/src/main/resources/BXMLAndPojo-context.xml new file mode 100644 index 000000000..2a1c0e939 --- /dev/null +++ b/dsl/si4demo/src/main/resources/BXMLAndPojo-context.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + diff --git a/dsl/si4demo/src/main/resources/application.yml b/dsl/si4demo/src/main/resources/application.yml index 1e769b810..da687ee41 100644 --- a/dsl/si4demo/src/main/resources/application.yml +++ b/dsl/si4demo/src/main/resources/application.yml @@ -1,6 +1,10 @@ twitter: oauth: - consumerKey: - consumerSecret: - accessToken: - accessTokenSecret: + consumerKey: + consumerSecret: + accessToken: + accessTokenSecret: + + gmail: + user: + password: diff --git a/dsl/si4demo/src/main/resources/logback.xml b/dsl/si4demo/src/main/resources/logback.xml new file mode 100644 index 000000000..ac9982f05 --- /dev/null +++ b/dsl/si4demo/src/main/resources/logback.xml @@ -0,0 +1,14 @@ + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + \ No newline at end of file From 59dcdd915e42fb7f403e223095610f57ca5a722d Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Mon, 8 Sep 2014 12:55:53 -0500 Subject: [PATCH 032/356] SpringOne 2014 @Config to DSL (E-G) --- .../samples/si4demo/springone/f/FMail.java | 44 +++++++++++++++++-- .../samples/si4demo/springone/g/GIMAP.java | 26 +++++++++-- 2 files changed, 63 insertions(+), 7 deletions(-) diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java index 40bc3d0f8..79549a6c4 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java @@ -16,16 +16,21 @@ package org.springframework.integration.samples.si4demo.springone.f; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.integration.annotation.BridgeTo; import org.springframework.integration.annotation.IntegrationComponentScan; import org.springframework.integration.annotation.MessagingGateway; +import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.dsl.IntegrationFlow; +import org.springframework.integration.dsl.IntegrationFlows; +import org.springframework.integration.dsl.mail.Mail; import org.springframework.integration.samples.si4demo.springone.GMailProperties; +import org.springframework.messaging.MessageChannel; /** * @@ -43,7 +48,9 @@ public class FMail { public static void main(String[] args) throws Exception { ConfigurableApplicationContext ctx = - SpringApplication.run(FMail.class); + new SpringApplicationBuilder(FMail.class) + .web(false) + .run(args); System.out.println(ctx.getBean(FooService.class).foo("foo")); ctx.close(); } @@ -60,8 +67,37 @@ IntegrationFlow foo() { return f -> f .transform("payload + payload") .handle(String.class, (p, h) -> p.toUpperCase()) - //RLR - ; + .routeToRecipients(r -> + r.recipient("bridgeToNowhere", "true") + .recipient("smtpChannel", "true")); + } + + @BridgeTo + @Bean + public MessageChannel bridgeToNowhere() { + return new DirectChannel(); + } + + @Bean + public MessageChannel smtpChannel() { + return new DirectChannel(); + } + + @Bean + IntegrationFlow smtp() { + return IntegrationFlows.from(smtpChannel()) + .enrichHeaders(Mail.headers() + .subject("SpringOne 2014") + .to("sispringone@gmail.com") + .from("sispringone@gmail.com")) + .handle(Mail.outboundAdapter("smtp.gmail.com") + .port(465) + .protocol("smtps") + .credentials(gmail.getUser(), gmail.getPassword()) + .javaMailProperties(p -> + p.put("mail.debug", "false")) + , e -> e.id("smtpOut")) + .get(); } } diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java index ac93156a9..53f678114 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java @@ -16,13 +16,16 @@ package org.springframework.integration.samples.si4demo.springone.g; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.integration.dsl.IntegrationFlow; +import org.springframework.integration.dsl.IntegrationFlows; +import org.springframework.integration.dsl.mail.Mail; +import org.springframework.integration.mail.MailHeaders; import org.springframework.integration.samples.si4demo.springone.GMailProperties; /** @@ -41,7 +44,9 @@ public class GIMAP { public static void main(String[] args) throws Exception { ConfigurableApplicationContext ctx = - SpringApplication.run(GIMAP.class); + new SpringApplicationBuilder(GIMAP.class) + .web(false) + .run(args); System.out.println("Hit Enter to terminate"); System.in.read(); ctx.close(); @@ -49,7 +54,22 @@ public static void main(String[] args) throws Exception { @Bean IntegrationFlow imapIdle() { - return null; + return IntegrationFlows.from(Mail.imapIdleAdapter( + "imaps://" + + gmail.getUser().replaceAll("@", "%40") + + ":" + + gmail.getPassword() + + "@imap.gmail.com:993/INBOX") + .id("imapIn") + .autoStartup(true) + .javaMailProperties(p -> + p.put("mail.debug", "false"))) + .enrichHeaders(s -> s.headerExpressions(h -> h + .put(MailHeaders.SUBJECT, "payload.subject") + .put(MailHeaders.FROM, "payload.from[0].toString()"))) + .transform("payload.content") + .handle(System.out::println) + .get(); } } From f37f993499dbd824430274f2a865ed05860fc9ae Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 25 Sep 2014 12:32:13 +0100 Subject: [PATCH 033/356] SpringOne ReadMe Updates --- dsl/si4demo/README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dsl/si4demo/README.md b/dsl/si4demo/README.md index 2e3ffffae..219a1e672 100644 --- a/dsl/si4demo/README.md +++ b/dsl/si4demo/README.md @@ -1,8 +1,8 @@ #Spring Integration 4.0/4.1 Java Config/DSL Demo -This sample is the demo used in the [Spring Integration 4.0 Webinar](https://spring.io/blog/2014/05/15/webinar-replay-spring-integration-4-0-the-new-frontier) +This sample is the demo used in the [Spring Integration 4.0 Webinar](https://spring.io/blog/2014/05/15/webinar-replay-spring-integration-4-0-the-new-frontier) and SpringOne/2GX 2014. -There are two demo applications: +There are two demo applications from the webinar: __org.springframework.integration.samples.javaconfig.annotations.Application__ is a Spring Boot application using Spring Integration 4.0 Java configuration features. @@ -35,6 +35,9 @@ Twitter now requires authentication to perform searches; visit the [twitter deve accessTokenSecret: + +#SpringOne/2GX 2014 + Additional examples were added to this project at __SpringOne2GX 2014__ - see the __springone__ package. This demonstrates moving from completely XML configuration, through Java Configuration, and ultimately to the DSL. From 1914a54f3c0e9ffe82c504c74810abd0e5ccbf50 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 26 Sep 2014 14:05:16 +0300 Subject: [PATCH 034/356] Fix `si4demo` issues --- .../integration/samples/si4demo/springone/g/GIMAP.java | 2 +- dsl/si4demo/src/main/resources/application.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java index 53f678114..aee3eb1d7 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java @@ -68,7 +68,7 @@ IntegrationFlow imapIdle() { .put(MailHeaders.SUBJECT, "payload.subject") .put(MailHeaders.FROM, "payload.from[0].toString()"))) .transform("payload.content") - .handle(System.out::println) + .handle(System.out::println) .get(); } diff --git a/dsl/si4demo/src/main/resources/application.yml b/dsl/si4demo/src/main/resources/application.yml index da687ee41..6b5cfc848 100644 --- a/dsl/si4demo/src/main/resources/application.yml +++ b/dsl/si4demo/src/main/resources/application.yml @@ -5,6 +5,6 @@ twitter: accessToken: accessTokenSecret: - gmail: +gmail: user: password: From a5c12343c675d64b4ad45c9298464ef9c032ab60 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 10 Sep 2014 19:06:28 +0300 Subject: [PATCH 035/356] INTSAMPLES-137: Add WebSockets sample JIRA: https://jira.spring.io/browse/INTSAMPLES-137 Depends on https://github.com/spring-projects/spring-integration/pull/1274 Polishing and cleanup * Fix `cafe-dsl` project: https://build.spring.io/browse/INTSAMPLES-NIGHTLY-JOB1-1131 * Change author emails to the `pivotal.io` * Regenerate poms Fix for `Cafe-DSL` sample https://build.spring.io/browse/INTSAMPLES-NIGHTLY-JOB1-1143 --- advanced/advanced-testing-examples/pom.xml | 36 ++--- advanced/dynamic-ftp/pom.xml | 34 ++--- advanced/pom.xml | 10 +- applications/cafe-scripted/pom.xml | 38 ++--- applications/cafe/cafe-amqp/pom.xml | 36 ++--- applications/cafe/cafe-jms/pom.xml | 36 ++--- applications/cafe/cafe-si/pom.xml | 34 ++--- applications/cafe/pom.xml | 10 +- applications/loan-broker/pom.xml | 34 ++--- applications/loanshark/pom.xml | 98 ++++++------ applications/pom.xml | 10 +- basic/amqp/pom.xml | 42 +++--- basic/control-bus/pom.xml | 24 +-- basic/enricher/pom.xml | 24 +-- basic/feed/pom.xml | 34 ++--- basic/file/pom.xml | 34 ++--- basic/ftp/pom.xml | 46 +++--- basic/helloworld/pom.xml | 24 +-- basic/http/pom.xml | 32 ++-- basic/jdbc/pom.xml | 30 ++-- basic/jms/pom.xml | 46 +++--- basic/jmx/pom.xml | 38 ++--- basic/jpa/pom.xml | 36 ++--- basic/mail/pom.xml | 36 ++--- basic/mongodb/pom.xml | 24 +-- basic/oddeven/pom.xml | 24 +-- basic/pom.xml | 10 +- basic/quote/pom.xml | 34 ++--- basic/sftp/pom.xml | 32 ++-- basic/tcp-amqp/pom.xml | 34 ++--- basic/tcp-client-server/pom.xml | 36 ++--- basic/testing-examples/pom.xml | 38 ++--- basic/twitter/pom.xml | 24 +-- basic/web-sockets/README.md | 29 ++++ basic/web-sockets/pom.xml | 123 +++++++++++++++ .../standard/client/Application.java | 34 +++++ .../standard/server/Application.java | 142 ++++++++++++++++++ .../standard/client/client-context.xml | 24 +++ .../src/main/resources/static/index.html | 34 +++++ .../websocket/standard/ApplicationTests.java | 85 +++++++++++ basic/ws-inbound-gateway/pom.xml | 36 ++--- basic/ws-outbound-gateway/pom.xml | 38 ++--- basic/xml/pom.xml | 32 ++-- basic/xmpp/pom.xml | 30 ++-- build.gradle | 34 ++++- dsl/cafe-dsl/pom.xml | 129 ++++++++++++++++ .../samples/dsl/cafe/Application.java | 3 + dsl/pom.xml | 92 ++++++++++++ dsl/si4demo/pom.xml | 134 +++++++++++++++++ intermediate/async-gateway/pom.xml | 30 ++-- intermediate/dynamic-poller/pom.xml | 24 +-- intermediate/errorhandling/pom.xml | 34 ++--- intermediate/file-processing/pom.xml | 34 ++--- intermediate/mail-attachments/pom.xml | 48 +++--- intermediate/monitoring/pom.xml | 42 +++--- intermediate/multipart-http/pom.xml | 32 ++-- intermediate/pom.xml | 10 +- intermediate/rest-http/pom.xml | 74 ++++----- intermediate/retry-and-more/pom.xml | 56 +++---- .../splitter-aggregator-reaper/pom.xml | 24 +-- intermediate/stored-procedures-derby/pom.xml | 30 ++-- intermediate/stored-procedures-ms/pom.xml | 30 ++-- intermediate/stored-procedures-oracle/pom.xml | 36 ++--- .../stored-procedures-postgresql/pom.xml | 30 ++-- .../tcp-client-server-multiplex/pom.xml | 36 ++--- intermediate/travel/pom.xml | 40 ++--- intermediate/tx-synch/pom.xml | 38 ++--- 67 files changed, 1792 insertions(+), 933 deletions(-) create mode 100644 basic/web-sockets/README.md create mode 100644 basic/web-sockets/pom.xml create mode 100644 basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/client/Application.java create mode 100644 basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java create mode 100644 basic/web-sockets/src/main/resources/org/springframework/integration/samples/websocket/standard/client/client-context.xml create mode 100644 basic/web-sockets/src/main/resources/static/index.html create mode 100644 basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java create mode 100644 dsl/cafe-dsl/pom.xml create mode 100644 dsl/pom.xml create mode 100644 dsl/si4demo/pom.xml diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 6f81d6721..baa05c9a3 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples advanced-testing-examples - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Advanced Testing Examples Advanced Testing Examples http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,10 +60,16 @@ + + org.springframework.integration + spring-integration-groovy + 4.0.4.RELEASE + compile + org.springframework.integration spring-integration-jms - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -78,6 +84,12 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + javax.jms jms-api @@ -90,23 +102,11 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-groovy - 4.0.0.RELEASE - compile - org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index d6e881029..a921b5ce0 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples dynamic-ftp - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Dynamic FTP Demo Dynamic FTP Demo http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-ftp - 4.0.0.RELEASE - compile - junit junit @@ -78,23 +72,29 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-ftp + 4.0.4.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/advanced/pom.xml b/advanced/pom.xml index 68aa7f9aa..dbe052540 100644 --- a/advanced/pom.xml +++ b/advanced/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples advanced - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO @@ -21,7 +21,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -29,7 +29,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -37,12 +37,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 7be0ee76b..5c3d96f2e 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe-scripted - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Cafe Sample (Scripted Implementation) Cafe Sample (Scripted Implementation) http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -62,14 +62,14 @@ org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE + spring-integration-groovy + 4.0.4.RELEASE compile org.springframework.integration spring-integration-rmi - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -85,15 +85,15 @@ test - org.springframework.integration - spring-integration-jmx - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test org.codehaus.groovy groovy-all - 2.2.2 + 2.3.0 compile @@ -110,8 +110,8 @@ org.springframework.integration - spring-integration-groovy - 4.0.0.RELEASE + spring-integration-stream + 4.0.4.RELEASE compile @@ -127,10 +127,10 @@ test - org.springframework - spring-test - 4.0.3.RELEASE - test + org.springframework.integration + spring-integration-jmx + 4.0.4.RELEASE + compile diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 09326c6a0..385b49cfb 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe-amqp - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Cafe - With AMQP Message Broker Cafe - With AMQP Message Broker http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration.samples + cafe-si + 3.0.0.BUILD-SNAPSHOT + compile + junit junit @@ -73,10 +79,10 @@ test - org.springframework.integration - spring-integration-amqp - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -85,9 +91,9 @@ compile - org.springframework.integration.samples - cafe-si - 2.2.0.BUILD-SNAPSHOT + org.springframework.integration + spring-integration-amqp + 4.0.4.RELEASE compile @@ -96,11 +102,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index c620d0450..e32d18977 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe-jms - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Cafe - With JMS Message Broker Cafe - With JMS Message Broker http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,10 +60,16 @@ + + org.springframework.integration.samples + cafe-si + 3.0.0.BUILD-SNAPSHOT + compile + org.springframework.integration spring-integration-jms - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -78,30 +84,24 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j 1.2.17 compile - - org.springframework.integration.samples - cafe-si - 2.2.0.BUILD-SNAPSHOT - compile - org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - org.apache.activemq activemq-broker diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index a55b39c6c..59e733885 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe-si - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Cafe - Pure Spring Integration Cafe - Pure Spring Integration http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE - compile - junit junit @@ -78,12 +72,24 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-stream + 4.0.4.RELEASE + compile + com.fasterxml.jackson.core jackson-databind @@ -96,11 +102,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index 13dbcc2b1..d61bdbdcb 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO @@ -21,7 +21,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -29,7 +29,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -37,12 +37,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 66f28f694..d653118e8 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples loan-broker - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Loan Broker Sample Loan Broker Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-ip + 4.0.4.RELEASE + compile + junit junit @@ -72,29 +78,23 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j 1.2.17 compile - - org.springframework.integration - spring-integration-ip - 4.0.0.RELEASE - compile - org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 6b679bd03..4e44479b7 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples loanshark - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT war Loan Shark Sample Loan Shark Sample @@ -24,7 +24,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -32,7 +32,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -40,12 +40,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -75,12 +75,6 @@ - - org.springframework - spring-context - 4.0.3.RELEASE - compile - org.slf4j slf4j-log4j12 @@ -99,12 +93,6 @@ 4.11 test - - org.springframework - spring-jdbc - 4.0.3.RELEASE - compile - commons-fileupload commons-fileupload @@ -112,39 +100,39 @@ compile - org.aspectj - aspectjtools - 1.8.0 + org.springframework + spring-aop + 4.0.7.RELEASE compile - org.hibernate - hibernate-entitymanager - 4.2.11.Final + org.springframework + spring-context + 4.0.7.RELEASE compile - commons-pool - commons-pool - 1.5.4 + org.aspectj + aspectjtools + 1.8.0 compile org.springframework - spring-aop - 4.0.3.RELEASE + spring-webmvc + 4.0.7.RELEASE compile - org.springframework - spring-tx - 4.0.3.RELEASE + org.hibernate + hibernate-entitymanager + 4.2.11.Final compile - org.springframework - spring-aspects - 4.0.3.RELEASE + commons-pool + commons-pool + 1.5.4 compile @@ -191,14 +179,14 @@ org.springframework - spring-test - 4.0.3.RELEASE - test + spring-jdbc + 4.0.7.RELEASE + compile - org.springframework - spring-webmvc - 4.0.3.RELEASE + org.springframework.integration + spring-integration-ip + 4.0.4.RELEASE compile @@ -208,9 +196,21 @@ compile - org.springframework.integration - spring-integration-ip - 4.0.0.RELEASE + org.springframework + spring-test + 4.0.7.RELEASE + test + + + org.springframework + spring-orm + 4.0.7.RELEASE + compile + + + org.springframework + spring-aspects + 4.0.7.RELEASE compile @@ -225,18 +225,18 @@ 1.3 test - - org.springframework - spring-orm - 4.0.3.RELEASE - compile - commons-digester commons-digester 2.0 compile + + org.springframework + spring-tx + 4.0.7.RELEASE + compile + net.sf.flexjson flexjson diff --git a/applications/pom.xml b/applications/pom.xml index 4c927b2fa..761bca6e7 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples applications - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO @@ -21,7 +21,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -29,7 +29,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -37,12 +37,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index e9df737b0..e45bd308f 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples amqp - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT AMQP Basic Sample AMQP Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE - compile - junit junit @@ -79,10 +73,10 @@ test - org.springframework.integration - spring-integration-amqp - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -90,17 +84,23 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-stream + 4.0.4.RELEASE + compile + + + org.springframework.integration + spring-integration-amqp + 4.0.4.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 20a3fae5b..f400d5403 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples control-bus - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Control Bus Basic Sample Control Bus Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,10 +72,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-core - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -90,11 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index ab10e3c59..aab6903b1 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples enricher - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Enricher Basic Sample Enricher Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -78,10 +78,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-core - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -96,11 +102,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index e725d5071..21d72a6e2 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples feed - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Feed (RSS/ATOM) Basic Sample Feed (RSS/ATOM) Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-feed - 4.0.0.RELEASE - compile - junit junit @@ -78,23 +72,29 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-feed + 4.0.4.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/file/pom.xml b/basic/file/pom.xml index b577e002c..353d5fef7 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples file - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT File Copy Basic Sample File Copy Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,6 +72,18 @@ 1.3 test + + org.springframework.integration + spring-integration-file + 4.0.4.RELEASE + compile + + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j @@ -84,17 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - - - org.springframework.integration - spring-integration-file - 4.0.0.RELEASE - compile - diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 9d198498b..915b5f49a 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples ftp - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT FTP Basic Sample FTP Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -66,12 +66,6 @@ 1.7.6 compile - - org.springframework.integration - spring-integration-ftp - 4.0.0.RELEASE - compile - junit junit @@ -84,41 +78,47 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + commons-io commons-io 2.4 compile - - org.springframework.integration - spring-integration-test - 4.0.0.RELEASE - test - org.apache.ftpserver ftpserver-core 1.0.6 compile + + org.springframework.integration + spring-integration-test + 4.0.4.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-ftp + 4.0.4.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 14bc2d5cc..2e4b9db8d 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples helloworld - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Hello World Sample Hello World Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,10 +72,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-core - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -90,11 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/http/pom.xml b/basic/http/pom.xml index e99ee3849..ca36903e2 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples http - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT war HTTP Sample HTTP Sample @@ -24,7 +24,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -32,7 +32,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -40,12 +40,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -78,7 +78,7 @@ org.springframework spring-webmvc - 4.0.3.RELEASE + 4.0.7.RELEASE compile @@ -95,10 +95,16 @@ org.springframework.integration - spring-integration-http - 4.0.0.RELEASE + spring-integration-mail + 4.0.4.RELEASE compile + + org.springframework + spring-test + 4.0.7.RELEASE + test + commons-io commons-io @@ -107,8 +113,8 @@ org.springframework.integration - spring-integration-mail - 4.0.0.RELEASE + spring-integration-http + 4.0.4.RELEASE compile @@ -135,11 +141,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 4ed7c84eb..c4f3578cf 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples jdbc - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT JDBC Basic Sample JDBC Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-jdbc + 4.0.4.RELEASE + compile + com.h2database h2 @@ -79,10 +85,10 @@ test - org.springframework.integration - spring-integration-jdbc - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -96,11 +102,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index dfd43b9b2..fd15f588f 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples jms - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT JMS Basic Sample JMS Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -61,21 +61,15 @@ - org.springframework.integration - spring-integration-jms - 4.0.0.RELEASE + org.slf4j + slf4j-log4j12 + 1.7.6 compile org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE - compile - - - org.slf4j - slf4j-log4j12 - 1.7.6 + spring-integration-jms + 4.0.4.RELEASE compile @@ -90,10 +84,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-test - 4.0.0.RELEASE + 4.0.4.RELEASE test @@ -102,18 +102,18 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-stream + 4.0.4.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - org.apache.activemq activemq-broker diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 172fd55b0..dbe761e34 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples jmx - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT JMX Basic Sample JMX Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE - compile - junit junit @@ -79,10 +73,10 @@ test - org.springframework.integration - spring-integration-jmx - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -90,6 +84,12 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-stream + 4.0.4.RELEASE + compile + org.mockito mockito-core @@ -97,10 +97,10 @@ test - org.springframework - spring-test - 4.0.3.RELEASE - test + org.springframework.integration + spring-integration-jmx + 4.0.4.RELEASE + compile diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 30238f61c..1c1ea3296 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples jpa - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT JPA Basic Sample JPA Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -84,18 +84,18 @@ 4.11 test - - org.springframework - spring-instrument - 4.0.3.RELEASE - runtime - org.hamcrest hamcrest-all 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.apache.openjpa openjpa @@ -105,9 +105,15 @@ org.springframework.integration spring-integration-jpa - 4.0.0.RELEASE + 4.0.4.RELEASE compile + + org.springframework + spring-instrument + 4.0.7.RELEASE + runtime + org.eclipse.persistence javax.persistence @@ -126,11 +132,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 1a7ee7e59..e372611c9 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples mail - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Mail (IMAP + POP3) Sample Mail (IMAP + POP3) Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework - spring-context - 4.0.3.RELEASE - compile - junit junit @@ -81,9 +75,15 @@ org.springframework.integration spring-integration-mail - 4.0.0.RELEASE + 4.0.4.RELEASE compile + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j @@ -102,17 +102,17 @@ 1.4.7 compile + + org.springframework + spring-context + 4.0.7.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index e2d004a69..4919ab879 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples mongodb - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT MongoDb Basic Sample MongoDb Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -63,7 +63,7 @@ org.springframework.integration spring-integration-mongodb - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -78,6 +78,12 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j @@ -90,11 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 5da4f94fc..ed19b258b 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples oddeven - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Odd-Even Sample Odd-Even Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,10 +72,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-core - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -90,11 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/pom.xml b/basic/pom.xml index acfeb9687..4c0a86208 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples basic - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO @@ -21,7 +21,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -29,7 +29,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -37,12 +37,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 11a7e6610..c50612da3 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples quote - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Quote Sample Quote Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE - compile - junit junit @@ -78,23 +72,29 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-stream + 4.0.4.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 06eea9708..df3d59303 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples sftp - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT SFTP Basic Sample SFTP Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -66,6 +66,12 @@ 4.11 test + + org.springframework.integration + spring-integration-sftp + 4.0.4.RELEASE + compile + org.hamcrest hamcrest-all @@ -73,10 +79,10 @@ test - org.springframework.integration - spring-integration-sftp - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -91,10 +97,10 @@ test - org.springframework - spring-test - 4.0.3.RELEASE - test + org.apache.sshd + sshd-core + 0.10.1 + compile diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 39a1fb499..71835ef5d 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples tcp-amqp - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT TCP-AMQP Basic Sample TCP-AMQP Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-ip + 4.0.4.RELEASE + compile + org.slf4j slf4j-log4j12 @@ -79,10 +85,10 @@ test - org.springframework.integration - spring-integration-amqp - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -92,8 +98,8 @@ org.springframework.integration - spring-integration-ip - 4.0.0.RELEASE + spring-integration-amqp + 4.0.4.RELEASE compile @@ -102,11 +108,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 63d562942..7a0425acc 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT TCP Client Server Sample TCP Client Server Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-ip + 4.0.4.RELEASE + compile + commons-lang commons-lang @@ -78,10 +84,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-test - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -90,23 +102,11 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-ip - 4.0.0.RELEASE - compile - org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 4fe9ac3e5..883113892 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples testing-examples - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Testing Examples Testing Examples http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -63,7 +63,7 @@ org.springframework spring-webmvc - 4.0.3.RELEASE + 4.0.7.RELEASE compile @@ -80,20 +80,26 @@ org.springframework.integration - spring-integration-http - 4.0.0.RELEASE + spring-integration-file + 4.0.4.RELEASE compile + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration - spring-integration-ws - 4.0.0.RELEASE + spring-integration-http + 4.0.4.RELEASE compile org.springframework.integration spring-integration-test - 4.0.0.RELEASE + 4.0.4.RELEASE test @@ -108,16 +114,10 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - org.springframework.integration - spring-integration-file - 4.0.0.RELEASE + spring-integration-ws + 4.0.4.RELEASE compile diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index ddf3fda0a..f3fdf022f 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples twitter - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Twitter Basic Sample Twitter Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,10 +72,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-twitter - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -90,11 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/web-sockets/README.md b/basic/web-sockets/README.md new file mode 100644 index 000000000..632ed9b9a --- /dev/null +++ b/basic/web-sockets/README.md @@ -0,0 +1,29 @@ +WebSockets Sample +============== + +This example demonstrates the Standard WebSocket protocol (without any sub-protocols) with Spring Integration Adapters. +It just sends current time from the server to all connected clients. + +## Server + +The server is presented only with a single `org.springframework.integration.samples.websocket.standard.server.Application` +class, which is based on the Spring Boot AutoConfiguration and Spring Integration Java & Annotation configuration. +It is a `main` and starts an embedded Tomcat server on the default `8080` port. The WebSocket endpoint is mapped to the `/time` path. + +The server also can be run from Gradle `gradlew :web-sockets:run` + +## Java Client + +The `org.springframework.integration.samples.websocket.standard.client.Application` is a simple Java application, + which starts an integration flow (`client-context.xml`), connects to the WebSocket server and prints `Message`s to the + logs, which are received over WebSocket. + +## Browser Client + +The `index.html` in the `src/main/resources/static` directory of this project demonstrates a JavaScript `SockJS` client, which connects +to our server and just prints its messages in the middle of page. + +## Test Case + +The `org.springframework.integration.samples.websocket.standard.ApplicationTests` demonstrates the Spring Boot test +framework and starts Server & Client to check, that the client receives correct data. diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml new file mode 100644 index 000000000..fbfc884d1 --- /dev/null +++ b/basic/web-sockets/pom.xml @@ -0,0 +1,123 @@ + + + 4.0.0 + + spring-boot-starter-parent + org.springframework.boot + 1.1.6.RELEASE + + org.springframework.integration.samples + web-sockets + 3.0.0.BUILD-SNAPSHOT + Web Sockets Basic Sample + Web Sockets Basic Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@pivotal.io + + project lead + + + + markfisher + Mark Fisher + mfisher@pivotal.io + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@pivotal.io + + + abilan + Artem Bilan + abilan@pivotal.io + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.boot + spring-boot-starter-websocket + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework + spring-test + 4.0.7.RELEASE + test + + + org.springframework.boot + spring-boot-starter-test + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + org.springframework.integration + spring-integration-websocket + 4.1.0.BUILD-SNAPSHOT + compile + + + diff --git a/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/client/Application.java b/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/client/Application.java new file mode 100644 index 000000000..32c601f37 --- /dev/null +++ b/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/client/Application.java @@ -0,0 +1,34 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.websocket.standard.client; + +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +/** + * @author Artem Bilan + * @since 3.0 + */ +public class Application { + + public static void main(String[] args) throws Exception { + ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext("client-context.xml", Application.class); + System.in.read(); + ctx.close(); + } + +} diff --git a/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java b/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java new file mode 100644 index 000000000..3689de478 --- /dev/null +++ b/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java @@ -0,0 +1,142 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.websocket.standard.server; + +import java.text.DateFormat; +import java.util.Collections; +import java.util.Date; +import java.util.Iterator; +import java.util.concurrent.Executors; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.integration.annotation.InboundChannelAdapter; +import org.springframework.integration.annotation.Poller; +import org.springframework.integration.annotation.ServiceActivator; +import org.springframework.integration.annotation.Transformer; +import org.springframework.integration.channel.DirectChannel; +import org.springframework.integration.channel.ExecutorChannel; +import org.springframework.integration.channel.PublishSubscribeChannel; +import org.springframework.integration.core.MessageSource; +import org.springframework.integration.handler.LoggingHandler; +import org.springframework.integration.splitter.DefaultMessageSplitter; +import org.springframework.integration.transformer.AbstractPayloadTransformer; +import org.springframework.integration.transformer.HeaderEnricher; +import org.springframework.integration.transformer.support.ExpressionEvaluatingHeaderValueMessageProcessor; +import org.springframework.integration.websocket.ServerWebSocketContainer; +import org.springframework.integration.websocket.outbound.WebSocketOutboundMessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.simp.SimpMessageHeaderAccessor; +import org.springframework.messaging.support.GenericMessage; + +/** + * @author Artem Bilan + * @since 3.0 + */ +@Configuration +@EnableAutoConfiguration +public class Application { + + public static void main(String[] args) throws Exception { + ConfigurableApplicationContext ctx = SpringApplication.run(Application.class); + System.out.println("Hit 'Enter' to terminate"); + System.in.read(); + ctx.close(); + } + + @Bean + public ServerWebSocketContainer serverWebSocketContainer() { + return new ServerWebSocketContainer("/time").withSockJs(); + } + + @Bean + @InboundChannelAdapter(value = "splitChannel", poller = @Poller(fixedDelay = "1000", maxMessagesPerPoll = "1")) + public MessageSource webSocketSessionsMessageSource() { + return new MessageSource>() { + + @Override + public Message> receive() { + return new GenericMessage>(serverWebSocketContainer().getSessions().keySet().iterator()); + } + + }; + } + + @Bean + public MessageChannel splitChannel() { + return new DirectChannel(); + } + + @Bean + @ServiceActivator(inputChannel = "splitChannel") + public MessageHandler splitter() { + DefaultMessageSplitter splitter = new DefaultMessageSplitter(); + splitter.setOutputChannelName("headerEnricherChannel"); + return splitter; + } + + @Bean + public MessageChannel headerEnricherChannel() { + return new ExecutorChannel(Executors.newCachedThreadPool()); + } + + @Bean + @Transformer(inputChannel = "headerEnricherChannel", outputChannel = "transformChannel") + public HeaderEnricher headerEnricher() { + return new HeaderEnricher(Collections.singletonMap(SimpMessageHeaderAccessor.SESSION_ID_HEADER, + new ExpressionEvaluatingHeaderValueMessageProcessor("payload", null))); + } + + @Bean + @Transformer(inputChannel = "transformChannel", outputChannel = "sendTimeChannel") + public AbstractPayloadTransformer transformer() { + return new AbstractPayloadTransformer() { + @Override + protected Object transformPayload(Object payload) throws Exception { + return DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.DEFAULT).format(new Date()); + } + + }; + } + + + @Bean + public MessageChannel sendTimeChannel() { + return new PublishSubscribeChannel(); + } + + + @Bean + @ServiceActivator(inputChannel = "sendTimeChannel") + public MessageHandler webSocketOutboundAdapter() { + return new WebSocketOutboundMessageHandler(serverWebSocketContainer()); + } + + @Bean + @ServiceActivator(inputChannel = "sendTimeChannel") + public MessageHandler loggingChannelAdapter() { + LoggingHandler loggingHandler = new LoggingHandler("info"); + loggingHandler.setExpression("'The time ' + payload + ' has been sent to the WebSocketSession ' + headers.simpSessionId"); + return loggingHandler; + } + +} diff --git a/basic/web-sockets/src/main/resources/org/springframework/integration/samples/websocket/standard/client/client-context.xml b/basic/web-sockets/src/main/resources/org/springframework/integration/samples/websocket/standard/client/client-context.xml new file mode 100644 index 000000000..fdfc4f928 --- /dev/null +++ b/basic/web-sockets/src/main/resources/org/springframework/integration/samples/websocket/standard/client/client-context.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/basic/web-sockets/src/main/resources/static/index.html b/basic/web-sockets/src/main/resources/static/index.html new file mode 100644 index 000000000..6721cf2bf --- /dev/null +++ b/basic/web-sockets/src/main/resources/static/index.html @@ -0,0 +1,34 @@ + + + + Time over WebSocket + + + + + + +
Starting...
+ + diff --git a/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java new file mode 100644 index 000000000..6da9b08e3 --- /dev/null +++ b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java @@ -0,0 +1,85 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.websocket.standard; + +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.hamcrest.Matchers.instanceOf; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.text.DateFormat; +import java.text.ParseException; +import java.util.Date; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.boot.test.IntegrationTest; +import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.channel.DirectChannel; +import org.springframework.integration.samples.websocket.standard.server.Application; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.support.ChannelInterceptorAdapter; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; + +/** + * @author Artem Bilan + * @since 3.0 + */ +@RunWith(SpringJUnit4ClassRunner.class) +@SpringApplicationConfiguration(classes = Application.class) +@WebAppConfiguration +@IntegrationTest +public class ApplicationTests { + + @Test + public void testWebSockets() throws InterruptedException { + ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext("client-context.xml", + org.springframework.integration.samples.websocket.standard.client.Application.class); + DirectChannel webSocketInputChannel = ctx.getBean("webSocketInputChannel", DirectChannel.class); + + final CountDownLatch stopLatch = new CountDownLatch(2); + + webSocketInputChannel.addInterceptor(new ChannelInterceptorAdapter() { + @Override + public void postSend(Message message, MessageChannel channel, boolean sent) { + Object payload = message.getPayload(); + assertThat(payload, instanceOf(String.class)); + Date date = null; + try { + date = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.DEFAULT).parse((String) payload); + } + catch (ParseException e) { + fail("fail to parse date"); + } + assertThat(new Date().compareTo(date), greaterThanOrEqualTo(0)); + stopLatch.countDown(); + } + + }); + assertTrue(stopLatch.await(10, TimeUnit.SECONDS)); + ctx.close(); + } + +} diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 61d2f1ab4..bb60ba1e3 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples ws-inbound-gateway - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT war WS Inbound Gateway Sample WS Inbound Gateway Sample @@ -24,7 +24,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -32,7 +32,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -40,12 +40,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -78,7 +78,7 @@ org.springframework spring-webmvc - 4.0.3.RELEASE + 4.0.7.RELEASE compile @@ -93,10 +93,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration - spring-integration-ws - 4.0.0.RELEASE + spring-integration-xml + 4.0.4.RELEASE compile @@ -105,12 +111,6 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-xml - 4.0.0.RELEASE - compile - org.mockito mockito-core @@ -118,10 +118,10 @@ test - org.springframework - spring-test - 4.0.3.RELEASE - test + org.springframework.integration + spring-integration-ws + 4.0.4.RELEASE + compile diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index f76c377fe..09e44aa54 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples ws-outbound-gateway - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT WS Outbound Gateway Sample WS Outbound Gateway Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE - compile - junit junit @@ -79,10 +73,10 @@ test - org.springframework.integration - spring-integration-ws - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -90,6 +84,12 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-stream + 4.0.4.RELEASE + compile + org.mockito mockito-core @@ -97,10 +97,10 @@ test - org.springframework - spring-test - 4.0.3.RELEASE - test + org.springframework.integration + spring-integration-ws + 4.0.4.RELEASE + compile diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 941aa6ff9..77508a175 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples xml - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT XML Sample XML Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -73,15 +73,21 @@ test - log4j - log4j - 1.2.17 - compile + org.springframework + spring-test + 4.0.7.RELEASE + test org.springframework.integration spring-integration-xml - 4.0.0.RELEASE + 4.0.4.RELEASE + compile + + + log4j + log4j + 1.2.17 compile @@ -90,11 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 2d0049db9..18643357c 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples xmpp - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT XMPP Basic Sample XMPP Basic Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -73,10 +73,10 @@ test - org.springframework.integration - spring-integration-xmpp - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -84,17 +84,17 @@ 1.2.17 compile + + org.springframework.integration + spring-integration-xmpp + 4.0.4.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/build.gradle b/build.gradle index 371cb19dd..06bb48019 100644 --- a/build.gradle +++ b/build.gradle @@ -61,24 +61,24 @@ subprojects { subproject -> developer { id = 'garyrussell' name = 'Gary Russell' - email = 'grussell@gopivotal.com' + email = 'grussell@pivotal.io' roles = ["project lead"] } developer { id = 'markfisher' name = 'Mark Fisher' - email = 'mfisher@gopivotal.com' + email = 'mfisher@pivotal.io' roles = ["project founder and lead emeritus"] } developer { id = 'ghillert' name = 'Gunnar Hillert' - email = 'ghillert@gopivotal.com' + email = 'ghillert@pivotal.io' } developer { id = 'abilan' name = 'Artem Bilan' - email = 'abilan@gopivotal.com' + email = 'abilan@pivotal.io' } } @@ -139,6 +139,7 @@ subprojects { subproject -> repositories { //TODO on release +// mavenLocal() maven { url 'http://repo.spring.io/libs-snapshot' } maven { url 'http://repo.spring.io/libs-milestone' } // maven { url 'http://repo.spring.io/libs-staging-local' } @@ -192,7 +193,7 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.6' springIntegrationVersion = '4.0.4.RELEASE' - springIntegration41Version = '4.1.0.M1' + springIntegration41Version = '4.1.0.BUILD-SNAPSHOT' springIntegrationDslVersion = '1.0.0.M3' springVersion = '4.0.7.RELEASE' springSecurityVersion = '3.2.4.RELEASE' @@ -535,6 +536,9 @@ project('si4demo') { mainClassName = 'org.springframework.integration.samples.si4demo.dsl.Application' + tasks.withType(JavaExec) { + standardInput = System.in + } } project('cafe-dsl') { @@ -547,6 +551,7 @@ project('cafe-dsl') { dependencies { compile project(":cafe-si") compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-core:$springIntegration41Version" compile "org.springframework.integration:spring-integration-java-dsl:$springIntegrationDslVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' @@ -1093,6 +1098,25 @@ project('tx-synch') { } } +project('web-sockets') { + description = 'Web Sockets Basic Sample' + + apply plugin: 'spring-boot' + + dependencies { + compile 'org.springframework.boot:spring-boot-starter-websocket' + compile "org.springframework.integration:spring-integration-websocket:$springIntegration41Version" + + testCompile 'org.springframework.boot:spring-boot-starter-test' + } + + mainClassName = 'org.springframework.integration.samples.websocket.standard.server.Application' + + tasks.withType(JavaExec) { + standardInput = System.in + } +} + task wrapper(type: Wrapper) { description = 'Generates gradlew[.bat] scripts' gradleVersion = '1.12' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml new file mode 100644 index 000000000..2ac49afeb --- /dev/null +++ b/dsl/cafe-dsl/pom.xml @@ -0,0 +1,129 @@ + + + 4.0.0 + + spring-boot-starter-parent + org.springframework.boot + 1.1.6.RELEASE + + org.springframework.integration.samples + cafe-dsl + 3.0.0.BUILD-SNAPSHOT + Java DSL Cafe Sample + Java DSL Cafe Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@pivotal.io + + project lead + + + + markfisher + Mark Fisher + mfisher@pivotal.io + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@pivotal.io + + + abilan + Artem Bilan + abilan@pivotal.io + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + org.springframework.integration.samples + cafe-si + 3.0.0.BUILD-SNAPSHOT + compile + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework + spring-test + 4.0.7.RELEASE + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-integration + compile + + + org.springframework.integration + spring-integration-java-dsl + 1.0.0.M3 + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + diff --git a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/Application.java b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/Application.java index 55aed541c..cf2c7b000 100644 --- a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/Application.java +++ b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/Application.java @@ -26,6 +26,7 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; import org.springframework.integration.annotation.Gateway; import org.springframework.integration.annotation.IntegrationComponentScan; import org.springframework.integration.annotation.MessagingGateway; @@ -98,6 +99,7 @@ public IntegrationFlow ordersFlow() { } @Bean + @DependsOn("preparedDrinksFlow") public IntegrationFlow coldDrinksFlow() { return IntegrationFlows.from(MessageChannels.queue("coldDrinks", 10)) .handle((orderItem, h) -> { @@ -119,6 +121,7 @@ public IntegrationFlow coldDrinksFlow() { } @Bean + @DependsOn("preparedDrinksFlow") public IntegrationFlow hotDrinksFlow() { return IntegrationFlows.from(MessageChannels.queue("hotDrinks", 10)) .handle((orderItem, h) -> { diff --git a/dsl/pom.xml b/dsl/pom.xml new file mode 100644 index 000000000..3e132bfee --- /dev/null +++ b/dsl/pom.xml @@ -0,0 +1,92 @@ + + + 4.0.0 + org.springframework.integration.samples + dsl + 3.0.0.BUILD-SNAPSHOT + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@pivotal.io + + project lead + + + + markfisher + Mark Fisher + mfisher@pivotal.io + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@pivotal.io + + + abilan + Artem Bilan + abilan@pivotal.io + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework + spring-test + 4.0.7.RELEASE + test + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml new file mode 100644 index 000000000..f272e313f --- /dev/null +++ b/dsl/si4demo/pom.xml @@ -0,0 +1,134 @@ + + + 4.0.0 + + spring-boot-starter-parent + org.springframework.boot + 1.1.6.RELEASE + + org.springframework.integration.samples + si4demo + 3.0.0.BUILD-SNAPSHOT + Java Configuration/DSL Sample + Java Configuration/DSL Sample + http://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@pivotal.io + + project lead + + + + markfisher + Mark Fisher + mfisher@pivotal.io + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@pivotal.io + + + abilan + Artem Bilan + abilan@pivotal.io + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.springframework + spring-test + 4.0.7.RELEASE + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-integration + compile + + + org.springframework.boot + spring-boot-starter-web + compile + + + org.springframework.integration + spring-integration-java-dsl + 1.0.0.M3 + compile + + + org.springframework.integration + spring-integration-twitter + 4.0.4.RELEASE + compile + + + log4j + log4j + 1.2.17 + compile + + + org.mockito + mockito-core + 1.9.5 + test + + + diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index b4ec04cfd..6665dabfd 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples async-gateway - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Async Gateway Sample Async Gateway Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.projectreactor.spring + reactor-spring-context + 1.1.3.RELEASE + compile + junit junit @@ -72,10 +78,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-core - 4.0.0.RELEASE + 4.1.0.BUILD-SNAPSHOT compile @@ -90,11 +102,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 4de41cfff..fb8e090eb 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples dynamic-poller - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Dynamic Poller Sample Dynamic Poller Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,10 +72,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-core - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -90,11 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 8969441ee..b407acffd 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples errorhandling - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Error Handling Sample Error Handling Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,12 +60,6 @@ - - org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE - compile - junit junit @@ -78,23 +72,29 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j 1.2.17 compile + + org.springframework.integration + spring-integration-stream + 4.0.4.RELEASE + compile + org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index ffff23892..444f637ad 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples file-processing - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT File Processing Sample File Processing Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,6 +72,18 @@ 1.3 test + + org.springframework.integration + spring-integration-file + 4.0.4.RELEASE + compile + + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j @@ -84,17 +96,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - - - org.springframework.integration - spring-integration-file - 4.0.0.RELEASE - compile - diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index f8d84c97c..f4983767c 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples mail-attachments - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Mail Attachment Sample Mail Attachment Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,6 +72,24 @@ 1.3 test + + org.springframework.integration + spring-integration-mail + 4.0.4.RELEASE + compile + + + org.springframework.integration + spring-integration-file + 4.0.4.RELEASE + compile + + + org.springframework + spring-test + 4.0.7.RELEASE + test + commons-io commons-io @@ -87,15 +105,9 @@ org.springframework.integration spring-integration-test - 4.0.0.RELEASE + 4.0.4.RELEASE test - - org.springframework.integration - spring-integration-mail - 4.0.0.RELEASE - compile - log4j log4j @@ -120,17 +132,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - - - org.springframework.integration - spring-integration-file - 4.0.0.RELEASE - compile - diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 2106d8d44..3496fb5a9 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples monitoring - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT war Monitoring Application Monitoring Application @@ -24,7 +24,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -32,7 +32,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -40,12 +40,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -75,10 +75,16 @@ + + org.springframework.integration + spring-integration-groovy + 4.0.4.RELEASE + compile + org.springframework spring-webmvc - 4.0.3.RELEASE + 4.0.7.RELEASE compile @@ -100,15 +106,15 @@ test - org.springframework.integration - spring-integration-jmx - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test org.springframework.integration spring-integration-twitter - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -117,12 +123,6 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-groovy - 4.0.0.RELEASE - compile - org.mockito mockito-core @@ -130,10 +130,10 @@ test - org.springframework - spring-test - 4.0.3.RELEASE - test + org.springframework.integration + spring-integration-jmx + 4.0.4.RELEASE + compile diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 877ffa44f..065150b04 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples multipart-http - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT war HTTP Multipart Demo HTTP Multipart Demo @@ -24,7 +24,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -32,7 +32,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -40,12 +40,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -78,7 +78,7 @@ org.springframework spring-webmvc - 4.0.3.RELEASE + 4.0.7.RELEASE compile @@ -94,10 +94,10 @@ test - org.springframework.integration - spring-integration-http - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test commons-io @@ -105,6 +105,12 @@ 2.4 compile + + org.springframework.integration + spring-integration-http + 4.0.4.RELEASE + compile + log4j log4j @@ -129,11 +135,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/pom.xml b/intermediate/pom.xml index 5a6d807e3..b1c8555ff 100644 --- a/intermediate/pom.xml +++ b/intermediate/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples intermediate - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT http://projects.spring.io/spring-integration SpringIO @@ -21,7 +21,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -29,7 +29,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -37,12 +37,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index afdeb9c41..45b8a4e87 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples rest-http - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT war Spring Integration Rest HTTP Path Usage Demo Spring Integration Rest HTTP Path Usage Demo @@ -24,7 +24,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -32,7 +32,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -40,12 +40,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -77,14 +77,8 @@ org.springframework - spring-context - 4.0.3.RELEASE - compile - - - org.springframework - spring-webmvc - 4.0.3.RELEASE + spring-oxm + 4.0.7.RELEASE compile @@ -93,28 +87,46 @@ 4.11 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-http - 4.0.0.RELEASE + 4.0.4.RELEASE + compile + + + org.springframework.security + spring-security-web + 3.2.4.RELEASE compile org.springframework - spring-jdbc - 4.0.3.RELEASE + spring-context + 4.0.7.RELEASE compile - org.springframework.security - spring-security-web - 3.2.3.RELEASE + org.springframework + spring-aop + 4.0.7.RELEASE compile org.springframework - spring-oxm - 4.0.3.RELEASE + spring-webmvc + 4.0.7.RELEASE + compile + + + org.springframework.security + spring-security-config + 3.2.4.RELEASE compile @@ -132,19 +144,7 @@ org.springframework spring-tx - 4.0.3.RELEASE - compile - - - org.springframework - spring-aop - 4.0.3.RELEASE - compile - - - org.springframework.security - spring-security-config - 3.2.3.RELEASE + 4.0.7.RELEASE compile @@ -167,9 +167,9 @@ org.springframework - spring-test - 4.0.3.RELEASE - test + spring-jdbc + 4.0.7.RELEASE + compile diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index d78a2b016..ad0430a8b 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples retry-and-more - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Retry and More Sample Retry and More Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,18 +60,6 @@ - - org.springframework.integration - spring-integration-stream - 4.0.0.RELEASE - compile - - - org.springframework.integration - spring-integration-ftp - 4.0.0.RELEASE - compile - junit junit @@ -86,10 +74,16 @@ org.springframework.integration - spring-integration-amqp - 4.0.0.RELEASE + spring-integration-file + 4.0.4.RELEASE compile + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j @@ -97,21 +91,27 @@ compile - org.mockito - mockito-core - 1.9.5 + org.springframework.integration + spring-integration-stream + 4.0.4.RELEASE compile - org.springframework - spring-test - 4.0.3.RELEASE - test + org.springframework.integration + spring-integration-amqp + 4.0.4.RELEASE + compile org.springframework.integration - spring-integration-file - 4.0.0.RELEASE + spring-integration-ftp + 4.0.4.RELEASE + compile + + + org.mockito + mockito-core + 1.9.5 compile diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index fbd7e1b47..771fb202f 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Splitter-Aggregator-Reaper Sample Splitter-Aggregator-Reaper Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -72,6 +72,12 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + javax.inject javax.inject @@ -81,7 +87,7 @@ org.springframework.integration spring-integration-core - 4.0.0.RELEASE + 4.0.4.RELEASE compile @@ -96,11 +102,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 45b8dce0d..681dfa968 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-derby - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Derby Stored Procedures Sample Derby Stored Procedures Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-jdbc + 4.0.4.RELEASE + compile + junit junit @@ -79,10 +85,10 @@ test - org.springframework.integration - spring-integration-jdbc - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -96,11 +102,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 506bb3cc3..8e13b9b34 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-ms - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT MS SQLServer Stored Procedures Sample MS SQLServer Stored Procedures Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-jdbc + 4.0.4.RELEASE + compile + c3p0 c3p0 @@ -85,10 +91,10 @@ test - org.springframework.integration - spring-integration-jdbc - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -102,11 +108,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 851da6ce2..bfd8c4c3e 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-oracle - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Oracle Stored Procedures Sample Oracle Stored Procedures Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-jdbc + 4.0.4.RELEASE + compile + junit junit @@ -73,10 +79,10 @@ test - org.springframework.integration - spring-integration-jdbc - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test log4j @@ -84,23 +90,11 @@ 1.2.17 compile - - com.oracle - ojdbc6 - 11.2.0.3 - compile - org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index f4ac1d38e..fff719012 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-postgresql - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT PostgreSQL Stored Procedures Sample PostgreSQL Stored Procedures Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-jdbc + 4.0.4.RELEASE + compile + junit junit @@ -73,10 +79,10 @@ test - org.springframework.integration - spring-integration-jdbc - 4.0.0.RELEASE - compile + org.springframework + spring-test + 4.0.7.RELEASE + test commons-pool @@ -102,12 +108,6 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - postgresql postgresql diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 052fabd77..e4d45831d 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT TCP Client Server Multiplexing Sample TCP Client Server Multiplexing Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-ip + 4.0.4.RELEASE + compile + junit junit @@ -72,10 +78,16 @@ 1.3 test + + org.springframework + spring-test + 4.0.7.RELEASE + test + org.springframework.integration spring-integration-test - 4.0.0.RELEASE + 4.0.4.RELEASE test @@ -84,23 +96,11 @@ 1.2.17 compile - - org.springframework.integration - spring-integration-ip - 4.0.0.RELEASE - compile - org.mockito mockito-core 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index ed6e1d08c..415313dad 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples travel - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Travel Services Sample Travel Services Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -73,15 +73,21 @@ test - org.springframework.integration - spring-integration-http - 4.0.0.RELEASE + org.springframework + spring-test + 4.0.7.RELEASE + test + + + org.springframework + spring-web + 4.0.7.RELEASE compile org.springframework.integration - spring-integration-ws - 4.0.0.RELEASE + spring-integration-http + 4.0.4.RELEASE compile @@ -90,12 +96,6 @@ 1.2.17 compile - - org.springframework - spring-web - 4.0.3.RELEASE - compile - org.mockito mockito-core @@ -103,10 +103,10 @@ test - org.springframework - spring-test - 4.0.3.RELEASE - test + org.springframework.integration + spring-integration-ws + 4.0.4.RELEASE + compile diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 2726ed1d4..20aa90473 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples tx-synch - 2.2.0.BUILD-SNAPSHOT + 3.0.0.BUILD-SNAPSHOT Transaction Synchronization Sample Transaction Synchronization Sample http://projects.spring.io/spring-integration @@ -23,7 +23,7 @@ garyrussell Gary Russell - grussell@gopivotal.com + grussell@pivotal.io project lead @@ -31,7 +31,7 @@ markfisher Mark Fisher - mfisher@gopivotal.com + mfisher@pivotal.io project founder and lead emeritus @@ -39,12 +39,12 @@ ghillert Gunnar Hillert - ghillert@gopivotal.com + ghillert@pivotal.io abilan Artem Bilan - abilan@gopivotal.com + abilan@pivotal.io @@ -60,6 +60,12 @@ + + org.springframework.integration + spring-integration-jdbc + 4.0.4.RELEASE + compile + com.h2database h2 @@ -80,10 +86,16 @@ org.springframework.integration - spring-integration-jdbc - 4.0.0.RELEASE + spring-integration-file + 4.0.4.RELEASE compile + + org.springframework + spring-test + 4.0.7.RELEASE + test + log4j log4j @@ -96,17 +108,5 @@ 1.9.5 test - - org.springframework - spring-test - 4.0.3.RELEASE - test - - - org.springframework.integration - spring-integration-file - 4.0.0.RELEASE - compile - From 63232c2974f74ed46bf0de93e4c9729449b460fd Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 13 Oct 2014 17:31:01 +0300 Subject: [PATCH 036/356] INTS-137: Add STOMP Chat Application JIRA: https://jira.spring.io/browse/INTSAMPLES-137 * Upgrade to Boot 1.1.7 * Fix several Boot apps to get deal with `args`, e.g. `--debug` option can be useful for Boot * Provide a loca copy for JavaScript files (`sock.js` and `stomp.js`) to avoid extra Internet connection on testing INTS-137-2: Make JavaScript cross-browser Some additional polishing to the server config, like `logging-channel-adapter` for server message flow --- applications/stomp-chat/README.md | 50 ++++ .../chat/stomp/server/Application.java | 41 ++++ .../chat/stomp/server/stomp-server.xml | 142 ++++++++++++ .../src/main/resources/static/index.html | 217 ++++++++++++++++++ .../src/main/resources/static/sockjs.js | 27 +++ .../src/main/resources/static/stomp.js | 8 + .../chat/stomp/server/ApplicationTests.java | 42 ++++ .../standard/server/Application.java | 2 +- .../src/main/resources/static/index.html | 2 +- .../src/main/resources/static/sockjs.js | 27 +++ build.gradle | 22 +- .../si4demo/annotations/Application.java | 2 +- .../samples/si4demo/dsl/Application.java | 2 +- gradle.properties | 2 +- 14 files changed, 580 insertions(+), 6 deletions(-) create mode 100644 applications/stomp-chat/README.md create mode 100644 applications/stomp-chat/src/main/java/org/springframework/integration/samples/chat/stomp/server/Application.java create mode 100644 applications/stomp-chat/src/main/resources/org/springframework/integration/samples/chat/stomp/server/stomp-server.xml create mode 100644 applications/stomp-chat/src/main/resources/static/index.html create mode 100644 applications/stomp-chat/src/main/resources/static/sockjs.js create mode 100644 applications/stomp-chat/src/main/resources/static/stomp.js create mode 100644 applications/stomp-chat/src/test/java/org/springframework/integration/samples/chat/stomp/server/ApplicationTests.java create mode 100644 basic/web-sockets/src/main/resources/static/sockjs.js diff --git a/applications/stomp-chat/README.md b/applications/stomp-chat/README.md new file mode 100644 index 000000000..28636343e --- /dev/null +++ b/applications/stomp-chat/README.md @@ -0,0 +1,50 @@ +WebSockets Stomp Chat Sample +============== + +This application demonstrates the Web chat based on STOMP WebSocket sub-protocol with Spring Integration Adapters. +## Server + +The server is presented only with a single `org.springframework.integration.samples.websocket.standard.server.Application` +class, which is based on the Spring Boot AutoConfiguration and Spring Integration xml configuration `@ImportResource`. +It is a `main` and starts an embedded Tomcat server on the default `8080` port. +The WebSocket endpoint is mapped to the `/chat` path. + +The server also can be run from Gradle `gradlew :stomp-chat:run` + +The server application demonstrates how Spring Integration can be used as a STOMP Broker. + + 1. `webSocketSessionStore` - the `SimpleMetadataStore` to keep track of `WebSocketSession` and its `user`. + 2. `chatMessagesStore` - the `SimpleMessageStore` to store messages for chat rooms. + 3. `chatRoomSessions` - the `Map>` to keep track of `WebSocketSession` `subscriptions` + to the concrete chat room - STOMP `destination`. + 4. `` is subscribed to the `AbstractSubProtocolEvent` + type to handle STOMP sub-protocol events. + 5. `` is mapped to the appropriate `AbstractSubProtocolEvent` + type to provide the specific integration flow for each event type. + 6. `` receives STOMP messages, store them to the appropriate `messageGroup` + (according to the STOMP `destination`) and forward to the `` to send to + each `WebSocketSession` subscribed to that STOMP `destination` - chat room. + +## Client + +The `index.html` in the `src/main/resources/static` directory of this project demonstrates a JavaScript `STOMP` client +over `SockJS` client. + +This application covers classical STOMP scenario: + +- `connect` - requirement to enter the `user name` - chat member; +- `subscribe` - the `Join` operation on the one of chat rooms and receiving messages to that subscription for the +destination; +- `send` and `receive` - just chat messages; +- `unsubscribe` - the `Leave` operation on the chat room: the current web socket session stops receiving messages for +the destination; +- `disconnect` - close current web socket session and unsubscribe from all its subscriptions. + +To get real chat interaction it's just enough to open several tabs in browser. +When the user joins to the chat room, his subscription receives all messages, sent by other users to that room, +immediately. + +## Test Case + +The `org.springframework.integration.samples.chat.stomp.server.ApplicationTests` demonstrates the Spring Boot test +framework and just starts Server on the random port to be sure that this application is run correctly. diff --git a/applications/stomp-chat/src/main/java/org/springframework/integration/samples/chat/stomp/server/Application.java b/applications/stomp-chat/src/main/java/org/springframework/integration/samples/chat/stomp/server/Application.java new file mode 100644 index 000000000..8efe0e109 --- /dev/null +++ b/applications/stomp-chat/src/main/java/org/springframework/integration/samples/chat/stomp/server/Application.java @@ -0,0 +1,41 @@ +/* + * Copyright 2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.chat.stomp.server; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.ImportResource; + +/** + * @author Artem Bilan + * @since 3.0 + */ +@Configuration +@EnableAutoConfiguration +@ImportResource("classpath:org/springframework/integration/samples/chat/stomp/server/stomp-server.xml") +public class Application { + + public static void main(String[] args) throws Exception { + ConfigurableApplicationContext ctx = SpringApplication.run(Application.class, args); + System.out.println("Hit 'Enter' to terminate"); + System.in.read(); + ctx.close(); + } + +} diff --git a/applications/stomp-chat/src/main/resources/org/springframework/integration/samples/chat/stomp/server/stomp-server.xml b/applications/stomp-chat/src/main/resources/org/springframework/integration/samples/chat/stomp/server/stomp-server.xml new file mode 100644 index 000000000..de1cf37f6 --- /dev/null +++ b/applications/stomp-chat/src/main/resources/org/springframework/integration/samples/chat/stomp/server/stomp-server.xml @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + chatRoomSessions.each { k, v -> + v.remove(reactor.tuple.Tuple.of(headers.simpSessionId, headers.simpSubscriptionId)) + } + null + + + + + + + + + + + + + + + + + + chatRoomSessions[headers.simpDestination].collect { + org.springframework.integration.support.MessageBuilder.withPayload(payload) + .copyHeaders(headers) + .setHeader('simpSessionId', it.t1) + .setHeader('simpSubscriptionId', it.t2) + .build() + } + + + + + + + + + + + + webSocketSessionStore.remove(headers.simpSessionId) + chatRoomSessions.each { k, v -> v.removeAll { it.t1 == headers.simpSessionId } } + null + + + + diff --git a/applications/stomp-chat/src/main/resources/static/index.html b/applications/stomp-chat/src/main/resources/static/index.html new file mode 100644 index 000000000..9add0e0f0 --- /dev/null +++ b/applications/stomp-chat/src/main/resources/static/index.html @@ -0,0 +1,217 @@ + + + WebSocket Chat + + + + + + + + +
+ Welcome to the Simple WebSocket Stomp Chat! +
+ Enter your name to connect: +
+
+ +
+
+ + + + + +
+ + + +
+
+
+
+ + + diff --git a/applications/stomp-chat/src/main/resources/static/sockjs.js b/applications/stomp-chat/src/main/resources/static/sockjs.js new file mode 100644 index 000000000..e36980419 --- /dev/null +++ b/applications/stomp-chat/src/main/resources/static/sockjs.js @@ -0,0 +1,27 @@ +/* SockJS client, version 0.3.4, http://sockjs.org, MIT License + + Copyright (c) 2011-2012 VMware, Inc. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + */ + +// JSON2 by Douglas Crockford (minified). +var JSON;JSON||(JSON={}),function(){function str(a,b){var c,d,e,f,g=gap,h,i=b[a];i&&typeof i=="object"&&typeof i.toJSON=="function"&&(i=i.toJSON(a)),typeof rep=="function"&&(i=rep.call(b,a,i));switch(typeof i){case"string":return quote(i);case"number":return isFinite(i)?String(i):"null";case"boolean":case"null":return String(i);case"object":if(!i)return"null";gap+=indent,h=[];if(Object.prototype.toString.apply(i)==="[object Array]"){f=i.length;for(c=0;c1?this._listeners[a]=d.slice(0,e).concat(d.slice(e+1)):delete this._listeners[a];return}return},d.prototype.dispatchEvent=function(a){var b=a.type,c=Array.prototype.slice.call(arguments,0);this["on"+b]&&this["on"+b].apply(this,c);if(this._listeners&&b in this._listeners)for(var d=0;d=3e3&&a<=4999},c.countRTO=function(a){var b;return a>100?b=3*a:b=a+200,b},c.log=function(){b.console&&console.log&&console.log.apply&&console.log.apply(console,arguments)},c.bind=function(a,b){return a.bind?a.bind(b):function(){return a.apply(b,arguments)}},c.flatUrl=function(a){return a.indexOf("?")===-1&&a.indexOf("#")===-1},c.amendUrl=function(b){var d=a.location;if(!b)throw new Error("Wrong url for SockJS");if(!c.flatUrl(b))throw new Error("Only basic urls are supported in SockJS");return b.indexOf("//")===0&&(b=d.protocol+b),b.indexOf("/")===0&&(b=d.protocol+"//"+d.host+b),b=b.replace(/[/]+$/,""),b},c.arrIndexOf=function(a,b){for(var c=0;c=0},c.delay=function(a,b){return typeof a=="function"&&(b=a,a=0),setTimeout(b,a)};var i=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,j={"\0":"\\u0000","\x01":"\\u0001","\x02":"\\u0002","\x03":"\\u0003","\x04":"\\u0004","\x05":"\\u0005","\x06":"\\u0006","\x07":"\\u0007","\b":"\\b","\t":"\\t","\n":"\\n","\x0b":"\\u000b","\f":"\\f","\r":"\\r","\x0e":"\\u000e","\x0f":"\\u000f","\x10":"\\u0010","\x11":"\\u0011","\x12":"\\u0012","\x13":"\\u0013","\x14":"\\u0014","\x15":"\\u0015","\x16":"\\u0016","\x17":"\\u0017","\x18":"\\u0018","\x19":"\\u0019","\x1a":"\\u001a","\x1b":"\\u001b","\x1c":"\\u001c","\x1d":"\\u001d","\x1e":"\\u001e","\x1f":"\\u001f",'"':'\\"',"\\":"\\\\","\x7f":"\\u007f","\x80":"\\u0080","\x81":"\\u0081","\x82":"\\u0082","\x83":"\\u0083","\x84":"\\u0084","\x85":"\\u0085","\x86":"\\u0086","\x87":"\\u0087","\x88":"\\u0088","\x89":"\\u0089","\x8a":"\\u008a","\x8b":"\\u008b","\x8c":"\\u008c","\x8d":"\\u008d","\x8e":"\\u008e","\x8f":"\\u008f","\x90":"\\u0090","\x91":"\\u0091","\x92":"\\u0092","\x93":"\\u0093","\x94":"\\u0094","\x95":"\\u0095","\x96":"\\u0096","\x97":"\\u0097","\x98":"\\u0098","\x99":"\\u0099","\x9a":"\\u009a","\x9b":"\\u009b","\x9c":"\\u009c","\x9d":"\\u009d","\x9e":"\\u009e","\x9f":"\\u009f","\xad":"\\u00ad","\u0600":"\\u0600","\u0601":"\\u0601","\u0602":"\\u0602","\u0603":"\\u0603","\u0604":"\\u0604","\u070f":"\\u070f","\u17b4":"\\u17b4","\u17b5":"\\u17b5","\u200c":"\\u200c","\u200d":"\\u200d","\u200e":"\\u200e","\u200f":"\\u200f","\u2028":"\\u2028","\u2029":"\\u2029","\u202a":"\\u202a","\u202b":"\\u202b","\u202c":"\\u202c","\u202d":"\\u202d","\u202e":"\\u202e","\u202f":"\\u202f","\u2060":"\\u2060","\u2061":"\\u2061","\u2062":"\\u2062","\u2063":"\\u2063","\u2064":"\\u2064","\u2065":"\\u2065","\u2066":"\\u2066","\u2067":"\\u2067","\u2068":"\\u2068","\u2069":"\\u2069","\u206a":"\\u206a","\u206b":"\\u206b","\u206c":"\\u206c","\u206d":"\\u206d","\u206e":"\\u206e","\u206f":"\\u206f","\ufeff":"\\ufeff","\ufff0":"\\ufff0","\ufff1":"\\ufff1","\ufff2":"\\ufff2","\ufff3":"\\ufff3","\ufff4":"\\ufff4","\ufff5":"\\ufff5","\ufff6":"\\ufff6","\ufff7":"\\ufff7","\ufff8":"\\ufff8","\ufff9":"\\ufff9","\ufffa":"\\ufffa","\ufffb":"\\ufffb","\ufffc":"\\ufffc","\ufffd":"\\ufffd","\ufffe":"\\ufffe","\uffff":"\\uffff"},k=/[\x00-\x1f\ud800-\udfff\ufffe\uffff\u0300-\u0333\u033d-\u0346\u034a-\u034c\u0350-\u0352\u0357-\u0358\u035c-\u0362\u0374\u037e\u0387\u0591-\u05af\u05c4\u0610-\u0617\u0653-\u0654\u0657-\u065b\u065d-\u065e\u06df-\u06e2\u06eb-\u06ec\u0730\u0732-\u0733\u0735-\u0736\u073a\u073d\u073f-\u0741\u0743\u0745\u0747\u07eb-\u07f1\u0951\u0958-\u095f\u09dc-\u09dd\u09df\u0a33\u0a36\u0a59-\u0a5b\u0a5e\u0b5c-\u0b5d\u0e38-\u0e39\u0f43\u0f4d\u0f52\u0f57\u0f5c\u0f69\u0f72-\u0f76\u0f78\u0f80-\u0f83\u0f93\u0f9d\u0fa2\u0fa7\u0fac\u0fb9\u1939-\u193a\u1a17\u1b6b\u1cda-\u1cdb\u1dc0-\u1dcf\u1dfc\u1dfe\u1f71\u1f73\u1f75\u1f77\u1f79\u1f7b\u1f7d\u1fbb\u1fbe\u1fc9\u1fcb\u1fd3\u1fdb\u1fe3\u1feb\u1fee-\u1fef\u1ff9\u1ffb\u1ffd\u2000-\u2001\u20d0-\u20d1\u20d4-\u20d7\u20e7-\u20e9\u2126\u212a-\u212b\u2329-\u232a\u2adc\u302b-\u302c\uaab2-\uaab3\uf900-\ufa0d\ufa10\ufa12\ufa15-\ufa1e\ufa20\ufa22\ufa25-\ufa26\ufa2a-\ufa2d\ufa30-\ufa6d\ufa70-\ufad9\ufb1d\ufb1f\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40-\ufb41\ufb43-\ufb44\ufb46-\ufb4e\ufff0-\uffff]/g,l,m=JSON&&JSON.stringify||function(a){return i.lastIndex=0,i.test(a)&&(a=a.replace(i,function(a){return j[a]})),'"'+a+'"'},n=function(a){var b,c={},d=[];for(b=0;b<65536;b++)d.push(String.fromCharCode(b));return a.lastIndex=0,d.join("").replace(a,function(a){return c[a]="\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4),""}),a.lastIndex=0,c};c.quote=function(a){var b=m(a);return k.lastIndex=0,k.test(b)?(l||(l=n(k)),b.replace(k,function(a){return l[a]})):b};var o=["websocket","xdr-streaming","xhr-streaming","iframe-eventsource","iframe-htmlfile","xdr-polling","xhr-polling","iframe-xhr-polling","jsonp-polling"];c.probeProtocols=function(){var a={};for(var b=0;b0&&h(a)};return c.websocket!==!1&&h(["websocket"]),d["xhr-streaming"]&&!c.null_origin?e.push("xhr-streaming"):d["xdr-streaming"]&&!c.cookie_needed&&!c.null_origin?e.push("xdr-streaming"):h(["iframe-eventsource","iframe-htmlfile"]),d["xhr-polling"]&&!c.null_origin?e.push("xhr-polling"):d["xdr-polling"]&&!c.cookie_needed&&!c.null_origin?e.push("xdr-polling"):h(["iframe-xhr-polling","jsonp-polling"]),e};var p="_sockjs_global";c.createHook=function(){var a="a"+c.random_string(8);if(!(p in b)){var d={};b[p]=function(a){return a in d||(d[a]={id:a,del:function(){delete d[a]}}),d[a]}}return b[p](a)},c.attachMessage=function(a){c.attachEvent("message",a)},c.attachEvent=function(c,d){typeof b.addEventListener!="undefined"?b.addEventListener(c,d,!1):(a.attachEvent("on"+c,d),b.attachEvent("on"+c,d))},c.detachMessage=function(a){c.detachEvent("message",a)},c.detachEvent=function(c,d){typeof b.addEventListener!="undefined"?b.removeEventListener(c,d,!1):(a.detachEvent("on"+c,d),b.detachEvent("on"+c,d))};var q={},r=!1,s=function(){for(var a in q)q[a](),delete q[a]},t=function(){if(r)return;r=!0,s()};c.attachEvent("unload",t),c.unload_add=function(a){var b=c.random_string(8);return q[b]=a,r&&c.delay(s),b},c.unload_del=function(a){a in q&&delete q[a]},c.createIframe=function(b,d){var e=a.createElement("iframe"),f,g,h=function(){clearTimeout(f);try{e.onload=null}catch(a){}e.onerror=null},i=function(){e&&(h(),setTimeout(function(){e&&e.parentNode.removeChild(e),e=null},0),c.unload_del(g))},j=function(a){e&&(i(),d(a))},k=function(a,b){try{e&&e.contentWindow&&e.contentWindow.postMessage(a,b)}catch(c){}};return e.src=b,e.style.display="none",e.style.position="absolute",e.onerror=function(){j("onerror")},e.onload=function(){clearTimeout(f),f=setTimeout(function(){j("onload timeout")},2e3)},a.body.appendChild(e),f=setTimeout(function(){j("timeout")},15e3),g=c.unload_add(i),{post:k,cleanup:i,loaded:h}},c.createHtmlfile=function(a,d){var e=new ActiveXObject("htmlfile"),f,g,i,j=function(){clearTimeout(f)},k=function(){e&&(j(),c.unload_del(g),i.parentNode.removeChild(i),i=e=null,CollectGarbage())},l=function(a){e&&(k(),d(a))},m=function(a,b){try{i&&i.contentWindow&&i.contentWindow.postMessage(a,b)}catch(c){}};e.open(),e.write(' + - diff --git a/applications/loanshark/src/main/webapp/WEB-INF/views/footer.jspx b/applications/loanshark/src/main/webapp/WEB-INF/views/footer.jspx index 89af49c71..b835924f8 100644 --- a/applications/loanshark/src/main/webapp/WEB-INF/views/footer.jspx +++ b/applications/loanshark/src/main/webapp/WEB-INF/views/footer.jspx @@ -29,7 +29,7 @@ - + ${fn:escapeXml(sponsored)} diff --git a/applications/stomp-chat/src/main/resources/static/sockjs.js b/applications/stomp-chat/src/main/resources/static/sockjs.js index e36980419..6943b2737 100644 --- a/applications/stomp-chat/src/main/resources/static/sockjs.js +++ b/applications/stomp-chat/src/main/resources/static/sockjs.js @@ -1,4 +1,4 @@ -/* SockJS client, version 0.3.4, http://sockjs.org, MIT License +/* SockJS client, version 0.3.4, https://github.com/sockjs/sockjs-client, MIT License Copyright (c) 2011-2012 VMware, Inc. diff --git a/applications/stomp-chat/src/main/resources/static/stomp.js b/applications/stomp-chat/src/main/resources/static/stomp.js index e5561fc24..442bd33fc 100644 --- a/applications/stomp-chat/src/main/resources/static/stomp.js +++ b/applications/stomp-chat/src/main/resources/static/stomp.js @@ -1,8 +1,8 @@ // Generated by CoffeeScript 1.7.1 /* - Stomp Over WebSocket http://www.jmesnil.net/stomp-websocket/doc/ | Apache License V2.0 + Stomp Over WebSocket http://jmesnil.net/stomp-websocket/doc/ | Apache License V2.0 - Copyright (C) 2010-2013 [Jeff Mesnil](http://jmesnil.net/) - Copyright (C) 2012 [FuseSource, Inc.](http://fusesource.com) + Copyright (C) 2010-2013 [Jeff Mesnil](https://github.com/jmesnil) + Copyright (C) 2012 [FuseSource, Inc.](https://www.jboss.org/) */ (function(){var t,e,n,i,r={}.hasOwnProperty,o=[].slice;t={LF:"\n",NULL:"\x00"};n=function(){var e;function n(t,e,n){this.command=t;this.headers=e!=null?e:{};this.body=n!=null?n:""}n.prototype.toString=function(){var e,i,o,s,u;e=[this.command];o=this.headers["content-length"]===false?true:false;if(o){delete this.headers["content-length"]}u=this.headers;for(i in u){if(!r.call(u,i))continue;s=u[i];e.push(""+i+":"+s)}if(this.body&&!o){e.push("content-length:"+n.sizeOfUTF8(this.body))}e.push(t.LF+this.body);return e.join(t.LF)};n.sizeOfUTF8=function(t){if(t){return encodeURI(t).match(/%..|./g).length}else{return 0}};e=function(e){var i,r,o,s,u,a,c,f,h,l,p,d,g,b,m,v,y;s=e.search(RegExp(""+t.LF+t.LF));u=e.substring(0,s).split(t.LF);o=u.shift();a={};d=function(t){return t.replace(/^\s+|\s+$/g,"")};v=u.reverse();for(g=0,m=v.length;gy;c=p<=y?++b:--b){r=e.charAt(c);if(r===t.NULL){break}i+=r}}return new n(o,a,i)};n.unmarshall=function(n){var i;return function(){var r,o,s,u;s=n.split(RegExp(""+t.NULL+t.LF+"*"));u=[];for(r=0,o=s.length;r0){u.push(e(i))}}return u}()};n.marshall=function(e,i,r){var o;o=new n(e,i,r);return o.toString()+t.NULL};return n}();e=function(){var e;function r(t){this.ws=t;this.ws.binaryType="arraybuffer";this.counter=0;this.connected=false;this.heartbeat={outgoing:1e4,incoming:1e4};this.maxWebSocketFrameSize=16*1024;this.subscriptions={}}r.prototype.debug=function(t){var e;return typeof window!=="undefined"&&window!==null?(e=window.console)!=null?e.log(t):void 0:void 0};e=function(){if(Date.now){return Date.now()}else{return(new Date).valueOf}};r.prototype._transmit=function(t,e,i){var r;r=n.marshall(t,e,i);if(typeof this.debug==="function"){this.debug(">>> "+r)}while(true){if(r.length>this.maxWebSocketFrameSize){this.ws.send(r.substring(0,this.maxWebSocketFrameSize));r=r.substring(this.maxWebSocketFrameSize);if(typeof this.debug==="function"){this.debug("remaining = "+r.length)}}else{return this.ws.send(r)}}};r.prototype._setupHeartbeat=function(n){var r,o,s,u,a,c;if((a=n.version)!==i.VERSIONS.V1_1&&a!==i.VERSIONS.V1_2){return}c=function(){var t,e,i,r;i=n["heart-beat"].split(",");r=[];for(t=0,e=i.length;t>> PING"):void 0}}(this))}if(!(this.heartbeat.incoming===0||o===0)){s=Math.max(this.heartbeat.incoming,o);if(typeof this.debug==="function"){this.debug("check PONG every "+s+"ms")}return this.ponger=i.setInterval(s,function(t){return function(){var n;n=e()-t.serverActivity;if(n>s*2){if(typeof t.debug==="function"){t.debug("did not receive server activity for the last "+n+"ms")}return t.ws.close()}}}(this))}};r.prototype._parseConnect=function(){var t,e,n,i;t=1<=arguments.length?o.call(arguments,0):[];i={};switch(t.length){case 2:i=t[0],e=t[1];break;case 3:if(t[1]instanceof Function){i=t[0],e=t[1],n=t[2]}else{i.login=t[0],i.passcode=t[1],e=t[2]}break;case 4:i.login=t[0],i.passcode=t[1],e=t[2],n=t[3];break;default:i.login=t[0],i.passcode=t[1],e=t[2],n=t[3],i.host=t[4]}return[i,e,n]};r.prototype.connect=function(){var r,s,u,a;r=1<=arguments.length?o.call(arguments,0):[];a=this._parseConnect.apply(this,r);u=a[0],this.connectCallback=a[1],s=a[2];if(typeof this.debug==="function"){this.debug("Opening Web Socket...")}this.ws.onmessage=function(i){return function(r){var o,u,a,c,f,h,l,p,d,g,b,m;c=typeof ArrayBuffer!=="undefined"&&r.data instanceof ArrayBuffer?(o=new Uint8Array(r.data),typeof i.debug==="function"?i.debug("--- got data length: "+o.length):void 0,function(){var t,e,n;n=[];for(t=0,e=o.length;t In order to run the example you will need a running instance of RabbitMQ. A local installation with just the basic defaults will be sufficient. Please visit: [http://www.rabbitmq.com/install.html](http://www.rabbitmq.com/install.html) for detailed installation procedures. +> In order to run the example you will need a running instance of RabbitMQ. A local installation with just the basic defaults will be sufficient. Please visit: [https://www.rabbitmq.com/install.html](https://www.rabbitmq.com/install.html) for detailed installation procedures. # How to Run the Sample -If you imported the example into your IDE, you can just run class **org.springframework.integration.samples.amqp.SampleSimple**. For example in [SpringSource Tool Suite](http://www.springsource.com/developer/sts) (STS) do: +If you imported the example into your IDE, you can just run class **org.springframework.integration.samples.amqp.SampleSimple**. For example in [SpringSource Tool Suite](https://www.springsource.com/developer/sts) (STS) do: * Right-click on SampleSimple class --> Run As --> Java Application @@ -81,9 +81,9 @@ Ctrl-C to terminate. For further help please take a look at the Spring Integration documentation: -* [http://static.springsource.org/spring-integration/reference/htmlsingle/#amqp](http://static.springsource.org/spring-integration/reference/htmlsingle/#amqp) +* [https://docs.spring.io/spring-integration/reference/html/#amqp](https://docs.spring.io/spring-integration/reference/html/#amqp) Some further resources: -* RabbitMQ - [http://www.rabbitmq.com/](http://www.rabbitmq.com/) -* Spring AMQP - [http://www.springsource.org/spring-amqp](http://www.springsource.org/spring-amqp) +* RabbitMQ - [https://www.rabbitmq.com/](https://www.rabbitmq.com/) +* Spring AMQP - [https://www.springsource.org/spring-amqp](https://www.springsource.org/spring-amqp) diff --git a/basic/amqp/src/main/java/org/springframework/integration/samples/amqp/SamplePubConfirmsReturns.java b/basic/amqp/src/main/java/org/springframework/integration/samples/amqp/SamplePubConfirmsReturns.java index 9bb7a2eca..d079f754c 100644 --- a/basic/amqp/src/main/java/org/springframework/integration/samples/amqp/SamplePubConfirmsReturns.java +++ b/basic/amqp/src/main/java/org/springframework/integration/samples/amqp/SamplePubConfirmsReturns.java @@ -46,7 +46,7 @@ public static void main(final String... args) { + "\n Welcome to Spring Integration! " + "\n " + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + "\n " + "\n=========================================================" ); diff --git a/basic/amqp/src/main/java/org/springframework/integration/samples/amqp/SampleSimple.java b/basic/amqp/src/main/java/org/springframework/integration/samples/amqp/SampleSimple.java index 72cbd0733..1a74759f3 100644 --- a/basic/amqp/src/main/java/org/springframework/integration/samples/amqp/SampleSimple.java +++ b/basic/amqp/src/main/java/org/springframework/integration/samples/amqp/SampleSimple.java @@ -47,7 +47,7 @@ public static void main(final String... args) { + "\n Welcome to Spring Integration! " + "\n " + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + "\n " + "\n=========================================================" ); diff --git a/basic/barrier/README.md b/basic/barrier/README.md index 2dc0c5d4c..64795f23d 100644 --- a/basic/barrier/README.md +++ b/basic/barrier/README.md @@ -29,7 +29,7 @@ The last flow drains the messages and allows the auto-delete queue to be removed $ gradlew :barrier:run -This will package the application and run it using the [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html) +This will package the application and run it using the [Gradle Application Plugin](https://www.gradle.org/docs/current/userguide/application_plugin.html) #### Using an IDE such as SpringSource Tool Suite™ (STS) diff --git a/basic/enricher/README.md b/basic/enricher/README.md index c31afde60..03de82e3e 100644 --- a/basic/enricher/README.md +++ b/basic/enricher/README.md @@ -32,5 +32,5 @@ Once the application has started, please execute the various Content Enricher ex For help please take a look at the Spring Integration documentation: -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration diff --git a/basic/enricher/src/main/java/org/springframework/integration/samples/enricher/Main.java b/basic/enricher/src/main/java/org/springframework/integration/samples/enricher/Main.java index 43ec03e4c..218b5bdaa 100644 --- a/basic/enricher/src/main/java/org/springframework/integration/samples/enricher/Main.java +++ b/basic/enricher/src/main/java/org/springframework/integration/samples/enricher/Main.java @@ -58,7 +58,7 @@ public static void main(final String... args) { + "\n Welcome to Spring Integration! " + EMPTY_LINE + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + EMPTY_LINE + LINE_SEPARATOR ); diff --git a/basic/helloworld/README.md b/basic/helloworld/README.md index 15ea72dc7..74f49450d 100644 --- a/basic/helloworld/README.md +++ b/basic/helloworld/README.md @@ -13,7 +13,7 @@ The Hello World application demonstrates a simple message flow represented by th Message -> Channel -> ServiceActivator -> QueueChannel To run the sample simply execute **HelloWorldApp** in package **org.springframework.integration.samples.helloworld**. -You can also execute that class using the [Gradle](http://www.gradle.org): +You can also execute that class using the [Gradle](https://www.gradle.org): $ gradlew :helloworld:runHelloWorldApp @@ -28,7 +28,7 @@ This simple application will print out the current system time twice every 20 se More specifically, an **Inbound Channel Adapter** polls for the current system time 2 times every 20 seconds (20000 milliseconds). The resulting message contains as payload the time in milliseconds and the message is sent to a **Logging Channel Adapter**, which will print the time to the command prompt. To run the sample simply execute **PollerApp** in package **org.springframework.integration.samples.helloworld**. -You can also execute that class using the [Gradle](http://www.gradle.org): +You can also execute that class using the [Gradle](https://www.gradle.org): $ gradlew :helloworld:runPollerApp diff --git a/basic/http/README.md b/basic/http/README.md index e6163dbc3..1a2bb4529 100644 --- a/basic/http/README.md +++ b/basic/http/README.md @@ -14,7 +14,7 @@ The sample consists of two parts: #### Command Line Using Gradle -The easiest way to run the **server** is to use the [Gradle Jetty Plugin](http://www.gradle.org/docs/current/userguide/jetty_plugin.html). +The easiest way to run the **server** is to use the [Gradle Jetty Plugin](https://www.gradle.org/docs/current/userguide/jetty_plugin.html). Simply execute: $ gradlew :http:jettyRun @@ -28,7 +28,7 @@ The resulting war-file will be located in the **target** folder. #### Using an IDE such as SpringSource Tool Suite™ (STS) -If you are using [STS](http://www.springsource.com/developer/sts) and the project is imported as an Eclipse project into your workspace, you can just execute **Run on Server**. This will start the **server** application. +If you are using [STS](https://www.springsource.com/developer/sts) and the project is imported as an Eclipse project into your workspace, you can just execute **Run on Server**. This will start the **server** application. ### Client @@ -38,7 +38,7 @@ In order to run the **client** using Gradle, execute: $ gradlew :http:run -This will package the application and run it using the [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html) +This will package the application and run it using the [Gradle Application Plugin](https://www.gradle.org/docs/current/userguide/application_plugin.html) #### Using an IDE such as SpringSource Tool Suite™ (STS) diff --git a/basic/jdbc/README.md b/basic/jdbc/README.md index 2bd293acb..22d07163e 100644 --- a/basic/jdbc/README.md +++ b/basic/jdbc/README.md @@ -66,5 +66,5 @@ For executing the program and see the results, execute the junit test case For help please take a look at the Spring Integration documentation: -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration diff --git a/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/Main.java b/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/Main.java index b9ba702af..837ddc978 100644 --- a/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/Main.java +++ b/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/Main.java @@ -58,7 +58,7 @@ public static void main(final String... args) { + "\n Welcome to Spring Integration! " + "\n " + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + "\n " + "\n=========================================================" ); diff --git a/basic/jms/README.md b/basic/jms/README.md index 34e7e5e06..b1239af63 100644 --- a/basic/jms/README.md +++ b/basic/jms/README.md @@ -36,7 +36,7 @@ The console output should look like: Welcome to the Spring Integration JMS Sample! For more information please visit: - http://www.springintegration.org/ + https://www.springsource.org/spring-integration/ ========================================================= 16:48:21.158 INFO [org.springframework.integration.samples.jms.Main.main()][org.springframework.integration.samples.jms.ActiveMqTestUtils] Refreshing ActiveMQ data directory. diff --git a/basic/jms/src/main/java/org/springframework/integration/samples/jms/Main.java b/basic/jms/src/main/java/org/springframework/integration/samples/jms/Main.java index b783135e1..fb1fc3ef7 100644 --- a/basic/jms/src/main/java/org/springframework/integration/samples/jms/Main.java +++ b/basic/jms/src/main/java/org/springframework/integration/samples/jms/Main.java @@ -61,7 +61,7 @@ public static void main(String[] args) { + "\n Welcome to the Spring Integration JMS Sample! " + "\n " + "\n For more information please visit: " - + "\n http://www.springintegration.org/ " + + "\n https://www.springsource.org/spring-integration/ " + "\n " + "\n=========================================================" ); diff --git a/basic/jpa/README.md b/basic/jpa/README.md index d54501a9f..dc5e20f7d 100644 --- a/basic/jpa/README.md +++ b/basic/jpa/README.md @@ -20,5 +20,5 @@ Hibernate works out of the box and there are 2 options on how to execute the sam For help please take a look at the Spring Integration documentation: -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration diff --git a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/Main.java b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/Main.java index ebab4f0a7..10ab75935 100644 --- a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/Main.java +++ b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/Main.java @@ -60,7 +60,7 @@ public static void main(final String... args) { + "\n Welcome to the Spring Integration JPA Sample! " + "\n " + "\n For more information please visit: " - + "\n http://www.springintegration.org/ " + + "\n https://www.springsource.org/spring-integration/ " + "\n " + "\n========================================================="); diff --git a/basic/kafka/README.md b/basic/kafka/README.md index a15bea098..43b258943 100644 --- a/basic/kafka/README.md +++ b/basic/kafka/README.md @@ -11,7 +11,7 @@ Start Apache Zookeeper and Apache Kafka according to the documentation for the A $ gradlew :kafka:run -This will package the application and run it using the [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html) +This will package the application and run it using the [Gradle Application Plugin](https://www.gradle.org/docs/current/userguide/application_plugin.html) #### Using an IDE such as SpringSource Tool Suite™ (STS) diff --git a/basic/mongodb/README.md b/basic/mongodb/README.md index f2825f81e..b37a84425 100644 --- a/basic/mongodb/README.md +++ b/basic/mongodb/README.md @@ -56,7 +56,7 @@ As you can see from the example below, the configuration of MongoDb Inbound Chan -Notice the **query** attribute which allows you to provide JSON queries represented as simple String. For more information on MongoDb queries please refer to [MongoDb documentation](http://www.mongodb.org/display/DOCS/Querying) +Notice the **query** attribute which allows you to provide JSON queries represented as simple String. For more information on MongoDb queries please refer to [MongoDb documentation](https://www.mongodb.org/display/DOCS/Querying) In the above case we are selecting all documents where *state* element of the *address* element is **'CA'**. As you may have guessed the MongoDb Inbound Channel Adapter returns List by default, so you can easily configure a very basic splitter downstream (as in this example) to process one message at the time. Run the **MongoDbInboundAdapterDemo** and you should see the results in the console: 04:37:30.720 WARN . . . { "_id" : { "$oid" : "50601bca0364063859066bcd"} , "_class" : "org.springframework.integration.samples.mongodb.domain.Person" , "fname" : "John" , "lname" : "Doe" , "address" : { "street" : "3401 Hillview Ave" , "city" : "Palo Alto" , "zip" : "94304" , "state" : "CA"}} @@ -65,4 +65,4 @@ In the above case we are selecting all documents where *state* element of the *a However, if you know that your query can only return a single result you can avoid returning List by configuring **expect-single-result** attribute setting its value to *true*. Also, you may wish to do some post-processing to the successfully processed data that was read from the MongoDb. For example; you may want to move or remove a document after its been processed. -You can do this using Transaction Synchronization feature that was added with *Spring Integration 2.2* and which will be discussed in the next blog in this series expected in a few days (from Gary Russell). However the impatient once can get more details now by reading MongoDb Inbound Channel Adapter section of the reference manual [http://static.springsource.org/spring-integration/docs/2.2.0.RC3/reference/htmlsingle/#mongodb-inbound-channel-adapter](http://static.springsource.org/spring-integration/docs/2.2.0.RC3/reference/htmlsingle/#mongodb-inbound-channel-adapter). +You can do this using Transaction Synchronization feature that was added with *Spring Integration 2.2* and which will be discussed in the next blog in this series expected in a few days (from Gary Russell). However the impatient once can get more details now by reading MongoDb Inbound Channel Adapter section of the reference manual [https://docs.spring.io/spring-integration/reference/html/#mongodb-inbound-channel-adapter](https://docs.spring.io/spring-integration/reference/html/#mongodb-inbound-channel-adapter). diff --git a/basic/mqtt/README.md b/basic/mqtt/README.md index 5e42bce71..a0e353879 100644 --- a/basic/mqtt/README.md +++ b/basic/mqtt/README.md @@ -13,7 +13,7 @@ dispatched to the MQTT topic. In return that message is retrieved by Spring Inte # How to Run the Sample If you imported the example into your IDE, you can just run class **org.springframework.integration.samples.mqtt.Application**. -For example in [SpringSource Tool Suite](http://www.springsource.com/developer/sts) (STS) do: +For example in [SpringSource Tool Suite](https://www.springsource.com/developer/sts) (STS) do: * Right-click on SampleSimple class --> Run As --> Spring Boot App diff --git a/basic/oddeven/README.md b/basic/oddeven/README.md index 48b80a52d..ea306f3ad 100644 --- a/basic/oddeven/README.md +++ b/basic/oddeven/README.md @@ -37,7 +37,7 @@ The following Spring Integration components are being used: ## Running the Samples To run the two samples, simply execute either **CronOddEvenDemo** or **IntervalOddEvenDemoTestApp** in package **org.springframework.integration.samples.oddeven**. -You can also execute those two samples using the [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html): +You can also execute those two samples using the [Gradle Application Plugin](https://www.gradle.org/docs/current/userguide/application_plugin.html): $ gradlew :oddeven:runCronOddEvenDemo diff --git a/basic/sftp/README.md b/basic/sftp/README.md index dfc9b4727..a3849aca9 100644 --- a/basic/sftp/README.md +++ b/basic/sftp/README.md @@ -12,7 +12,7 @@ In order to run this sample for the 'real' SFTP Server you need to: 2. update user.properties file with appropriate values 3. run the sample -By default this sample uses an [Apache MINA](http://mina.apache.org/sshd-project) embedded `SshServer` with predefined +By default this sample uses an [Apache MINA](https://mina.apache.org/sshd-project) embedded `SshServer` with predefined private and public keys. Note, the embedded Server is started only when the `port` property remains as `-1`. In this case the target port for the Embedded Server is selected randomly. For a real SFTP server you should specify correct `host/port` properties. diff --git a/basic/tcp-amqp/README.md b/basic/tcp-amqp/README.md index b673e0868..2e7a1d6c0 100644 --- a/basic/tcp-amqp/README.md +++ b/basic/tcp-amqp/README.md @@ -9,10 +9,10 @@ Once the application is started, you enter some text in a telnet session and the telnet->tcp-inbound-adapter->rabbit->tcp-outbound-adapter->netcat -telnet: http://en.wikipedia.org/wiki/Telnet -netcat: http://en.wikipedia.org/wiki/Netcat +telnet: https://en.wikipedia.org/wiki/Telnet +netcat: https://en.wikipedia.org/wiki/Netcat -> In order to run the example you will need a running instance of RabbitMQ. A local installation with just the basic defaults will be sufficient. Please visit: [http://www.rabbitmq.com/install.html](http://www.rabbitmq.com/install.html) for detailed installation procedures. +> In order to run the example you will need a running instance of RabbitMQ. A local installation with just the basic defaults will be sufficient. Please visit: [https://www.rabbitmq.com/install.html](https://www.rabbitmq.com/install.html) for detailed installation procedures. # How to Run the Sample @@ -24,12 +24,12 @@ In a terminal window start [netcat][], listening on port *11112*: ## Start the Application -If you imported the example into your IDE, you can just run class **org.springframework.integration.samples.tcpamqp.Main**. For example in [SpringSource Tool Suite](http://www.springsource.com/developer/sts) (STS) do: +If you imported the example into your IDE, you can just run class **org.springframework.integration.samples.tcpamqp.Main**. For example in [SpringSource Tool Suite](https://www.springsource.com/developer/sts) (STS) do: * Right-click on Main class --> Run As --> Java Application Alternatively, you can start the sample from the command line -([Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html)): +([Gradle Application Plugin](https://www.gradle.org/docs/current/userguide/application_plugin.html)): $ gradlew :tcp-amqp:run @@ -53,11 +53,11 @@ Data typed into the telnet terminal will be echoed to the [netcat][] terminal, v For further help please take a look at the Spring Integration documentation: -* [http://static.springsource.org/spring-integration/reference/htmlsingle/#amqp](http://static.springsource.org/spring-integration/reference/htmlsingle/#amqp) +* [https://docs.spring.io/spring-integration/reference/html/#amqp](https://docs.spring.io/spring-integration/reference/html/#amqp) Some further resources: -* RabbitMQ - [http://www.rabbitmq.com/](http://www.rabbitmq.com/) -* Spring AMQP - [http://www.springsource.org/spring-amqp](http://www.springsource.org/spring-amqp) +* RabbitMQ - [https://www.rabbitmq.com/](https://www.rabbitmq.com/) +* Spring AMQP - [https://www.springsource.org/spring-amqp](https://www.springsource.org/spring-amqp) -[netcat]: http://en.wikipedia.org/wiki/Netcat +[netcat]: https://en.wikipedia.org/wiki/Netcat diff --git a/basic/tcp-amqp/src/main/java/org/springframework/integration/samples/tcpamqp/Main.java b/basic/tcp-amqp/src/main/java/org/springframework/integration/samples/tcpamqp/Main.java index b9f3c66e5..26d41c21b 100644 --- a/basic/tcp-amqp/src/main/java/org/springframework/integration/samples/tcpamqp/Main.java +++ b/basic/tcp-amqp/src/main/java/org/springframework/integration/samples/tcpamqp/Main.java @@ -45,7 +45,7 @@ public static void main(final String... args) throws Exception { + "\n Welcome to Spring Integration! " + "\n " + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + "\n " + "\n=========================================================" ); diff --git a/basic/tcp-client-server/README.md b/basic/tcp-client-server/README.md index d76e71e33..bba7755dd 100644 --- a/basic/tcp-client-server/README.md +++ b/basic/tcp-client-server/README.md @@ -32,7 +32,7 @@ Alternatively, you can also execute the **Main** method in class *org.springfram TCP-Client-Server Sample! For more information please visit: - http://www.springintegration.org/ + https://www.springsource.org/spring-integration/ ========================================================= Detect open server socket...using port 5680 @@ -141,12 +141,12 @@ You can run the example by executing JUnit test **TcpServerCustomSerializerTest* A simple client server test using entirely annotation-based configuration is shown in **TcpClientServerAnnotationDemoTest**. -[ByteArrayCrLfSerializer]: http://static.springsource.org/spring-integration/api/org/springframework/integration/ip/tcp/serializer/ByteArrayCrLfSerializer.html -[ByteArrayStxEtxSerializer]: http://static.springsource.org/spring-integration/api/org/springframework/integration/ip/tcp/serializer/ByteArrayStxEtxSerializer.html -[control character]: http://en.wikipedia.org/wiki/Control_character -[Conversion Service]: http://static.springsource.org/spring/docs/current/javadoc-api/org/springframework/core/convert/ConversionService.html -[CRLF]: http://en.wikipedia.org/wiki/Newline -[Deserializer]: http://static.springsource.org/spring/docs/current/javadoc-api/org/springframework/core/serializer/Deserializer.html -[Serializer]: http://static.springsource.org/spring/docs/current/javadoc-api/org/springframework/core/serializer/Serializer.html -[Telnet]: http://en.wikipedia.org/wiki/Telnet -[Transmission Control Protocol]: http://en.wikipedia.org/wiki/Transmission_Control_Protocol +[ByteArrayCrLfSerializer]: https://docs.spring.io/spring-integration/api/org/springframework/integration/ip/tcp/serializer/ByteArrayCrLfSerializer.html +[ByteArrayStxEtxSerializer]: https://docs.spring.io/spring-integration/api/org/springframework/integration/ip/tcp/serializer/ByteArrayStxEtxSerializer.html +[control character]: https://en.wikipedia.org/wiki/Control_character +[Conversion Service]: https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/core/convert/ConversionService.html +[CRLF]: https://en.wikipedia.org/wiki/Newline +[Deserializer]: https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/core/serializer/Deserializer.html +[Serializer]: https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/core/serializer/Serializer.html +[Telnet]: https://en.wikipedia.org/wiki/Telnet +[Transmission Control Protocol]: https://en.wikipedia.org/wiki/Transmission_Control_Protocol diff --git a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/Main.java b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/Main.java index a256c9d9c..ca5874e2b 100644 --- a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/Main.java +++ b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/Main.java @@ -72,7 +72,7 @@ public static void main(final String... args) { + "\n TCP-Client-Server Sample! " + "\n " + "\n For more information please visit: " - + "\n http://www.springintegration.org/ " + + "\n https://www.springsource.org/spring-integration/ " + "\n " + "\n========================================================="); diff --git a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerConnectionDeserializeTest.java b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerConnectionDeserializeTest.java index 1740c93f2..827e8c30f 100644 --- a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerConnectionDeserializeTest.java +++ b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerConnectionDeserializeTest.java @@ -115,7 +115,7 @@ protected Object handleRequestMessage(Message requestMessage) { * Show, explicitly, how the stream would look if you had to manually create it. * * See more about TCP synchronous communication for more about framing the stream - * with STX/ETX: http://en.wikipedia.org/wiki/Binary_Synchronous_Communications + * with STX/ETX: https://en.wikipedia.org/wiki/Binary_Synchronous_Communications * * @param content * @return a string that is wrapped with the STX/ETX framing bytes diff --git a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java index 3c9319626..ed39f32f4 100644 --- a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java +++ b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java @@ -85,7 +85,7 @@ public boolean supports(Class clazz) { public void marshal(Object zip, Result result) throws IOException, XmlMappingException { - String xmlString = "" + + String xmlString = "" + " " + zip + "" + ""; try { @@ -125,6 +125,6 @@ public static final Transformer createIndentingTransformer() { } public void afterPropertiesSet() throws Exception { - namespacePrefixes.put("p", "http://ws.cdyne.com/WeatherWS/"); + namespacePrefixes.put("p", "https://ws.cdyne.com/WeatherWS/"); } } diff --git a/basic/twitter/README.md b/basic/twitter/README.md index 3e92bf02f..8f4fded12 100644 --- a/basic/twitter/README.md +++ b/basic/twitter/README.md @@ -12,7 +12,7 @@ In order to run this sample you need to configure [OAuth][] and set the values i To use [OAuth][] authentication/authorization with Twitter you must create a new Application on the Twitter Developers site. Follow the directions below to create a new application and obtain the consumer keys and the access token: -* Go to [http://dev.twitter.com/](http://dev.twitter.com/) +* Go to [https://dev.twitter.com/](https://dev.twitter.com/) * Log in to your account * Go to *My applications*. * Click on 'Create a new application' link and fill out all required fields on the form provided; @@ -35,4 +35,4 @@ NOTE: the above values are not real ;) Now you are ready to execute the samples. Just run each sample and look for the output produced by the inbound adapters (**TwitterSearchSample.java** and **TwitterTimelineUpdateSample.java**) The outbound adapter sample (**TwitterSendUpdatesSample.java**) will not produce any output. Instead within seconds you should see your tweet. -[OAuth]: http://en.wikipedia.org/wiki/OAuth \ No newline at end of file +[OAuth]: https://en.wikipedia.org/wiki/OAuth \ No newline at end of file diff --git a/basic/web-sockets/src/main/resources/static/sockjs.js b/basic/web-sockets/src/main/resources/static/sockjs.js index e36980419..6943b2737 100644 --- a/basic/web-sockets/src/main/resources/static/sockjs.js +++ b/basic/web-sockets/src/main/resources/static/sockjs.js @@ -1,4 +1,4 @@ -/* SockJS client, version 0.3.4, http://sockjs.org, MIT License +/* SockJS client, version 0.3.4, https://github.com/sockjs/sockjs-client, MIT License Copyright (c) 2011-2012 VMware, Inc. diff --git a/basic/ws-inbound-gateway/README.md b/basic/ws-inbound-gateway/README.md index 8c7d9b691..b28f36182 100644 --- a/basic/ws-inbound-gateway/README.md +++ b/basic/ws-inbound-gateway/README.md @@ -12,4 +12,4 @@ To use the *Gateway*, you can run the tests that are located within the **src/te -[Spring Web Services]: http://www.springsource.org/spring-web-services \ No newline at end of file +[Spring Web Services]: https://spring.io/projects/spring-ws \ No newline at end of file diff --git a/basic/ws-outbound-gateway/README.md b/basic/ws-outbound-gateway/README.md index 954cf2686..63802fe79 100644 --- a/basic/ws-outbound-gateway/README.md +++ b/basic/ws-outbound-gateway/README.md @@ -15,13 +15,13 @@ A very simple example that show you how easy it is to invoke a service based on Fahrenheit (90F) to Celsius (32.2C) and the result is printed to the console: ```` -32.2222222222222```` +32.2222222222222```` ## Running the Sample To run the sample simply execute **WebServiceDemoTestApp** in package *org.springframework.integration.samples.ws*. -You can also execute that class using the [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html): +You can also execute that class using the [Gradle Application Plugin](https://www.gradle.org/docs/current/userguide/application_plugin.html): $ gradlew :ws-outbound-gateway:run -[Simple Object Access Protocol]: http://en.wikipedia.org/wiki/SOAP +[Simple Object Access Protocol]: https://en.wikipedia.org/wiki/SOAP diff --git a/basic/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemoTestApp.java b/basic/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemoTestApp.java index 5dbfaee21..5ea248ad1 100644 --- a/basic/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemoTestApp.java +++ b/basic/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemoTestApp.java @@ -39,7 +39,7 @@ public static void main(String[] args) { // Compose the XML message according to the server's schema String requestXml = - "" + + "" + "90.0" + ""; diff --git a/basic/xml/README.md b/basic/xml/README.md index 0c1f59b10..04f383801 100644 --- a/basic/xml/README.md +++ b/basic/xml/README.md @@ -11,7 +11,7 @@ This example demonstrates the following aspects of the [Extensible Markup Langua ## Running the Sample To run the sample, execute the class **org.springframework.integration.samples.xml.BookOrderProcessingTestApp**. -Alternatively, you can run the sample using [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html) by executing: +Alternatively, you can run the sample using [Gradle Application Plugin](https://www.gradle.org/docs/current/userguide/application_plugin.html) by executing: $ gradlew :xml:run @@ -35,6 +35,6 @@ You should see the following output: -[Extensible Markup Language]: http://en.wikipedia.org/wiki/XML -[XPath]: http://en.wikipedia.org/wiki/XPath -[XSLT]: http://en.wikipedia.org/wiki/XSLT +[Extensible Markup Language]: https://en.wikipedia.org/wiki/XML +[XPath]: https://en.wikipedia.org/wiki/XPath +[XSLT]: https://en.wikipedia.org/wiki/XSLT diff --git a/basic/xmpp/README.md b/basic/xmpp/README.md index dc11c3e7c..5e85e6f0c 100644 --- a/basic/xmpp/README.md +++ b/basic/xmpp/README.md @@ -18,5 +18,5 @@ You'll also need to test it with your friend or have two Google accounts setup. To test **SendInstantMessageSample.java**, first log on to the account identified via **send.to.user** property and make sure that that account is in your buddy list. Then run the demo. To test **ReceiveInstantMessageSample.java**, first log on to the account identified via **send.to.user** property. Then run the demo. Now any instant messages sent to your account appear in the console. -[Google Talk]: http://www.google.com/talk/ -[Extensible Messaging and Presence Protocol]: http://en.wikipedia.org/wiki/Extensible_Messaging_and_Presence_Protocol \ No newline at end of file +[Google Talk]: https://www.google.com/talk/ +[Extensible Messaging and Presence Protocol]: https://en.wikipedia.org/wiki/Extensible_Messaging_and_Presence_Protocol \ No newline at end of file diff --git a/dsl/cafe-dsl/README.md b/dsl/cafe-dsl/README.md index f2e3ec0a3..6031cfc29 100644 --- a/dsl/cafe-dsl/README.md +++ b/dsl/cafe-dsl/README.md @@ -1,7 +1,7 @@ # Cafe Demo: Spring Integration Java DSL This sample demonstrates the classical Cafe Demo, but it is based on [Spring Integration Java DSL](https://github.com/spring-projects/spring-integration-extensions/wiki/Spring-Integration-Java-DSL-Reference) - and [Spring Boot](http://projects.spring.io/spring-boot). + and [Spring Boot](https://projects.spring.io/spring-boot). See the `cafe` project **README.md** for more details about the domain and the Cafe algorithm. diff --git a/dsl/kafka-dsl/README.md b/dsl/kafka-dsl/README.md index 07e7aacee..5a1116a92 100644 --- a/dsl/kafka-dsl/README.md +++ b/dsl/kafka-dsl/README.md @@ -9,7 +9,7 @@ Start Apache Zookeeper and Apache Kafka according to the documentation for the A $ gradlew :kafka:run -This will package the application and run it using the [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html) +This will package the application and run it using the [Gradle Application Plugin](https://www.gradle.org/docs/current/userguide/application_plugin.html) #### Using an IDE such as SpringSource Tool Suite™ (STS) diff --git a/dsl/si4demo/README.md b/dsl/si4demo/README.md index 56abb5935..269466a28 100644 --- a/dsl/si4demo/README.md +++ b/dsl/si4demo/README.md @@ -25,7 +25,7 @@ In both cases, you can use Telnet or curl to search twitter The DSL version also accepts typing in a hashtag for the search in the console. The DSL version also adds a filter to only allow hashtags starting with `#spring`, and only returns the first tweet. -Twitter now requires authentication to perform searches; visit the [twitter developer site](http://dev.twitter.com) to set up the application and enter the keys/secrets in _application.yml_ on the classpath. An 'empty' yaml file is provided in _src/main/resources: +Twitter now requires authentication to perform searches; visit the [twitter developer site](https://dev.twitter.com) to set up the application and enter the keys/secrets in _application.yml_ on the classpath. An 'empty' yaml file is provided in _src/main/resources: twitter: oauth: diff --git a/intermediate/README.md b/intermediate/README.md index 4aebbe7ba..97c69054b 100644 --- a/intermediate/README.md +++ b/intermediate/README.md @@ -1,6 +1,6 @@ Intermediate Samples ==================== -This category targets developers who are already familiar with the [Spring Integration](http://www.springsource.org/spring-integration) framework (past getting started), but need some more guidance while resolving more advanced technical problems that they have to deal with once having switched to a Messaging architecture. +This category targets developers who are already familiar with the [Spring Integration](https://www.springsource.org/spring-integration) framework (past getting started), but need some more guidance while resolving more advanced technical problems that they have to deal with once having switched to a Messaging architecture. For example; If you are looking for an answer on how to handle errors in various scenarios or how to properly configure the **Aggregator** for the situations where some messages might not ever arrive for aggregation etc., and any other issue that goes beyond a basic understanding and configuration of a particular component and addresses "what else you can do with it" type of problem, this would be the right place to find these type of samples. diff --git a/intermediate/dynamic-poller/README.md b/intermediate/dynamic-poller/README.md index e9bd0a00a..cb8a30a6d 100644 --- a/intermediate/dynamic-poller/README.md +++ b/intermediate/dynamic-poller/README.md @@ -12,7 +12,7 @@ When changing the polling period, the change to the trigger will occur after the You can run the application by either: * running the "Main" class from within STS (Right-click on Main class --> Run As --> Java Application) -* or from the command line using the [Gradle](http://www.gradle.org): +* or from the command line using the [Gradle](https://www.gradle.org): $ gradlew :dynamic-poller:runHelloWorldApp @@ -24,7 +24,7 @@ You should see output like the following: Welcome to the Spring Integration Dynamic Poller Sample! For more information please visit: - http://www.springsource.org/spring-integration + https://www.springsource.org/spring-integration ========================================================== INFO : org.springframework.integration.samples.poller.Main - diff --git a/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/Main.java b/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/Main.java index c052f8bbc..a97be1a8d 100644 --- a/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/Main.java +++ b/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/Main.java @@ -50,7 +50,7 @@ public static void main(final String... args) { + "\n Welcome to the Spring Integration Dynamic Poller Sample! " + "\n " + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + "\n " + "\n=========================================================="); diff --git a/intermediate/mail-attachments/README.md b/intermediate/mail-attachments/README.md index f13caa247..cd86318fb 100644 --- a/intermediate/mail-attachments/README.md +++ b/intermediate/mail-attachments/README.md @@ -13,10 +13,10 @@ This example demonstrates how emails including their attachments can be processe # Getting Started -In order to use this sample you must have access to a mail-server. You can either use an external server (e.g. GMail) or you can also easily setup your own mail server using Apache James 3.0 (http://james.apache.org/). You can find instructions for setting up a basic instance at: +In order to use this sample you must have access to a mail-server. You can either use an external server (e.g. GMail) or you can also easily setup your own mail server using Apache James 3.0 (https://james.apache.org/). You can find instructions for setting up a basic instance at: -* http://james.apache.org/server/3/quick-start.html -* http://hillert.blogspot.com/2011/05/testing-email-notifications-with-apache.html +* https://james.apache.org/server/3/quick-start.html +* https://hillert.blogspot.com/2011/05/testing-email-notifications-with-apache.html In **src/main/resources/META-INF/spring/integration/spring-integration-context.xml** change the following to reflect the settings for your mail server. @@ -37,5 +37,5 @@ Once started, the configured mail server will be polled for new email messages e For help please take a look at the Spring Integration documentation: -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration diff --git a/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/Main.java b/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/Main.java index bea94ca1b..8ce7ae131 100644 --- a/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/Main.java +++ b/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/Main.java @@ -52,7 +52,7 @@ public static void main(final String... args) { + "\n Welcome to Spring Integration! " + "\n" + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + "\n" + HORIZONTAL_LINE ); diff --git a/intermediate/monitoring/README.md b/intermediate/monitoring/README.md index b4d4018eb..1d9350fcb 100644 --- a/intermediate/monitoring/README.md +++ b/intermediate/monitoring/README.md @@ -54,7 +54,7 @@ However, you will need to configure OAuth and set the values in the OAuth proper To use OAuth authentication/authorization with Twitter you must create a new Application on the Twitter Developer's site. Follow the directions below to create a new application and obtain the consumer keys and the access token: -* Go to [http://dev.twitter.com/](http://dev.twitter.com/) +* Go to [https://dev.twitter.com/](https://dev.twitter.com/) * Log in to your account * Go to *My applications*. * Click on 'Create a new application' link and fill out all required fields on the form provided; @@ -80,8 +80,8 @@ NOTE: the above values are samples only. For help please see the Spring Integration documentation: -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration -[MBeans]: http://docs.oracle.com/javase/tutorial/jmx/mbeans/index.html -[SpringSource Developer YouTube Channel]: http://www.youtube.com/SpringSourceDev -[VisualVM]: http://visualvm.java.net/ +[MBeans]: https://docs.oracle.com/javase/tutorial/jmx/mbeans/index.html +[SpringSource Developer YouTube Channel]: https://www.youtube.com/SpringSourceDev +[VisualVM]: https://visualvm.java.net/ diff --git a/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java b/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java index 5a49a64f5..bf444389b 100644 --- a/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java @@ -59,7 +59,7 @@ public class DefaultTwitterService implements TwitterService { private IntegrationMBeanExporter exporter; /** * Constructor that initializes the 'twitterMessages' Map as a simple LRU - * cache. @See http://blogs.oracle.com/swinger/entry/collections_trick_i_lru_cache + * cache. @See https://blogs.oracle.com/swinger/entry/collections_trick_i_lru_cache */ public DefaultTwitterService() { diff --git a/intermediate/monitoring/src/main/webapp/js/jquery-1.6.1.min.js b/intermediate/monitoring/src/main/webapp/js/jquery-1.6.1.min.js index 4155bce93..3afb88783 100644 --- a/intermediate/monitoring/src/main/webapp/js/jquery-1.6.1.min.js +++ b/intermediate/monitoring/src/main/webapp/js/jquery-1.6.1.min.js @@ -1,13 +1,13 @@ /*! * jQuery JavaScript Library v1.6.1 - * http://jquery.com/ + * https://jquery.com/ * * Copyright 2011, John Resig * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license + * https://jquery.org/license * * Includes Sizzle.js - * http://sizzlejs.com/ + * https://sizzlejs.com/ * Copyright 2011, The Dojo Foundation * Released under the MIT, BSD, and GPL Licenses. * diff --git a/intermediate/monitoring/src/main/webapp/js/jquery.periodicalupdater.js b/intermediate/monitoring/src/main/webapp/js/jquery.periodicalupdater.js index f0a2f0e17..52b392982 100644 --- a/intermediate/monitoring/src/main/webapp/js/jquery.periodicalupdater.js +++ b/intermediate/monitoring/src/main/webapp/js/jquery.periodicalupdater.js @@ -1,17 +1,17 @@ /** * PeriodicalUpdater - jQuery plugin for timed, decaying ajax calls * - * http://www.360innovate.co.uk/blog/2009/03/periodicalupdater-for-jquery/ - * http://enfranchisedmind.com/blog/posts/jquery-periodicalupdater-ajax-polling/ + * https://www.360innovate.co.uk/blog/2009/03/periodicalupdater-for-jquery/ + * https://nofluffjuststuff.com/blog/robert_fischer/2009/06/jquery_periodicalupdater.html * * Copyright (c) 2009 by the following: - * Frank White (http://customcode.info) - * Robert Fischer (http://smokejumperit.com) - * 360innovate (http://www.360innovate.co.uk) + * Frank White (https://customcode.info) + * Robert Fischer (https://blog.enfranchisedmind.com/posts/author/candide/?coming_from=smokejumperit.com) + * 360innovate (https://www.360innovate.co.uk) * * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html + * https://www.opensource.org/licenses/mit-license.php + * https://www.gnu.org/licenses/gpl.html * */ diff --git a/intermediate/rest-http/readme.md b/intermediate/rest-http/readme.md index a60b5a218..d8df0ff30 100644 --- a/intermediate/rest-http/readme.md +++ b/intermediate/rest-http/readme.md @@ -77,11 +77,11 @@ The REST Endpoint is using [Spring Security][]. The security credentials are: They are stored in `src/main/resources/users.properties`. -[Apache Tomcat]: http://tomcat.apache.org/ -[cURL]: http://en.wikipedia.org/wiki/CURL -[Jetty]: http://www.eclipse.org/jetty/ -[JUnit]: http://junit.org/ -[Gradle]: http://www.gradle.org -[RestTemplate]: http://static.springsource.org/spring/docs/current/javadoc-api/org/springframework/web/client/RestTemplate.html -[Spring Security]: http://www.springsource.org/spring-security -[Spring Tool Suite]: http://www.springsource.org/sts +[Apache Tomcat]: https://tomcat.apache.org/ +[cURL]: https://en.wikipedia.org/wiki/CURL +[Jetty]: https://www.eclipse.org/jetty/ +[JUnit]: https://junit.org/ +[Gradle]: https://www.gradle.org +[RestTemplate]: https://docs.spring.io/spring/docs/current/javadoc-api/org/springframework/web/client/RestTemplate.html +[Spring Security]: https://www.springsource.org/spring-security +[Spring Tool Suite]: https://www.springsource.org/sts diff --git a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/JaxbJacksonObjectMapper.java b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/JaxbJacksonObjectMapper.java index 8aa734573..28aaeeb3f 100644 --- a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/JaxbJacksonObjectMapper.java +++ b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/JaxbJacksonObjectMapper.java @@ -25,7 +25,7 @@ * JaxbJacksonObjectMapper.java: This is the custom JAXB JSON ObjectMapper *

* NOTE: The source code is provided by Gunnar Hillert in his blog posted at - * http://hillert.blogspot.com/2011/01/marshal-json-data-using-jackson-in.html. + * https://hillert.blogspot.com/2011/01/marshal-json-data-using-jackson-in.html. * I modified a little bit to use the latest {@link DeserializationConfig} API * instead of deprecated ones. *

diff --git a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/view/ExtendedMappingJacksonJsonView.java b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/view/ExtendedMappingJacksonJsonView.java index d1af76819..fa1b78bf4 100644 --- a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/view/ExtendedMappingJacksonJsonView.java +++ b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/view/ExtendedMappingJacksonJsonView.java @@ -23,7 +23,7 @@ * ExtendedMappingJacksonJsonView.java: This class extends the Spring's MappingJacksonJsonView *

* Note: The source code for this class is taken from the forum posted by AhungerArtist - * at http://forum.springsource.org/archive/index.php/t-84006.html + * at https://forum.spring.io/archive/index.php/t-84006.html *

* @author Vigil Bose * @author Gary Russell diff --git a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/CircuitBreakerDemo.java b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/CircuitBreakerDemo.java index 5d19e9eb5..3fc7443cb 100644 --- a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/CircuitBreakerDemo.java +++ b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/CircuitBreakerDemo.java @@ -36,7 +36,7 @@ public static void main(String[] args) throws Exception { + "\n Welcome to Spring Integration! " + "\n " + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + "\n " + "\n=========================================================" ); diff --git a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferDeleteAfterSuccessDemo.java b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferDeleteAfterSuccessDemo.java index c008e926d..1c6c0436a 100644 --- a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferDeleteAfterSuccessDemo.java +++ b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferDeleteAfterSuccessDemo.java @@ -43,7 +43,7 @@ public static void main(String[] args) throws Exception { + "\n Welcome to Spring Integration! " + "\n " + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + "\n " + "\n=========================================================" ); diff --git a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferRenameAfterFailureDemo.java b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferRenameAfterFailureDemo.java index c96fa24cb..db21e9535 100644 --- a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferRenameAfterFailureDemo.java +++ b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/FileTransferRenameAfterFailureDemo.java @@ -41,7 +41,7 @@ public static void main(String[] args) throws Exception { + "\n Welcome to Spring Integration! " + "\n " + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + "\n " + "\n=========================================================" ); diff --git a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/StatefulRetryDemo.java b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/StatefulRetryDemo.java index 705de95fb..9e222e4bd 100644 --- a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/StatefulRetryDemo.java +++ b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/StatefulRetryDemo.java @@ -36,7 +36,7 @@ public static void main(String[] args) throws Exception { + "\n Welcome to Spring Integration! " + "\n " + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + "\n " + "\n=========================================================" ); diff --git a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/StatelessRetryDemo.java b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/StatelessRetryDemo.java index 345cf2214..b6b52f36c 100644 --- a/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/StatelessRetryDemo.java +++ b/intermediate/retry-and-more/src/main/java/org/springframework/integration/samples/advice/StatelessRetryDemo.java @@ -36,7 +36,7 @@ public static void main(String[] args) throws Exception { + "\n Welcome to Spring Integration! " + "\n " + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + "\n " + "\n=========================================================" ); diff --git a/intermediate/splitter-aggregator-reaper/README.md b/intermediate/splitter-aggregator-reaper/README.md index 482d93fcd..232320f21 100644 --- a/intermediate/splitter-aggregator-reaper/README.md +++ b/intermediate/splitter-aggregator-reaper/README.md @@ -20,7 +20,7 @@ You should see the following output: Welcome to Spring Integration! For more information please visit: - http://www.springsource.org/spring-integration + https://www.springsource.org/spring-integration ========================================================= 13:47:56.039 INFO [main][org.springframework.integration.store.MessageGroupStoreReaper] started org.springframework.integration.store.MessageGroupStoreReaper@4b85c17 @@ -36,15 +36,15 @@ You should see the following output: # Credits -We would like to thank Christopher Hunt ([@huntchr](http://twitter.com/huntchr)) for contributing this sample. +We would like to thank Christopher Hunt ([@huntchr](https://twitter.com/huntchr)) for contributing this sample. -------------------------------------------------------------------------------- For help please take a look at the Spring Integration documentation: -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration -[aggregating]: http://static.springsource.org/spring-integration/reference/html/messaging-routing-chapter.html#aggregator -[Enterprise Integration Patterns]: http://www.eaipatterns.com/ -[message store reaper]: http://static.springsource.org/spring-integration/reference/html/messaging-routing-chapter.html#aggregator-config -[splitting]: http://static.springsource.org/spring-integration/reference/html/messaging-routing-chapter.html#splitter +[aggregating]: https://docs.spring.io/spring-integration/reference/html/#aggregator +[Enterprise Integration Patterns]: https://www.enterpriseintegrationpatterns.com/ +[message store reaper]: https://docs.spring.io/spring-integration/reference/html/#reaper +[splitting]: https://docs.spring.io/spring-integration/reference/html/#splitter diff --git a/intermediate/splitter-aggregator-reaper/src/main/java/org/springframework/integration/samples/splitteraggregator/Main.java b/intermediate/splitter-aggregator-reaper/src/main/java/org/springframework/integration/samples/splitteraggregator/Main.java index 81d6742f0..e5eadff67 100644 --- a/intermediate/splitter-aggregator-reaper/src/main/java/org/springframework/integration/samples/splitteraggregator/Main.java +++ b/intermediate/splitter-aggregator-reaper/src/main/java/org/springframework/integration/samples/splitteraggregator/Main.java @@ -51,7 +51,7 @@ public static void main(final String... args) { + "\n Welcome to Spring Integration! " + "\n " + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + "\n " + "\n=========================================================" ); diff --git a/intermediate/stored-procedures-derby/README.md b/intermediate/stored-procedures-derby/README.md index f68ab98a8..2221549cb 100644 --- a/intermediate/stored-procedures-derby/README.md +++ b/intermediate/stored-procedures-derby/README.md @@ -26,5 +26,5 @@ Just make sure you have Gradle set up and that the project builds successfully. For help please take a look at the Spring Integration documentation: -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index 7b407671e..7023a1870 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -54,7 +54,7 @@ public static void main(final String... args) { LOGGER.info(LINE + LINE + "\n Welcome to Spring Integration Coffee Database! " + NEWLINE + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + NEWLINE + LINE); + + "\n https://www.springsource.org/spring-integration " + NEWLINE + LINE); final AbstractApplicationContext context = new ClassPathXmlApplicationContext( "classpath:META-INF/spring/integration/*-context.xml"); diff --git a/intermediate/stored-procedures-ms/README.md b/intermediate/stored-procedures-ms/README.md index 071c9026b..512c1a1c0 100644 --- a/intermediate/stored-procedures-ms/README.md +++ b/intermediate/stored-procedures-ms/README.md @@ -13,15 +13,15 @@ Access to a *Microsoft SQL Server* or *Microsoft SQL Server Express* database in This sample was tested against: **Microsoft SQL Server 2008 R2 RTM - Express** (Which can be downloaded and used for free). The sample should also work for newer versions (including the full version) of *Microsoft SQL Server*. You can download *Microsoft SQL Server Express 2008: SQL Server Express*: -* [http://www.microsoft.com/en-us/download/details.aspx?id=23650](http://www.microsoft.com/en-us/download/details.aspx?id=23650) +* [https://www.microsoft.com/en-us/download/details.aspx?id=23650](https://www.microsoft.com/en-us/download/details.aspx?id=23650) If you have trouble accessing a remote instance of *Microsoft SQL Server Express*, see: -* [http://support.microsoft.com/default.aspx?scid=kb;EN-US;914277#method2](http://support.microsoft.com/default.aspx?scid=kb;EN-US;914277#method2) +* [https://support.microsoft.com/default.aspx?scid=kb;EN-US;914277#method2](https://support.microsoft.com/default.aspx?scid=kb;EN-US;914277#method2) ## JDBC Driver -This sample uses the [jTDS](http://jtds.sourceforge.net) driver, which is considered to be faster than [Microsoft's JDBC driver](http://msdn.microsoft.com/en-us/sqlserver/aa937724.aspx). Nevertheless, the sample should work with either driver. +This sample uses the [jTDS](http://jtds.sourceforge.net) driver, which is considered to be faster than [Microsoft's JDBC driver](https://msdn.microsoft.com/en-us/sqlserver/aa937724.aspx). Nevertheless, the sample should work with either driver. #### Creating the Stored Procedure @@ -117,5 +117,5 @@ You may have to update the *Microsoft SQL Server* properties in: For help please take a look at the Spring Integration documentation: -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration diff --git a/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java b/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index 678af827d..e51cf9f77 100644 --- a/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java +++ b/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -51,7 +51,7 @@ public static void main(final String... args) { + "\n Welcome to Spring Integration! " + "\n " + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + "\n " + "\n=========================================================" ); diff --git a/intermediate/stored-procedures-oracle/README.md b/intermediate/stored-procedures-oracle/README.md index a5956cc77..22b1b78f9 100644 --- a/intermediate/stored-procedures-oracle/README.md +++ b/intermediate/stored-procedures-oracle/README.md @@ -22,7 +22,7 @@ Nevertheless, the example should work with other versions as well. ### JDBC Driver Installation for Oracle -- Go to [http://www.oracle.com/technetwork/indexes/downloads/index.html](http://www.oracle.com/technetwork/indexes/downloads/index.html) +- Go to [https://www.oracle.com/technetwork/indexes/downloads/index.html](https://www.oracle.com/technetwork/indexes/downloads/index.html) - Under "JDBC Drivers", download the appropriate driver relevant to your Oracle and JDK version (This sample was tested using "Oracle Database 11g Release 2 JDBC Drivers") - Once downloaded, install the driver to your local Maven repository: @@ -30,7 +30,7 @@ Nevertheless, the example should work with other versions as well. - Now you can uncomment the `ojdbc6` dependency in the build.gradle file for `stored-procedures-oracle` project. -After that you can run the sample application using [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html): +After that you can run the sample application using [Gradle Application Plugin](https://www.gradle.org/docs/current/userguide/application_plugin.html): $ gradlew :stored-procedures-oracle:run @@ -127,7 +127,7 @@ You should see the following output: Stored Procedure/Function Sample for Oracle For more information please visit: - http://www.springsource.org/spring-integration + https://www.springsource.org/spring-integration ========================================================= Please enter a choice and press : @@ -222,7 +222,7 @@ You should see the following output: Stored Procedure/Function Sample for Oracle For more information please visit: - http://www.springsource.org/spring-integration + https://www.springsource.org/spring-integration ========================================================= Please enter a choice and press : @@ -246,6 +246,6 @@ This sample also periodically polls the Oracle database using a **Stored Procedu For help please take a look at the Spring Integration documentation: -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration [Stored Procedure Sample for PostgreSql]: https://github.com/ghillert/spring-integration-samples/tree/master/intermediate/stored-procedures-postgresql diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index be243770a..b565ee1cb 100644 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -56,7 +56,7 @@ public static void main(final String... args) { + "\n Stored Procedure/Function Sample for Oracle " + "\n " + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + "\n " + "\n=========================================================" ); diff --git a/intermediate/stored-procedures-postgresql/README.md b/intermediate/stored-procedures-postgresql/README.md index 9d9e0f5a1..4b0613261 100644 --- a/intermediate/stored-procedures-postgresql/README.md +++ b/intermediate/stored-procedures-postgresql/README.md @@ -85,5 +85,5 @@ Please configure the necessary credentials in order to connect to your database For help please take a look at the Spring Integration documentation: -http://www.springsource.org/spring-integration +https://www.springsource.org/spring-integration diff --git a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index f24fabbe0..78e1f8ceb 100644 --- a/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java +++ b/intermediate/stored-procedures-postgresql/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -56,7 +56,7 @@ public static void main(final String... args) { + "\n Welcome to Spring Integration Coffee Database! " + NEWLINE + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + NEWLINE + LINE ); diff --git a/intermediate/travel/README.md b/intermediate/travel/README.md index cc22b6d32..2902b89a2 100644 --- a/intermediate/travel/README.md +++ b/intermediate/travel/README.md @@ -40,14 +40,14 @@ Here you see, we are using *Spring Expression Language* (SpEL) to bind the value ## MapQuest -This sample uses the [MapQuest API][], specifically the [MapQuest Traffic Web Service][]. As such you must setup an API Key. Therefore, please create a MapQuest developer account. This can be done at: http://developer.mapquest.com/. +This sample uses the [MapQuest API][], specifically the [MapQuest Traffic Web Service][]. As such you must setup an API Key. Therefore, please create a MapQuest developer account. This can be done at: https://developer.mapquest.com/. -¡**Important**! - Please be aware that the API key you received from MapQuest is URL encoded. As such you must decode the key, so you can use it with Spring Integration. For example you can use the service on the following site to decode the API key: http://meyerweb.com/eric/tools/dencoder/ +¡**Important**! - Please be aware that the API key you received from MapQuest is URL encoded. As such you must decode the key, so you can use it with Spring Integration. For example you can use the service on the following site to decode the API key: https://meyerweb.com/eric/tools/dencoder/ ## Running the Sample To run the sample execute **Main** in package **org.springframework.integration.samples.travel**. -You can also execute that class using the [Gradle Application Plugin](http://www.gradle.org/docs/current/userguide/application_plugin.html): +You can also execute that class using the [Gradle Application Plugin](https://www.gradle.org/docs/current/userguide/application_plugin.html): $ gradlew :travel:run -Dmapquest.apikey="your_mapquest_api_key_url_decoded" @@ -58,7 +58,7 @@ You should see the following output: Welcome to the Spring Integration Travel App! For more information please visit: - http://www.springintegration.org/ + https://www.springsource.org/spring-integration/ ========================================================= Please select the city, for which you would like to get traffic and weather information: @@ -76,8 +76,8 @@ You should see the following output: * Added support for multiple cities (Atlanta, Boston, San Francisco) -[MapQuest API]: http://www.mapquestapi.com/ -[MapQuest Traffic Web Service]: http://platform.beta.mapquest.com/traffic/ +[MapQuest API]: https://www.mapquestapi.com/ +[MapQuest Traffic Web Service]: https://platform.beta.mapquest.com/traffic/ diff --git a/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/Main.java b/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/Main.java index e7421987b..82ce75bde 100644 --- a/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/Main.java +++ b/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/Main.java @@ -58,7 +58,7 @@ public static void main(String... args) throws Exception{ + "\n Welcome to the Spring Integration Travel App! " + "\n " + "\n For more information please visit: " - + "\n http://www.springintegration.org/ " + + "\n https://www.springsource.org/spring-integration/ " + "\n " + "\n=========================================================" ); diff --git a/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/WeatherRequestTransformer.java b/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/WeatherRequestTransformer.java index c233f92fa..7d7f6a2f0 100644 --- a/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/WeatherRequestTransformer.java +++ b/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/WeatherRequestTransformer.java @@ -18,7 +18,7 @@ public class WeatherRequestTransformer { public String transform(City city){ - return "" + + return "" + " " + city.getPostalCode() + "" + ""; } diff --git a/intermediate/tx-synch/src/main/java/org/springframework/integration/samples/advice/TransactionSynchronizationDemo.java b/intermediate/tx-synch/src/main/java/org/springframework/integration/samples/advice/TransactionSynchronizationDemo.java index 728b85f95..176fc4cf5 100755 --- a/intermediate/tx-synch/src/main/java/org/springframework/integration/samples/advice/TransactionSynchronizationDemo.java +++ b/intermediate/tx-synch/src/main/java/org/springframework/integration/samples/advice/TransactionSynchronizationDemo.java @@ -36,7 +36,7 @@ public static void main(String[] args) throws Exception { + "\n Welcome to Spring Integration! " + "\n " + "\n For more information please visit: " - + "\n http://www.springsource.org/spring-integration " + + "\n https://www.springsource.org/spring-integration " + "\n " + "\n=========================================================" ); From 8eb85d29b3db1ffce832761880e095e42b5c5c22 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Mon, 25 Mar 2019 12:49:27 -0400 Subject: [PATCH 207/356] Add tcp-with-headers sample\ * Fix http/https in license; skip hidden files in project scan. --- README.md | 1 + basic/tcp-with-headers/.gitignore | 24 ++ basic/tcp-with-headers/README.adoc | 32 +++ basic/tcp-with-headers/pom.xml | 206 ++++++++++++++++++ .../tcpheaders/TcpWithHeadersApplication.java | 128 +++++++++++ .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 19 ++ build.gradle | 25 +++ settings.gradle | 14 +- 9 files changed, 443 insertions(+), 6 deletions(-) create mode 100644 basic/tcp-with-headers/.gitignore create mode 100644 basic/tcp-with-headers/README.adoc create mode 100644 basic/tcp-with-headers/pom.xml create mode 100644 basic/tcp-with-headers/src/main/java/org/springframework/integration/samples/tcpheaders/TcpWithHeadersApplication.java create mode 100644 basic/tcp-with-headers/src/main/resources/application.properties create mode 100644 basic/tcp-with-headers/src/main/resources/logback.xml diff --git a/README.md b/README.md index 4b7d24441..7465d3179 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,7 @@ This is a good place to get started. The samples here are technically motivated * **tcp-amqp** - Demonstrates basic functionality of bridging the **Spring Integration TCP Adapters** with **Spring Integration AMQP Adapters** * **tcp-broadcast** - Demonstrates broadcasting a message to multiple connected TCP clients. * **tcp-client-server** - Demonstrates socket communication using **TcpOutboundGateway**, **TcpInboundGateway** and also uses a **Gateway** and a **Service Activator** +* **tcp-with-headers** - Demonstrates sending headers along with the payload over TCP using JSON. * **testing-examples** - A series of test cases that show techniques to **test** Spring Integration applications. * **twitter** - Illustrates Twitter support using the **Twitter Inbound Channel Adapter**, **Twitter Inbound Search Channel Adapter**, **Twitter Outbound Channel Adapter** * **ws-inbound-gateway** - Example showing basic functionality of the **Web Service Gateway** diff --git a/basic/tcp-with-headers/.gitignore b/basic/tcp-with-headers/.gitignore new file mode 100644 index 000000000..57a6aeaa2 --- /dev/null +++ b/basic/tcp-with-headers/.gitignore @@ -0,0 +1,24 @@ +target/ +.mvn +mvn* + +### STS ### +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ diff --git a/basic/tcp-with-headers/README.adoc b/basic/tcp-with-headers/README.adoc new file mode 100644 index 000000000..59d978053 --- /dev/null +++ b/basic/tcp-with-headers/README.adoc @@ -0,0 +1,32 @@ += TCP With Headers + +There is no standard way to convey message headers over raw TCP; they need to be encoded into the payload on the sending side and decoded on the receiving side. + +This example demonstrates how to use standard framework components to encode the payload and certain headers using JSON. +It takes console input and, if the input starts with a lower case, uppercases it and vice versa. +Whether to upper case or lower case the input is conveyed in a header 'type'. + +Run from your favorite IDE, or from the command line `./gradlew :dynamic-tcp-client:run`. + +Here is an example run... + +``` + . ____ _ __ _ _ + /\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \ +( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \ + \\/ ___)| |_)| | | | | || (_| | ) ) ) ) + ' |____| .__|_| |_|_| |_\__, | / / / / + =========|_|==============|___/=/_/_/_/ + :: Spring Boot :: (v2.1.3.RELEASE) + +Enter some text; if it starts with a lower case character, +it will be uppercased by the server; otherwise it will be lowercased; +enter 'quit' to end +this should be uppercased +10:54:39.259 [pool-1-thread-2] INFO exampleLogger - Received type header:upper +THIS SHOULD BE UPPERCASED +This should be lowercased +10:54:49.266 [pool-1-thread-2] INFO exampleLogger - Received type header:lower +this should be lowercased +quit +``` diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml new file mode 100644 index 000000000..65cf6382d --- /dev/null +++ b/basic/tcp-with-headers/pom.xml @@ -0,0 +1,206 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.2.0.BUILD-SNAPSHOT + + org.springframework.integration.samples + tcp-with-headers + 5.2.0.BUILD-SNAPSHOT + TCP Send/Receive with headers + TCP Send/Receive with headers + https://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + garyrussell + Gary Russell + grussell@pivotal.io + + project lead + + + + markfisher + Mark Fisher + mfisher@pivotal.io + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@pivotal.io + + + abilan + Artem Bilan + abilan@pivotal.io + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + org.springframework.boot + spring-boot-starter-integration + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + org.springframework.integration + spring-integration-ip + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + com.fasterxml.jackson.core + jackson-databind + 2.9.8 + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + junit + junit + 4.12 + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + * + org.hamcrest + + + + + org.hamcrest + hamcrest-all + 1.3 + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + org.mockito + mockito-core + 2.24.0 + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + * + org.hamcrest + + + + + org.springframework + spring-test + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + org.springframework.boot + spring-boot-starter-test + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + org.springframework.boot + spring-boot-dependencies + 2.2.0.BUILD-SNAPSHOT + import + pom + + + org.springframework + spring-framework-bom + 5.2.0.BUILD-SNAPSHOT + import + pom + + + org.springframework.integration + spring-integration-bom + 5.2.0.BUILD-SNAPSHOT + import + pom + + + + diff --git a/basic/tcp-with-headers/src/main/java/org/springframework/integration/samples/tcpheaders/TcpWithHeadersApplication.java b/basic/tcp-with-headers/src/main/java/org/springframework/integration/samples/tcpheaders/TcpWithHeadersApplication.java new file mode 100644 index 000000000..7f79ab496 --- /dev/null +++ b/basic/tcp-with-headers/src/main/java/org/springframework/integration/samples/tcpheaders/TcpWithHeadersApplication.java @@ -0,0 +1,128 @@ +/* + * Copyright 2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.tcpheaders; + +import java.util.Scanner; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.ApplicationRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.DependsOn; +import org.springframework.integration.dsl.IntegrationFlow; +import org.springframework.integration.dsl.IntegrationFlows; +import org.springframework.integration.handler.LoggingHandler.Level; +import org.springframework.integration.ip.dsl.Tcp; +import org.springframework.integration.ip.tcp.connection.MessageConvertingTcpMessageMapper; +import org.springframework.integration.ip.tcp.serializer.MapJsonSerializer; +import org.springframework.integration.support.converter.MapMessageConverter; +import org.springframework.messaging.handler.annotation.Header; +import org.springframework.util.StringUtils; + +@SpringBootApplication +public class TcpWithHeadersApplication { + + public static void main(String[] args) { + SpringApplication.run(TcpWithHeadersApplication.class, args); + } + + // Client side + + public interface TcpExchanger { + + public String exchange(String data, @Header("type") String type); + + } + + @Bean + public IntegrationFlow client(@Value("${tcp.port:1234}") int port) { + return IntegrationFlows.from(TcpExchanger.class) + .handle(Tcp.outboundGateway(Tcp.netClient("localhost", port) + .deserializer(jsonMapping()) + .serializer(jsonMapping()) + .mapper(mapper()))) + .get(); + } + + // Server side + + @Bean + public IntegrationFlow server(@Value("${tcp.port:1234}") int port) { + return IntegrationFlows.from(Tcp.inboundGateway(Tcp.netServer(port) + .deserializer(jsonMapping()) + .serializer(jsonMapping()) + .mapper(mapper()))) + .log(Level.INFO, "exampleLogger", "'Received type header:' + headers['type']") + .route("headers['type']", r -> r + .subFlowMapping("upper", + subFlow -> subFlow.transform(String.class, p -> p.toUpperCase())) + .subFlowMapping("lower", + subFlow -> subFlow.transform(String.class, p -> p.toLowerCase()))) + .get(); + } + + // Common + + @Bean + public MessageConvertingTcpMessageMapper mapper() { + MapMessageConverter converter = new MapMessageConverter(); + converter.setHeaderNames("type"); + return new MessageConvertingTcpMessageMapper(converter); + } + + @Bean + public MapJsonSerializer jsonMapping() { + return new MapJsonSerializer(); + } + + // Console + + @Bean + @DependsOn("client") + public ApplicationRunner runner(TcpExchanger exchanger, + ConfigurableApplicationContext context) { + + return args -> { + System.out.println("Enter some text; if it starts with a lower case character,\n" + + "it will be uppercased by the server; otherwise it will be lowercased;\n" + + "enter 'quit' to end"); + Scanner scanner = new Scanner(System.in); + String request; + if (scanner.hasNextLine()) { + request = scanner.nextLine(); + while (!"quit".equals(request.toLowerCase())) { + if (StringUtils.hasText(request)) { + String result = exchanger.exchange(request, + Character.isLowerCase(request.charAt(0)) ? "upper" : "lower"); + System.out.println(result); + } + if (scanner.hasNextLine()) { + request = scanner.nextLine(); + } + else { + request = "quit"; + } + } + } + scanner.close(); + context.close(); + }; + } + +} diff --git a/basic/tcp-with-headers/src/main/resources/application.properties b/basic/tcp-with-headers/src/main/resources/application.properties new file mode 100644 index 000000000..e69de29bb diff --git a/basic/tcp-with-headers/src/main/resources/logback.xml b/basic/tcp-with-headers/src/main/resources/logback.xml new file mode 100644 index 000000000..31377ed57 --- /dev/null +++ b/basic/tcp-with-headers/src/main/resources/logback.xml @@ -0,0 +1,19 @@ + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + + diff --git a/build.gradle b/build.gradle index d8bce4440..bfc89560e 100644 --- a/build.gradle +++ b/build.gradle @@ -1445,6 +1445,31 @@ project('dynamic-tcp-client') { } } +project('tcp-with-headers') { + description = 'TCP Send/Receive with headers' + + apply plugin: 'org.springframework.boot' + + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-ip" + compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" + + testCompile 'org.springframework.boot:spring-boot-starter-test' + } + + bootRun { + main = 'org.springframework.integration.samples.tcpheaders.TcpWithHeadersApplication' + standardInput = System.in + } + + task run(type: JavaExec) { + main 'org.springframework.integration.samples.tcpheaders.TcpWithHeadersApplication' + classpath = sourceSets.main.runtimeClasspath + standardInput = System.in + } +} + sonarqube { properties { diff --git a/settings.gradle b/settings.gradle index 12f6d75f1..0c439f88e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,12 +4,14 @@ rootProject.name = 'spring-integration-samples' def projectDir = new File(rootDir, it) include ":${it}" projectDir.eachDir { dir -> - include ":${dir.name}" - project(":${dir.name}").projectDir = new File(projectDir.absolutePath, dir.name) - if ('cafe' == dir.name) { - dir.eachDir { cafe -> - include ":${cafe.name}" - project(":${cafe.name}").projectDir = new File(dir.absolutePath, cafe.name) + if (!dir.name.startsWith('.')) { + include ":${dir.name}" + project(":${dir.name}").projectDir = new File(projectDir.absolutePath, dir.name) + if ('cafe' == dir.name) { + dir.eachDir { cafe -> + include ":${cafe.name}" + project(":${cafe.name}").projectDir = new File(dir.absolutePath, cafe.name) + } } } } From 47ebbee8f3ebbf616df9a23fffcee74741915073 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 8 Apr 2019 11:06:31 -0400 Subject: [PATCH 208/356] Fix race condition in MQTT ApplicationTest We mock a `MessageHandler` on the receiver side, but still send the message over MQTT. Add `CountDownLatch` to the mocked method and wait for its count before asserting a received message --- .../integration/samples/mqtt/ApplicationTest.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/ApplicationTest.java b/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/ApplicationTest.java index d213ac2ae..a0007409c 100644 --- a/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/ApplicationTest.java +++ b/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/ApplicationTest.java @@ -22,6 +22,9 @@ import static org.springframework.integration.test.mock.MockIntegration.messageArgumentCaptor; import static org.springframework.integration.test.mock.MockIntegration.mockMessageHandler; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; @@ -58,14 +61,16 @@ public class ApplicationTest { private IntegrationFlow mqttOutFlow; @Test - public void test() { + public void test() throws InterruptedException { ArgumentCaptor> captor = messageArgumentCaptor(); - MessageHandler mockMessageHandler = mockMessageHandler(captor).handleNext(m -> { }); + CountDownLatch receiveLatch = new CountDownLatch(1); + MessageHandler mockMessageHandler = mockMessageHandler(captor).handleNext(m -> receiveLatch.countDown()); this.mockIntegrationContext .substituteMessageHandlerFor( "mqttInFlow.org.springframework.integration.config.ConsumerEndpointFactoryBean#1", mockMessageHandler); this.mqttOutFlow.getInputChannel().send(new GenericMessage<>("foo")); + assertThat(receiveLatch.await(10, TimeUnit.SECONDS)).isTrue(); verify(mockMessageHandler).handleMessage(any()); assertThat(captor.getValue().getPayload()) .isEqualTo("foo sent to MQTT, received from MQTT"); From 44218f26a09a0073d69f7d3866a3f61415ba56c9 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 15 Apr 2019 16:39:19 -0400 Subject: [PATCH 209/356] Upgrade dependencies to the latest milestones * Upgrade t Gradle 5.3.1 * Fix compatibility with `AbstractPayloadTransformer` contract * Regenerate POMs --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/cafe-amqp/pom.xml | 4 ++-- applications/cafe/cafe-jms/pom.xml | 4 ++-- applications/cafe/cafe-si/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 4 ++-- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 8 ++++---- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 4 ++-- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 4 ++-- basic/splunk/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 4 ++-- basic/web-sockets/pom.xml | 4 ++-- .../standard/server/Application.java | 19 ++++++------------- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- build.gradle | 10 +++++----- dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 6 +++--- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 8 ++++---- intermediate/retry-and-more/pom.xml | 4 ++-- .../splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- .../stored-procedures-postgresql/pom.xml | 4 ++-- .../tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 67 files changed, 145 insertions(+), 152 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index e73a87524..50a196174 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 93695e13b..25731cab8 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 159a9593b..eaca42038 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -178,14 +178,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 4dab7cdd4..1c2f4e5b6 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -217,14 +217,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index a4f110c98..dd9ee6551 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 5a34908e6..a6213c82b 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index df37adf29..a52f212e8 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 48f505cc5..dc2f037e5 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -246,14 +246,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 034b01c9e..48d874303 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 5a2e5df5b..b907381f7 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -441,14 +441,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index e354f9fd7..1eaa3044f 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 550aeb735..5c5a27247 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 6205aa904..796c5b51a 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -211,14 +211,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 6f0a21777..5ffa5666d 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 99e0d21f1..433edccdc 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 2164331f8..0a10efa5d 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 69c508f8f..9b58b8086 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 1d964c0ba..0e45652b7 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -207,14 +207,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 21752079e..566cbe3c6 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index ce181acec..72fdebaf7 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index cf150f7e4..29e20d799 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 79971abca..e229a15d3 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index f499a0554..d633e8ab3 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index ad6523425..ab4d649e5 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -213,14 +213,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index a09383a66..6ec03f185 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -71,7 +71,7 @@ org.springframework.integration spring-integration-kafka - 3.2.0.BUILD-SNAPSHOT + 3.2.0.M1 compile @@ -98,7 +98,7 @@ org.springframework.kafka spring-kafka - 2.3.0.BUILD-SNAPSHOT + 2.3.0.M1 compile @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 8f1a685cd..e96e7e781 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index a1c2b8681..acea98364 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 0384ece04..7ad1f077e 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 0b05170e5..b30d37e9c 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index f5a63ef55..0611582cd 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 67478e77d..9d98e76a1 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index d54ab4bbd..0bf659fff 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 7c3712507..691e786d3 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 072b2c04a..d7199e8eb 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index a2aa549ae..70cdca17d 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 65cf6382d..42c2f2ba7 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 47d6e10cd..a46bcb00c 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -192,14 +192,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index e919a9084..8471a8ce6 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -149,14 +149,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 8b3421e71..aed2ba96d 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -178,14 +178,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java b/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java index df8189f21..f5c6e96df 100644 --- a/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java +++ b/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ import java.text.DateFormat; import java.util.Collections; import java.util.Date; -import java.util.Iterator; import java.util.concurrent.Executors; import org.springframework.boot.SpringApplication; @@ -42,7 +41,6 @@ import org.springframework.integration.transformer.support.ExpressionEvaluatingHeaderValueMessageProcessor; import org.springframework.integration.websocket.ServerWebSocketContainer; import org.springframework.integration.websocket.outbound.WebSocketOutboundMessageHandler; -import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.simp.SimpMessageHeaderAccessor; @@ -50,6 +48,7 @@ /** * @author Artem Bilan + * * @since 3.0 */ @Configuration @@ -71,14 +70,7 @@ public ServerWebSocketContainer serverWebSocketContainer() { @Bean @InboundChannelAdapter(value = "splitChannel", poller = @Poller(fixedDelay = "1000", maxMessagesPerPoll = "1")) public MessageSource webSocketSessionsMessageSource() { - return new MessageSource>() { - - @Override - public Message> receive() { - return new GenericMessage>(serverWebSocketContainer().getSessions().keySet().iterator()); - } - - }; + return () -> new GenericMessage<>(serverWebSocketContainer().getSessions().keySet().iterator()); } @Bean @@ -103,15 +95,16 @@ public MessageChannel headerEnricherChannel() { @Transformer(inputChannel = "headerEnricherChannel", outputChannel = "transformChannel") public HeaderEnricher headerEnricher() { return new HeaderEnricher(Collections.singletonMap(SimpMessageHeaderAccessor.SESSION_ID_HEADER, - new ExpressionEvaluatingHeaderValueMessageProcessor("payload", null))); + new ExpressionEvaluatingHeaderValueMessageProcessor<>("payload", null))); } @Bean @Transformer(inputChannel = "transformChannel", outputChannel = "sendTimeChannel") public AbstractPayloadTransformer transformer() { return new AbstractPayloadTransformer() { + @Override - protected Object transformPayload(Object payload) throws Exception { + protected Object transformPayload(Object payload) { return DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.DEFAULT).format(new Date()); } diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 7c5601843..0bfd93ded 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index dbb76f933..402a01bab 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index c02b8bdb3..f33c99ee0 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index b3d3fa00d..b31e19788 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/build.gradle b/build.gradle index bfc89560e..9b98a18a4 100644 --- a/build.gradle +++ b/build.gradle @@ -208,13 +208,13 @@ subprojects { subproject -> postgresVersion = '42.2.5' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springIntegrationVersion = '5.2.0.BUILD-SNAPSHOT' - springIntegrationKafkaVersion = '3.2.0.BUILD-SNAPSHOT' + springIntegrationVersion = '5.2.0.M1' + springIntegrationKafkaVersion = '3.2.0.M1' springIntegrationSocialTwiterVersion = '1.0.0.RELEASE' springIntegrationSplunkVersion = '1.1.0.RELEASE' - springKafkaVersion = '2.3.0.BUILD-SNAPSHOT' - springVersion = '5.2.0.BUILD-SNAPSHOT' - springSecurityVersion = '5.1.4.RELEASE' + springKafkaVersion = '2.3.0.M1' + springVersion = '5.2.0.M1' + springSecurityVersion = '5.2.0.M2' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' validationApiVersion = '1.0.0.GA' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 8cc0294ae..e55dbf965 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 203c19e75..af105776d 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -82,7 +82,7 @@ org.springframework.integration spring-integration-kafka - 3.2.0.BUILD-SNAPSHOT + 3.2.0.M1 compile @@ -202,14 +202,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index ed470c57a..3fca30e2d 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -123,14 +123,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 42a81dbcb..ffbb19ca5 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -259,14 +259,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 838e6bc85..ea13fdfd1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index b1c2d34bc..126689445 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 89a118d0f..82e77dabf 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 1b361238f..7d02e0d34 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 7f1a89aec..6093e86b4 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 1b14320e1..51f64847f 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 9fcafb7e2..4f6536471 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 7947d2702..d7c96a03c 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index a30bc1f1a..96ecf9d9a 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -144,7 +144,7 @@ org.springframework.security spring-security-web - 5.1.4.RELEASE + 5.2.0.M2 compile @@ -156,7 +156,7 @@ org.springframework.security spring-security-config - 5.1.4.RELEASE + 5.2.0.M2 compile @@ -250,14 +250,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 56affeeaf..61750ed7d 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 6f66ef771..5abfb521f 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index b3686af87..e15451991 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 4a7898d5b..6f5d6b749 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -172,14 +172,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 0ce9c3be1..2a7dcfd5b 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 91b8f0925..4fb3d76fc 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -184,14 +184,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 9ecc4c6a6..c6b5e56de 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index b4450f120..196ff4504 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index ed71e3472..7eb3751d0 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom org.springframework.integration spring-integration-bom - 5.2.0.BUILD-SNAPSHOT + 5.2.0.M1 import pom From c85f1d444a47ac53f1c6ebb76ffe615290636771 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 29 Apr 2019 09:35:39 -0400 Subject: [PATCH 210/356] JmsMockTests: stopped Channel Adapter by default https://build.spring.io/browse/INTSAMPLES-NIGHTLY-2806 To avoid race condition around `JmsTemplate` mock setup it is better to have a `` stopped by default. We start it later in the test-case when all the environment is already set --- .../testing/jms/JmsMockTests-context.xml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml index 8e8191ec9..b5c83021c 100644 --- a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml +++ b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml @@ -1,9 +1,9 @@ @@ -13,14 +13,17 @@ an exception, an ErrorMessage containing the exception will be sent to the error channel for additional handling. --> - + - - + + - + From ff9596be1d8fdc8839af72aff4889929e1f52cbb Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 13 May 2019 13:56:50 -0400 Subject: [PATCH 211/356] Upgrade to te latest milestones --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/cafe-amqp/pom.xml | 4 ++-- applications/cafe/cafe-jms/pom.xml | 8 ++++---- applications/cafe/cafe-si/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 8 ++++---- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 8 ++++---- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 8 ++++---- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 4 ++-- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 4 ++-- basic/splunk/pom.xml | 6 +++--- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 6 +++--- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- build.gradle | 18 +++++++++--------- dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 6 +++--- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 6 +++--- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 6 +++--- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 4 ++-- intermediate/retry-and-more/pom.xml | 4 ++-- .../splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- .../stored-procedures-postgresql/pom.xml | 4 ++-- .../tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 65 files changed, 150 insertions(+), 150 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 50a196174..ce70d7bbe 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 25731cab8..b1b887703 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index eaca42038..2e89b014e 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -178,14 +178,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 1c2f4e5b6..bcefaebd7 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -217,14 +217,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index dd9ee6551..691279fa3 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index a6213c82b..a7d73f9fe 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -67,7 +67,7 @@ org.apache.activemq activemq-broker - 5.15.8 + 5.15.9 compile @@ -79,7 +79,7 @@ org.apache.activemq activemq-kahadb-store - 5.15.8 + 5.15.9 compile @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index a52f212e8..774024070 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index dc2f037e5..8b09d7cdc 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -246,14 +246,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 48d874303..23f6b7a87 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index b907381f7..313e00a81 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -110,7 +110,7 @@ org.aspectj aspectjtools - 1.9.2 + 1.9.4 compile @@ -299,7 +299,7 @@ org.hibernate hibernate-entitymanager - 5.4.1.Final + 5.4.2.Final compile @@ -441,14 +441,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 1eaa3044f..ab10d69ea 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 5c5a27247..8153e6433 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 796c5b51a..dc5369825 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -211,14 +211,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 5ffa5666d..5a6116eb9 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 433edccdc..96dde7e81 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 0a10efa5d..867a201fd 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 9b58b8086..0ad2be431 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 0e45652b7..bfe6b707d 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -207,14 +207,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 566cbe3c6..0d53effaf 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 72fdebaf7..34ce02d94 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 29e20d799..cffdcfc50 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index e229a15d3..a430b5b95 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -89,7 +89,7 @@ org.apache.activemq activemq-broker - 5.15.8 + 5.15.9 compile @@ -101,7 +101,7 @@ org.apache.activemq activemq-kahadb-store - 5.15.8 + 5.15.9 compile @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index d633e8ab3..2549e7eb6 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index ab4d649e5..7477422b5 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -213,14 +213,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 6ec03f185..14775c651 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -71,7 +71,7 @@ org.springframework.integration spring-integration-kafka - 3.2.0.M1 + 3.2.0.M2 compile @@ -98,7 +98,7 @@ org.springframework.kafka spring-kafka - 2.3.0.M1 + 2.3.0.M2 compile @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index e96e7e781..98851648e 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index acea98364..8c4030414 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 7ad1f077e..c3d4dec31 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index b30d37e9c..afd77db2d 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 0611582cd..3a6e0aa2e 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 9d98e76a1..72de1ba78 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 0bf659fff..cd5be6259 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -82,7 +82,7 @@ org.springframework.integration spring-integration-splunk - 1.1.0.RELEASE + 1.2.0.BUILD-SNAPSHOT compile @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 691e786d3..7685deec1 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index d7199e8eb..ce8299a31 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 70cdca17d..c9fd34f6a 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 42c2f2ba7..e864b6005 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index a46bcb00c..f5068046e 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -192,14 +192,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 8471a8ce6..24e261f90 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -55,7 +55,7 @@ org.springframework.integration spring-integration-social-twitter - 1.0.0.RELEASE + 1.0.1.BUILD-SNAPSHOT compile @@ -149,14 +149,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index aed2ba96d..808a21332 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -178,14 +178,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 0bfd93ded..c13ddfe3a 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 402a01bab..62879b562 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index f33c99ee0..4364a64c4 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index b31e19788..186c38d0c 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/build.gradle b/build.gradle index 9b98a18a4..978d1f390 100644 --- a/build.gradle +++ b/build.gradle @@ -169,9 +169,9 @@ subprojects { subproject -> } ext { - activeMqVersion = '5.15.8' + activeMqVersion = '5.15.9' apacheSshdVersion = '2.2.0' - aspectjVersion = '1.9.2' + aspectjVersion = '1.9.4' commonsDigesterVersion = '2.0' commonsDbcpVersion = '1.2.2' commonsFileUploadVersion = '1.4' @@ -181,7 +181,7 @@ subprojects { subproject -> c3p0Version = '0.9.1.2' derbyVersion = '10.14.2.0' hamcrestVersion = '1.3' - hibernateVersion = '5.4.1.Final' + hibernateVersion = '5.4.2.Final' hibernateValidatorVersion = '5.4.1.Final' ftpServerVersion = '1.1.1' flexjsonVersion = '2.0' @@ -208,12 +208,12 @@ subprojects { subproject -> postgresVersion = '42.2.5' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springIntegrationVersion = '5.2.0.M1' - springIntegrationKafkaVersion = '3.2.0.M1' - springIntegrationSocialTwiterVersion = '1.0.0.RELEASE' - springIntegrationSplunkVersion = '1.1.0.RELEASE' - springKafkaVersion = '2.3.0.M1' - springVersion = '5.2.0.M1' + springIntegrationVersion = '5.2.0.M2' + springIntegrationKafkaVersion = '3.2.0.M2' + springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' + springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' + springKafkaVersion = '2.3.0.M2' + springVersion = '5.2.0.M2' springSecurityVersion = '5.2.0.M2' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index e55dbf965..12918d10f 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index af105776d..481df97aa 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -82,7 +82,7 @@ org.springframework.integration spring-integration-kafka - 3.2.0.M1 + 3.2.0.M2 compile @@ -202,14 +202,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 3fca30e2d..3da40dd29 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -123,14 +123,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index ffbb19ca5..d71981145 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -93,7 +93,7 @@ org.springframework.integration spring-integration-social-twitter - 1.0.0.RELEASE + 1.0.1.BUILD-SNAPSHOT compile @@ -259,14 +259,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 126689445..b295ca3dc 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 82e77dabf..6e283b5e1 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 7d02e0d34..6161cc4ca 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 6093e86b4..8554b01d3 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 51f64847f..b11d8ff97 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 4f6536471..b707c7898 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -66,7 +66,7 @@ org.springframework.integration spring-integration-social-twitter - 1.0.0.RELEASE + 1.0.1.BUILD-SNAPSHOT compile @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index d7c96a03c..5c9213d31 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 96ecf9d9a..0bd37c3e9 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -250,14 +250,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 61750ed7d..78fbed98a 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 5abfb521f..130f66bd6 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index e15451991..898ee9036 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 6f5d6b749..ce19b3467 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -172,14 +172,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 2a7dcfd5b..52173f953 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 4fb3d76fc..a7f6d77e1 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -184,14 +184,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index c6b5e56de..ad1c490c6 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 196ff4504..db8765785 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 7eb3751d0..7a1b8975e 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.M1 + 5.2.0.M2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M1 + 5.2.0.M2 import pom From e209ded85a635cc3f8d8d5ea9c85f0974dc0b097 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 14 Jun 2019 17:15:05 -0400 Subject: [PATCH 212/356] Upgrade to 5.2.0.M3 --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/cafe-amqp/pom.xml | 4 ++-- applications/cafe/cafe-jms/pom.xml | 4 ++-- applications/cafe/cafe-si/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 4 ++-- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 6 +++--- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 4 ++-- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 4 ++-- basic/splunk/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 4 ++-- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- build.gradle | 8 ++++---- dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 4 ++-- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 8 ++++---- intermediate/retry-and-more/pom.xml | 4 ++-- intermediate/splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- intermediate/stored-procedures-postgresql/pom.xml | 4 ++-- intermediate/tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 65 files changed, 135 insertions(+), 135 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index ce70d7bbe..8d7b46a2f 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index b1b887703..f2c726113 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 2e89b014e..8180d6c41 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -178,14 +178,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index bcefaebd7..e310d8b66 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -217,14 +217,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 691279fa3..f8a429479 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index a7d73f9fe..a229dabe2 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 774024070..82ccba9a7 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 8b09d7cdc..d4a08a914 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -246,14 +246,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 23f6b7a87..2fafd66af 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 313e00a81..68cdc36b6 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -441,14 +441,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index ab10d69ea..9c0b23498 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 8153e6433..0334679de 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index dc5369825..b12d6804b 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -211,14 +211,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 5a6116eb9..b7277e5a2 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 96dde7e81..df674f743 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 867a201fd..0d2641db8 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 0ad2be431..acc2ac795 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index bfe6b707d..abae863ef 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -207,14 +207,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 0d53effaf..4893b4bed 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 34ce02d94..439115c72 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index cffdcfc50..1f9469ca3 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index a430b5b95..96a11413a 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 2549e7eb6..68da756e5 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 7477422b5..69dd9c0c0 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -213,14 +213,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 14775c651..5d5cbfad9 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -98,7 +98,7 @@ org.springframework.kafka spring-kafka - 2.3.0.M2 + 2.3.0.M3 compile @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 98851648e..aa9acfe49 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 8c4030414..92f6c1b56 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index c3d4dec31..1958ae20d 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index afd77db2d..5b16d4262 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 3a6e0aa2e..967ad0db0 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 72de1ba78..0693a7fa9 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index cd5be6259..956f74402 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 7685deec1..884414304 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index ce8299a31..d35db2638 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index c9fd34f6a..e3fc99cc0 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index e864b6005..a1729cb82 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index f5068046e..483e6525e 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -192,14 +192,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 24e261f90..1deedee58 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -149,14 +149,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 808a21332..89ff60afc 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -178,14 +178,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index c13ddfe3a..ef6386e8a 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 62879b562..e875dca35 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 4364a64c4..9674ee00a 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 186c38d0c..1fe97b134 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/build.gradle b/build.gradle index 978d1f390..a104122f2 100644 --- a/build.gradle +++ b/build.gradle @@ -208,13 +208,13 @@ subprojects { subproject -> postgresVersion = '42.2.5' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springIntegrationVersion = '5.2.0.M2' + springIntegrationVersion = '5.2.0.M3' springIntegrationKafkaVersion = '3.2.0.M2' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.3.0.M2' - springVersion = '5.2.0.M2' - springSecurityVersion = '5.2.0.M2' + springKafkaVersion = '2.3.0.M3' + springVersion = '5.2.0.M3' + springSecurityVersion = '5.2.0.M3' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' validationApiVersion = '1.0.0.GA' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 12918d10f..f4596efa2 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 481df97aa..7843854cf 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -202,14 +202,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 3da40dd29..636a2b3ce 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -123,14 +123,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index d71981145..5668bb510 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -259,14 +259,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index b295ca3dc..50aa083ec 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 6e283b5e1..35d47d134 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 6161cc4ca..564ff7575 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 8554b01d3..df56f1e21 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index b11d8ff97..35c70d403 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index b707c7898..ffe1696f2 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 5c9213d31..32397e2e5 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 0bd37c3e9..9698aa106 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -144,7 +144,7 @@ org.springframework.security spring-security-web - 5.2.0.M2 + 5.2.0.M3 compile @@ -156,7 +156,7 @@ org.springframework.security spring-security-config - 5.2.0.M2 + 5.2.0.M3 compile @@ -250,14 +250,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 78fbed98a..cf5ec00ee 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 130f66bd6..0c293f700 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 898ee9036..fe7a2d437 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index ce19b3467..a36833ad3 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -172,14 +172,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 52173f953..e16e4b75f 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index a7f6d77e1..d100298d2 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -184,14 +184,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index ad1c490c6..e06234743 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index db8765785..1a7eb9341 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 7a1b8975e..00adb7518 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.M2 + 5.2.0.M3 import pom org.springframework.integration spring-integration-bom - 5.2.0.M2 + 5.2.0.M3 import pom From 852c41d3840daa7251a555e74b1bb66b5f437a30 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 19 Jun 2019 09:24:42 -0400 Subject: [PATCH 213/356] Upgrade S-I-Kafka to 3.2.0.M3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a104122f2..52b6c4f53 100644 --- a/build.gradle +++ b/build.gradle @@ -209,7 +209,7 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' springIntegrationVersion = '5.2.0.M3' - springIntegrationKafkaVersion = '3.2.0.M2' + springIntegrationKafkaVersion = '3.2.0.M3' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' springKafkaVersion = '2.3.0.M3' From 0f1a75e2fe5f05075b75697ad566be2cd0675463 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Mon, 5 Aug 2019 16:57:41 -0400 Subject: [PATCH 214/356] Upgrade to SI 5.2.0.M4 --- advanced/advanced-testing-examples/pom.xml | 4 ++-- .../src/main/resources/integration-config.xml | 2 +- advanced/dynamic-ftp/pom.xml | 4 ++-- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/cafe-amqp/pom.xml | 4 ++-- applications/cafe/cafe-jms/pom.xml | 4 ++-- applications/cafe/cafe-si/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 4 ++-- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 8 ++++---- .../integration/samples/kafka/Application.java | 4 ++-- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 4 ++-- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 4 ++-- basic/splunk/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 4 ++-- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- build.gradle | 10 +++++----- dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 6 +++--- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 8 ++++---- intermediate/retry-and-more/pom.xml | 4 ++-- intermediate/splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- intermediate/stored-procedures-postgresql/pom.xml | 4 ++-- intermediate/tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 67 files changed, 141 insertions(+), 141 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 8d7b46a2f..3870b50d6 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/advanced/advanced-testing-examples/src/main/resources/integration-config.xml b/advanced/advanced-testing-examples/src/main/resources/integration-config.xml index 0b0a2854e..80c645cba 100644 --- a/advanced/advanced-testing-examples/src/main/resources/integration-config.xml +++ b/advanced/advanced-testing-examples/src/main/resources/integration-config.xml @@ -26,7 +26,7 @@ + output-channel="invalidMessageChannel" expression="payload.cause.message" /> diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index f2c726113..534c33cbb 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 8180d6c41..c3eff2731 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -178,14 +178,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index e310d8b66..cf13e76a5 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -217,14 +217,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index f8a429479..85812ef7e 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index a229dabe2..ed05a0ed7 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 82ccba9a7..e8a6645d9 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index d4a08a914..8c0f38698 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -246,14 +246,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 2fafd66af..c31a80a51 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 68cdc36b6..58e8f1f54 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -441,14 +441,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 9c0b23498..2ca92e8a9 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 0334679de..dbbed59d3 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index b12d6804b..32fb7907d 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -211,14 +211,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index b7277e5a2..94818dc00 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index df674f743..e5f2961a5 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 0d2641db8..86207f5dd 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index acc2ac795..97fb39b0a 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index abae863ef..62476dfdf 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -207,14 +207,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 4893b4bed..be64c997a 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 439115c72..b63dc1b71 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 1f9469ca3..86be28cbe 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 96a11413a..c136b7dd2 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 68da756e5..5586e9988 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 69dd9c0c0..a11396cb4 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -213,14 +213,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 5d5cbfad9..c8c28085a 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -71,7 +71,7 @@ org.springframework.integration spring-integration-kafka - 3.2.0.M2 + 3.2.0.M3 compile @@ -98,7 +98,7 @@ org.springframework.kafka spring-kafka - 2.3.0.M3 + 2.3.0.M4 compile @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java index b131e1398..4fb71317f 100644 --- a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java +++ b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java @@ -49,7 +49,7 @@ import org.springframework.kafka.listener.KafkaMessageListenerContainer; import org.springframework.kafka.support.KafkaHeaders; import org.springframework.kafka.support.KafkaNull; -import org.springframework.kafka.support.TopicPartitionInitialOffset; +import org.springframework.kafka.support.TopicPartitionOffset; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; @@ -134,7 +134,7 @@ public MessageHandler handler(KafkaTemplate kafkaTemplate) { public KafkaMessageListenerContainer container( ConsumerFactory kafkaConsumerFactory) { return new KafkaMessageListenerContainer<>(kafkaConsumerFactory, - new ContainerProperties(new TopicPartitionInitialOffset(this.properties.getTopic(), 0))); + new ContainerProperties(new TopicPartitionOffset(this.properties.getTopic(), 0))); } @Bean diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index aa9acfe49..157c35552 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 92f6c1b56..9ee88fe77 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 1958ae20d..67a7c28ac 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 5b16d4262..634279c2a 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 967ad0db0..c9c2cabef 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 0693a7fa9..a3c721c82 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 956f74402..c4ff0bb6b 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 884414304..418935e12 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index d35db2638..aca725aa8 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index e3fc99cc0..49bae34bc 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index a1729cb82..7a223a6a5 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 483e6525e..7066f81be 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -192,14 +192,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 1deedee58..5f983e385 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -149,14 +149,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 89ff60afc..292df89a3 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -178,14 +178,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index ef6386e8a..362506eb2 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index e875dca35..d1ce7f047 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 9674ee00a..62fada223 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 1fe97b134..fa5814f0a 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/build.gradle b/build.gradle index 52b6c4f53..df41accd3 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ allprojects { repositories { maven { url 'https://repo.spring.io/libs-snapshot' } maven { url 'https://repo.spring.io/libs-milestone' } -// maven { url 'https://repo.spring.io/libs-staging-local' } + maven { url 'https://repo.spring.io/libs-staging-local' } } } @@ -208,13 +208,13 @@ subprojects { subproject -> postgresVersion = '42.2.5' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springIntegrationVersion = '5.2.0.M3' + springIntegrationVersion = '5.2.0.M4' springIntegrationKafkaVersion = '3.2.0.M3' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.3.0.M3' - springVersion = '5.2.0.M3' - springSecurityVersion = '5.2.0.M3' + springKafkaVersion = '2.3.0.M4' + springVersion = '5.2.0.RC1' + springSecurityVersion = '5.2.0.M4' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' validationApiVersion = '1.0.0.GA' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index f4596efa2..de8133275 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 7843854cf..718635804 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -82,7 +82,7 @@ org.springframework.integration spring-integration-kafka - 3.2.0.M2 + 3.2.0.M3 compile @@ -202,14 +202,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 636a2b3ce..b46c9d234 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -123,14 +123,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 5668bb510..21c494ac2 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -259,14 +259,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 50aa083ec..36842f9d5 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 35d47d134..c46dc0c90 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 564ff7575..fd6df608d 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index df56f1e21..05018bb49 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 35c70d403..13d8b955b 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index ffe1696f2..b23e556c3 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 32397e2e5..62728ac92 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 9698aa106..8f807cf87 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -144,7 +144,7 @@ org.springframework.security spring-security-web - 5.2.0.M3 + 5.2.0.M4 compile @@ -156,7 +156,7 @@ org.springframework.security spring-security-config - 5.2.0.M3 + 5.2.0.M4 compile @@ -250,14 +250,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index cf5ec00ee..a3c359189 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 0c293f700..243ab9757 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index fe7a2d437..09fa40fb3 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index a36833ad3..cde693902 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -172,14 +172,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index e16e4b75f..7c2de1f74 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index d100298d2..f1abdbad8 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -184,14 +184,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index e06234743..9f1b71553 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 1a7eb9341..6515dd8e7 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 00adb7518..c5af820ad 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.M3 + 5.2.0.RC1 import pom org.springframework.integration spring-integration-bom - 5.2.0.M3 + 5.2.0.M4 import pom From 4c4e1bc0960b025b099a1c4410da11108b55b0ec Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 28 Aug 2019 17:08:11 -0400 Subject: [PATCH 215/356] Update Barrier for Modern Boot Versions - publisher confirms/returns now supported in app.props. --- .../integration/samples/barrier/Application.java | 7 ------- basic/barrier/src/main/resources/application.properties | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java b/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java index 820f3a4aa..17ead8d4a 100644 --- a/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java +++ b/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java @@ -18,7 +18,6 @@ import java.util.Collections; -import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; import org.springframework.boot.Banner.Mode; import org.springframework.boot.SpringApplication; import org.springframework.boot.WebApplicationType; @@ -38,12 +37,6 @@ public class Application { public static void main(String[] args) throws Exception { ConfigurableApplicationContext server = SpringApplication.run(Application.class, args); - // https://github.com/spring-projects/spring-boot/issues/3945 - CachingConnectionFactory connectionFactory = server.getBean(CachingConnectionFactory.class); - connectionFactory.setPublisherConfirms(true); - connectionFactory.resetConnection(); - // https://github.com/spring-projects/spring-boot/issues/3945 - SpringApplication application = new SpringApplicationBuilder() .web(WebApplicationType.NONE) .bannerMode(Mode.OFF) diff --git a/basic/barrier/src/main/resources/application.properties b/basic/barrier/src/main/resources/application.properties index 7a694787f..8ef9e7d71 100644 --- a/basic/barrier/src/main/resources/application.properties +++ b/basic/barrier/src/main/resources/application.properties @@ -1 +1,4 @@ spring.output.ansi.enabled=always + +spring.rabbitmq.publisher-confirms=true +spring.rabbitmq.publisher-returns=true From abcb11876f66b9cfabf7989098ee45c58bffb0a3 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 29 Aug 2019 09:20:18 -0400 Subject: [PATCH 216/356] Clarify GET gateway in barrier sample --- .../META-INF/spring/integration/server-context.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/basic/barrier/src/main/resources/META-INF/spring/integration/server-context.xml b/basic/barrier/src/main/resources/META-INF/spring/integration/server-context.xml index 6ed75d19b..ee1039288 100644 --- a/basic/barrier/src/main/resources/META-INF/spring/integration/server-context.xml +++ b/basic/barrier/src/main/resources/META-INF/spring/integration/server-context.xml @@ -17,6 +17,10 @@ error-channel="errorChannel" supported-methods="POST"/> + - + From 24b81d9ccf805e1d51bc04804a12248b771450fb Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 6 Sep 2019 15:27:08 -0400 Subject: [PATCH 217/356] Upgrade dependencies to the latest Milestones --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/cafe-amqp/pom.xml | 4 ++-- applications/cafe/cafe-jms/pom.xml | 4 ++-- applications/cafe/cafe-si/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 4 ++-- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 8 ++++---- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 4 ++-- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 4 ++-- basic/splunk/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 4 ++-- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- build.gradle | 12 ++++++------ dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 6 +++--- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 8 ++++---- intermediate/retry-and-more/pom.xml | 4 ++-- intermediate/splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- intermediate/stored-procedures-postgresql/pom.xml | 4 ++-- intermediate/tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 65 files changed, 139 insertions(+), 139 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 3870b50d6..d87d76828 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 534c33cbb..a85ba16fb 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index c3eff2731..3ec037eb3 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -178,14 +178,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index cf13e76a5..755edd638 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -217,14 +217,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 85812ef7e..eabaff294 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index ed05a0ed7..6b9d8253d 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index e8a6645d9..808f90558 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 8c0f38698..53bbc9a2d 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -246,14 +246,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index c31a80a51..8da0c563c 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 58e8f1f54..457ec204c 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -441,14 +441,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 2ca92e8a9..0d96ba2b5 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index dbbed59d3..74da5f980 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 32fb7907d..76404e7ec 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -211,14 +211,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 94818dc00..a4a503e20 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index e5f2961a5..9ef1a5321 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 86207f5dd..0699e7748 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 97fb39b0a..87a44f61e 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 62476dfdf..ff5a5a8b7 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -207,14 +207,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index be64c997a..3e4d38cc9 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index b63dc1b71..028700cdc 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 86be28cbe..c8e75728c 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index c136b7dd2..21856c364 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 5586e9988..7a28842a6 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index a11396cb4..b00963fec 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -213,14 +213,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index c8c28085a..4c11e3c6f 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -71,7 +71,7 @@ org.springframework.integration spring-integration-kafka - 3.2.0.M3 + 3.2.0.RC1 compile @@ -98,7 +98,7 @@ org.springframework.kafka spring-kafka - 2.3.0.M4 + 2.3.0.RC1 compile @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 157c35552..5df469065 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 9ee88fe77..12d04fc67 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 67a7c28ac..de23ac189 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 634279c2a..cb3b2f1c3 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index c9c2cabef..c7e670718 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index a3c721c82..9ae800707 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index c4ff0bb6b..c505934cd 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 418935e12..8ab6d93b1 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index aca725aa8..01d381233 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 49bae34bc..e94df3677 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 7a223a6a5..97eb6f784 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 7066f81be..83bc3a5b5 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -192,14 +192,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 5f983e385..4d037c178 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -149,14 +149,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 292df89a3..8913a4bc4 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -178,14 +178,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 362506eb2..ecfd577a5 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index d1ce7f047..5e50e39e2 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 62fada223..5867b090e 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index fa5814f0a..cfaf5c68d 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/build.gradle b/build.gradle index df41accd3..1dfc93941 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ allprojects { repositories { maven { url 'https://repo.spring.io/libs-snapshot' } maven { url 'https://repo.spring.io/libs-milestone' } - maven { url 'https://repo.spring.io/libs-staging-local' } +// maven { url 'https://repo.spring.io/libs-staging-local' } } } @@ -208,13 +208,13 @@ subprojects { subproject -> postgresVersion = '42.2.5' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springIntegrationVersion = '5.2.0.M4' - springIntegrationKafkaVersion = '3.2.0.M3' + springIntegrationVersion = '5.2.0.RC1' + springIntegrationKafkaVersion = '3.2.0.RC1' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.3.0.M4' - springVersion = '5.2.0.RC1' - springSecurityVersion = '5.2.0.M4' + springKafkaVersion = '2.3.0.RC1' + springVersion = '5.2.0.RC2' + springSecurityVersion = '5.2.0.RC1' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' validationApiVersion = '1.0.0.GA' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index de8133275..f286c6f0b 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 718635804..8e15d0a04 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -82,7 +82,7 @@ org.springframework.integration spring-integration-kafka - 3.2.0.M3 + 3.2.0.RC1 compile @@ -202,14 +202,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index b46c9d234..c562db2f4 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -123,14 +123,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 21c494ac2..18036395b 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -259,14 +259,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 36842f9d5..d6a466502 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index c46dc0c90..182bec33e 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index fd6df608d..17642924e 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 05018bb49..3d67be890 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 13d8b955b..470bb24a4 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index b23e556c3..827cfb7cc 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 62728ac92..1907bd626 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 8f807cf87..118090010 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -144,7 +144,7 @@ org.springframework.security spring-security-web - 5.2.0.M4 + 5.2.0.RC1 compile @@ -156,7 +156,7 @@ org.springframework.security spring-security-config - 5.2.0.M4 + 5.2.0.RC1 compile @@ -250,14 +250,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index a3c359189..a7b55f69b 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 243ab9757..84944618f 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 09fa40fb3..d377a77c7 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -160,14 +160,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index cde693902..b4c8c79f9 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -172,14 +172,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 7c2de1f74..cf4c693ab 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index f1abdbad8..716896405 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -184,14 +184,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 9f1b71553..e0329c6f2 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 6515dd8e7..358ed478d 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index c5af820ad..b9da360b8 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 5.2.0.RC1 + 5.2.0.RC2 import pom org.springframework.integration spring-integration-bom - 5.2.0.M4 + 5.2.0.RC1 import pom From 197e1e7770ed4207324ded723b0e2c05dcec1727 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 1 Oct 2019 15:47:17 -0400 Subject: [PATCH 218/356] Upgrade dependencies to the latest GAs --- advanced/advanced-testing-examples/pom.xml | 15 ++++++++--- advanced/dynamic-ftp/pom.xml | 15 ++++++++--- advanced/dynamic-tcp-client/pom.xml | 13 ++++++--- applications/cafe-scripted/pom.xml | 15 ++++++++--- applications/cafe/cafe-amqp/pom.xml | 15 ++++++++--- applications/cafe/cafe-jms/pom.xml | 15 ++++++++--- applications/cafe/cafe-si/pom.xml | 16 +++++++---- applications/file-split-ftp/pom.xml | 13 ++++++--- applications/loan-broker/pom.xml | 15 ++++++++--- applications/loanshark/pom.xml | 15 ++++++++--- applications/stomp-chat/pom.xml | 13 ++++++--- basic/amqp/pom.xml | 15 ++++++++--- basic/barrier/pom.xml | 13 ++++++--- basic/control-bus/pom.xml | 15 ++++++++--- basic/enricher/pom.xml | 17 ++++++++---- basic/feed/pom.xml | 15 ++++++++--- basic/file/pom.xml | 15 ++++++++--- basic/ftp/pom.xml | 15 ++++++++--- basic/helloworld/pom.xml | 15 ++++++++--- basic/http/pom.xml | 15 ++++++++--- basic/jdbc/pom.xml | 17 ++++++++---- basic/jms/pom.xml | 15 ++++++++--- basic/jmx/pom.xml | 15 ++++++++--- basic/jpa/pom.xml | 15 ++++++++--- basic/kafka/pom.xml | 19 ++++++++----- basic/mail/pom.xml | 15 ++++++++--- basic/mongodb/pom.xml | 15 ++++++++--- .../samples/mongodb/util/DemoUtils.java | 11 ++++---- basic/mqtt/pom.xml | 13 ++++++--- basic/oddeven/pom.xml | 15 ++++++++--- basic/quote/pom.xml | 15 ++++++++--- basic/sftp/pom.xml | 15 ++++++++--- basic/splunk/pom.xml | 13 ++++++--- basic/tcp-amqp/pom.xml | 15 ++++++++--- basic/tcp-broadcast/pom.xml | 13 ++++++--- basic/tcp-client-server/pom.xml | 15 ++++++++--- basic/tcp-with-headers/pom.xml | 14 +++++++--- basic/testing-examples/pom.xml | 15 ++++++++--- basic/twitter/pom.xml | 15 ++++++++--- basic/web-sockets/pom.xml | 13 ++++++--- basic/ws-inbound-gateway/pom.xml | 15 ++++++++--- basic/ws-outbound-gateway/pom.xml | 15 ++++++++--- basic/xml/pom.xml | 15 ++++++++--- basic/xmpp/pom.xml | 15 ++++++++--- build.gradle | 27 ++++++++++--------- dsl/cafe-dsl/pom.xml | 13 ++++++--- dsl/kafka-dsl/pom.xml | 17 ++++++++---- dsl/pom.xml | 13 ++++++--- dsl/si4demo/pom.xml | 13 ++++++--- intermediate/async-gateway/pom.xml | 15 ++++++++--- intermediate/dynamic-poller/pom.xml | 15 ++++++++--- intermediate/errorhandling/pom.xml | 15 ++++++++--- intermediate/file-processing/pom.xml | 15 ++++++++--- intermediate/mail-attachments/pom.xml | 15 ++++++++--- intermediate/monitoring/pom.xml | 15 ++++++++--- intermediate/multipart-http/pom.xml | 16 +++++++---- intermediate/rest-http/pom.xml | 20 +++++++++----- intermediate/retry-and-more/pom.xml | 15 ++++++++--- .../splitter-aggregator-reaper/pom.xml | 15 ++++++++--- intermediate/stored-procedures-derby/pom.xml | 15 ++++++++--- intermediate/stored-procedures-ms/pom.xml | 15 ++++++++--- intermediate/stored-procedures-oracle/pom.xml | 15 ++++++++--- .../stored-procedures-postgresql/pom.xml | 15 ++++++++--- .../tcp-client-server-multiplex/pom.xml | 15 ++++++++--- intermediate/travel/pom.xml | 15 ++++++++--- intermediate/tx-synch/pom.xml | 17 ++++++++---- 66 files changed, 720 insertions(+), 274 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index d87d76828..630447bf8 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -89,7 +89,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -129,7 +129,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -168,17 +168,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index a85ba16fb..5a628ede0 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -145,17 +145,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 3ec037eb3..40e763dc0 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -110,7 +110,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -175,17 +175,24 @@ import pom + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 755edd638..8665fc439 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -135,7 +135,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -175,7 +175,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -214,17 +214,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index eabaff294..ecd73f980 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -78,7 +78,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -118,7 +118,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -157,17 +157,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 6b9d8253d..15cf24e26 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -118,7 +118,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -158,7 +158,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -197,17 +197,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 808f90558..3052b3169 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -66,7 +66,6 @@ com.fasterxml.jackson.core jackson-databind - 2.9.8 compile @@ -78,7 +77,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -118,7 +117,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -157,17 +156,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 53bbc9a2d..cc20e33f6 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -167,7 +167,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -243,17 +243,24 @@ import pom + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 8da0c563c..211b6696f 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -145,17 +145,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 457ec204c..34ccddb29 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -335,7 +335,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 runtime @@ -399,7 +399,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -438,17 +438,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 0d96ba2b5..e8253b61a 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -132,7 +132,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -197,17 +197,24 @@ import pom + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 74da5f980..735972b3c 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -77,7 +77,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -129,7 +129,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -168,17 +168,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 76404e7ec..64e825415 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -143,7 +143,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -208,17 +208,24 @@ import pom + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index a4a503e20..8f7ad6cea 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -145,17 +145,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 9ef1a5321..1945dd3aa 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -66,7 +66,7 @@ com.h2database h2 - 1.4.197 + 1.4.199 compile @@ -78,7 +78,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -118,7 +118,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -157,17 +157,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 0699e7748..d1fa959f5 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -145,17 +145,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 87a44f61e..74ef04466 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -145,17 +145,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index ff5a5a8b7..bae84d5b2 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -142,7 +142,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -169,7 +169,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 test @@ -204,17 +204,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 3e4d38cc9..238a37000 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -145,17 +145,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 028700cdc..89385b2d6 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -136,7 +136,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -176,7 +176,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -215,17 +215,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index c8e75728c..6a1537b0e 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -66,7 +66,7 @@ com.h2database h2 - 1.4.197 + 1.4.199 compile @@ -78,7 +78,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -118,7 +118,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -157,17 +157,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 21856c364..b3b3ae010 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -117,7 +117,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -157,7 +157,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -207,17 +207,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 7a28842a6..03bb01f42 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -77,7 +77,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -117,7 +117,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -156,17 +156,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index b00963fec..23ce3d181 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -82,7 +82,7 @@ com.h2database h2 - 1.4.197 + 1.4.199 compile @@ -145,7 +145,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -210,17 +210,24 @@ import pom + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 4c11e3c6f..edd09bcfc 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -71,7 +71,7 @@ org.springframework.integration spring-integration-kafka - 3.2.0.RC1 + 3.2.0.RELEASE compile @@ -98,7 +98,7 @@ org.springframework.kafka spring-kafka - 2.3.0.RC1 + 2.3.0.RELEASE compile @@ -110,7 +110,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -150,7 +150,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -215,17 +215,24 @@ import pom + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 5df469065..fabecafb8 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -101,7 +101,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -141,7 +141,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -180,17 +180,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 12d04fc67..b9666b155 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -145,17 +145,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java index e223c5ee3..52abe5d0e 100644 --- a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java +++ b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.mongodb.util; -import com.mongodb.MongoClient; +import com.mongodb.client.MongoClients; import org.springframework.data.mongodb.MongoDbFactory; import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.core.SimpleMongoDbFactory; +import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory; /** * @@ -27,8 +28,8 @@ */ public class DemoUtils { - public static MongoDbFactory prepareMongoFactory(String... additionalCollectionToDrop) throws Exception{ - MongoDbFactory mongoDbFactory = new SimpleMongoDbFactory(new MongoClient(), "test"); + public static MongoDbFactory prepareMongoFactory(String... additionalCollectionToDrop) throws Exception { + MongoDbFactory mongoDbFactory = new SimpleMongoClientDbFactory(MongoClients.create(), "test"); MongoTemplate template = new MongoTemplate(mongoDbFactory); template.dropCollection("messages"); template.dropCollection("data"); diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index de23ac189..8de411163 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -121,7 +121,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -197,17 +197,24 @@ import pom + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index cb3b2f1c3..71120b2c5 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -145,17 +145,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index c7e670718..bc9964fc6 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -145,17 +145,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 9ae800707..53734d30e 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -157,17 +157,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index c505934cd..302e7e957 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -122,7 +122,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -187,17 +187,24 @@ import pom + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 8ab6d93b1..e58ed392a 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -89,7 +89,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 runtime @@ -141,7 +141,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -180,17 +180,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 01d381233..bbca04450 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -121,7 +121,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -186,17 +186,24 @@ import pom + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index e94df3677..c6faba2f1 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -89,7 +89,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -129,7 +129,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -168,17 +168,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 97eb6f784..44ad5ea87 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -82,7 +82,6 @@ com.fasterxml.jackson.core jackson-databind - 2.9.8 compile @@ -122,7 +121,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -187,17 +186,24 @@ import pom + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 83bc3a5b5..bd323fa68 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -99,7 +99,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -139,7 +139,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -189,17 +189,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 4d037c178..b9b4cbbdc 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -67,7 +67,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -107,7 +107,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -146,17 +146,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 8913a4bc4..40f28c4cc 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -110,7 +110,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -175,17 +175,24 @@ import pom + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index ecfd577a5..9916cbd21 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -88,7 +88,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -128,7 +128,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -167,17 +167,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 5e50e39e2..30ff97459 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -77,7 +77,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -117,7 +117,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -156,17 +156,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 5867b090e..5e89ebe5e 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -145,17 +145,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index cfaf5c68d..8890cb29d 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -145,17 +145,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/build.gradle b/build.gradle index 1dfc93941..49f913786 100644 --- a/build.gradle +++ b/build.gradle @@ -187,8 +187,8 @@ subprojects { subproject -> flexjsonVersion = '2.0' groovyVersion = '2.5.6' hsqldbVersion = '2.4.1' - h2Version = '1.4.197' - jacksonVersion = '2.9.8' + h2Version = '1.4.199' + jacksonVersion = '2.10.0' javaxInjectVersion = '1' javaxMailVersion = '1.6.2' jodaTimeVersion = '1.6' @@ -201,20 +201,20 @@ subprojects { subproject -> jstlVersion = '1.2' junitVersion = '4.12' jythonVersion = '2.7.0' - log4jVersion = '2.7' - mockitoVersion = '2.24.0' + log4jVersion = '2.12.1' + mockitoVersion = '3.0.0' openJpaVersion = '2.4.0' oracleDriverVersion = '11.2.0.3' postgresVersion = '42.2.5' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springIntegrationVersion = '5.2.0.RC1' - springIntegrationKafkaVersion = '3.2.0.RC1' + springIntegrationVersion = '5.2.0.RELEASE' + springIntegrationKafkaVersion = '3.2.0.RELEASE' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.3.0.RC1' - springVersion = '5.2.0.RC2' - springSecurityVersion = '5.2.0.RC1' + springKafkaVersion = '2.3.0.RELEASE' + springVersion = '5.2.0.RELEASE' + springSecurityVersion = '5.2.0.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' validationApiVersion = '1.0.0.GA' @@ -228,6 +228,7 @@ subprojects { subproject -> imports { mavenBom "org.springframework.integration:spring-integration-bom:$springIntegrationVersion" mavenBom "org.springframework:spring-framework-bom:$springVersion" + mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonVersion" } } @@ -329,7 +330,7 @@ project('cafe-si') { dependencies { compile "org.springframework.integration:spring-integration-stream" - compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" + compile 'com.fasterxml.jackson.core:jackson-databind' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1122,7 +1123,7 @@ project('multipart-http') { dependencies { compile "org.springframework.integration:spring-integration-http" compile "org.springframework:spring-webmvc" - compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" + compile 'com.fasterxml.jackson.core:jackson-databind' compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" compile "commons-io:commons-io:$commonsIoVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" @@ -1144,7 +1145,7 @@ project('rest-http') { compile "org.springframework:spring-jdbc" compile "org.springframework:spring-context" compile "org.springframework:spring-aop" - compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" + compile 'com.fasterxml.jackson.core:jackson-databind' compile "org.springframework.security:spring-security-web:$springSecurityVersion" compile "org.springframework.security:spring-security-config:$springSecurityVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" @@ -1453,7 +1454,7 @@ project('tcp-with-headers') { dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' compile "org.springframework.integration:spring-integration-ip" - compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion" + compile 'com.fasterxml.jackson.core:jackson-databind' testCompile 'org.springframework.boot:spring-boot-starter-test' } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index f286c6f0b..4ee7f4a76 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -122,7 +122,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -187,17 +187,24 @@ import pom + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 8e15d0a04..a7218d56d 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -82,7 +82,7 @@ org.springframework.integration spring-integration-kafka - 3.2.0.RC1 + 3.2.0.RELEASE compile @@ -94,7 +94,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -134,7 +134,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -199,17 +199,24 @@ import pom + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index c562db2f4..354d16fe5 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -81,7 +81,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -120,17 +120,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 18036395b..c08db6164 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -191,7 +191,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -256,17 +256,24 @@ import pom + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index d6a466502..064128ffc 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -145,17 +145,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 182bec33e..9e9e4ac95 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -145,17 +145,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 17642924e..d5092819b 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -145,17 +145,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 3d67be890..11f249778 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -145,17 +145,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 470bb24a4..e4f6a199b 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -113,7 +113,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -153,7 +153,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -215,17 +215,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 827cfb7cc..536087aba 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -112,7 +112,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -152,7 +152,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -191,17 +191,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 1907bd626..3c0bdfaef 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -77,7 +77,6 @@ com.fasterxml.jackson.core jackson-databind - 2.9.8 compile @@ -113,7 +112,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -153,7 +152,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -192,17 +191,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 118090010..b4877c0e8 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -132,7 +132,6 @@ com.fasterxml.jackson.core jackson-databind - 2.9.8 compile @@ -144,7 +143,7 @@ org.springframework.security spring-security-web - 5.2.0.RC1 + 5.2.0.RELEASE compile @@ -156,7 +155,7 @@ org.springframework.security spring-security-config - 5.2.0.RC1 + 5.2.0.RELEASE compile @@ -168,7 +167,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -208,7 +207,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -247,17 +246,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index a7b55f69b..6e6fb4daa 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -99,7 +99,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 compile @@ -127,7 +127,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -178,17 +178,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 84944618f..693a898b3 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -78,7 +78,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -118,7 +118,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -157,17 +157,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index d377a77c7..8e685717f 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -78,7 +78,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -118,7 +118,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -157,17 +157,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index b4c8c79f9..75e0d5d1e 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -90,7 +90,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -130,7 +130,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -169,17 +169,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index cf4c693ab..3b5afb0fa 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -145,17 +145,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 716896405..2eb59ed2d 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -102,7 +102,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -142,7 +142,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -181,17 +181,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index e0329c6f2..8e9d62897 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -106,7 +106,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -156,17 +156,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 358ed478d..d89ca8708 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -88,7 +88,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -128,7 +128,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -167,17 +167,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index b9da360b8..1887d325a 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -77,7 +77,7 @@ com.h2database h2 - 1.4.197 + 1.4.199 compile @@ -89,7 +89,7 @@ org.apache.logging.log4j log4j-core - 2.7 + 2.12.1 compile @@ -129,7 +129,7 @@ org.mockito mockito-core - 2.24.0 + 3.0.0 test @@ -168,17 +168,24 @@ + + com.fasterxml.jackson + jackson-bom + 2.10.0 + import + pom + org.springframework spring-framework-bom - 5.2.0.RC2 + 5.2.0.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RC1 + 5.2.0.RELEASE import pom From e56f0c6c1fdb077dc4b21e1bcd907048456b60fe Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Mon, 4 Nov 2019 17:05:00 -0500 Subject: [PATCH 219/356] Upgrade to Spring Integration 5.2.1 --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/cafe-amqp/pom.xml | 4 ++-- applications/cafe/cafe-jms/pom.xml | 4 ++-- applications/cafe/cafe-si/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 4 ++-- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 4 ++-- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 4 ++-- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 4 ++-- basic/splunk/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 4 ++-- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- build.gradle | 6 +++--- dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 4 ++-- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 8 ++++---- intermediate/retry-and-more/pom.xml | 4 ++-- intermediate/splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- intermediate/stored-procedures-postgresql/pom.xml | 4 ++-- intermediate/tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 65 files changed, 133 insertions(+), 133 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 630447bf8..58e82f406 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -178,14 +178,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 5a628ede0..19582afc8 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 40e763dc0..98ce98653 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -185,14 +185,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 8665fc439..b384942a7 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -224,14 +224,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index ecd73f980..4cb8dddea 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -167,14 +167,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 15cf24e26..bc7578d46 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -207,14 +207,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 3052b3169..f44413966 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -166,14 +166,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index cc20e33f6..f1007217d 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -253,14 +253,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 211b6696f..d5dbcdbc2 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 34ccddb29..abdd4ce78 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -448,14 +448,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index e8253b61a..a3c30312a 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -207,14 +207,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 735972b3c..16e664db9 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -178,14 +178,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 64e825415..edacaf5cf 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 8f7ad6cea..00fdb9b33 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 1945dd3aa..e08055c50 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -167,14 +167,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index d1fa959f5..6b5fd56a9 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 74ef04466..72753eb52 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index bae84d5b2..17598da0b 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -214,14 +214,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 238a37000..94f57a930 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 89385b2d6..6a2a6eb6a 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -225,14 +225,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 6a1537b0e..56d4140cd 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -167,14 +167,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index b3b3ae010..eac4dadb8 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -217,14 +217,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 03bb01f42..0fb4812aa 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -166,14 +166,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 23ce3d181..fbb0a96e2 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -220,14 +220,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index edd09bcfc..14d3fee84 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -225,14 +225,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index fabecafb8..c9c538070 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index b9666b155..eb1c8d58a 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 8de411163..b49d0dd8d 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -207,14 +207,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 71120b2c5..ce85a3470 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index bc9964fc6..328a840c1 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 53734d30e..d86ef0a24 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -167,14 +167,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 302e7e957..dc8b67c75 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -197,14 +197,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index e58ed392a..09aece067 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -190,14 +190,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index bbca04450..7f8f8e982 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -196,14 +196,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index c6faba2f1..afcc07d44 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -178,14 +178,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 44ad5ea87..05583e9c6 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -196,14 +196,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index bd323fa68..447cca738 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index b9b4cbbdc..1c050f333 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -156,14 +156,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 40f28c4cc..046b5c2a3 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -185,14 +185,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 9916cbd21..f26d718de 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 30ff97459..14ea559c8 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -166,14 +166,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 5e89ebe5e..5c7623baa 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 8890cb29d..7e050c3a6 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/build.gradle b/build.gradle index 49f913786..105f7ac34 100644 --- a/build.gradle +++ b/build.gradle @@ -208,13 +208,13 @@ subprojects { subproject -> postgresVersion = '42.2.5' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springIntegrationVersion = '5.2.0.RELEASE' + springIntegrationVersion = '5.2.1.RELEASE' springIntegrationKafkaVersion = '3.2.0.RELEASE' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' springKafkaVersion = '2.3.0.RELEASE' - springVersion = '5.2.0.RELEASE' - springSecurityVersion = '5.2.0.RELEASE' + springVersion = '5.2.1.RELEASE' + springSecurityVersion = '5.2.1.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' validationApiVersion = '1.0.0.GA' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 4ee7f4a76..17ebc47fc 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -197,14 +197,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index a7218d56d..36430dc7e 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -209,14 +209,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 354d16fe5..807f88baf 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -130,14 +130,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index c08db6164..42c457b0d 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -266,14 +266,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 064128ffc..fc1101653 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 9e9e4ac95..e402ba566 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index d5092819b..5bd63e5c2 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 11f249778..bfef7bad0 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index e4f6a199b..02da11c98 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -225,14 +225,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 536087aba..c461d9a3b 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 3c0bdfaef..82c0fdd45 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index b4877c0e8..0251ec0c1 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -143,7 +143,7 @@ org.springframework.security spring-security-web - 5.2.0.RELEASE + 5.2.1.RELEASE compile @@ -155,7 +155,7 @@ org.springframework.security spring-security-config - 5.2.0.RELEASE + 5.2.1.RELEASE compile @@ -256,14 +256,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 6e6fb4daa..0e55f9428 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 693a898b3..796c1c20a 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -167,14 +167,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 8e685717f..046f87962 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -167,14 +167,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 75e0d5d1e..c3859a617 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -179,14 +179,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 3b5afb0fa..d6abf1ed5 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 2eb59ed2d..ef6d25d4f 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -191,14 +191,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 8e9d62897..3c96c1e65 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -166,14 +166,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index d89ca8708..17d674cf5 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 1887d325a..7bfefa330 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -178,14 +178,14 @@ org.springframework spring-framework-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.0.RELEASE + 5.2.1.RELEASE import pom From b8fe06de890d98e345bb3d8b283d8d8699c0a112 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 4 Dec 2019 15:33:04 -0500 Subject: [PATCH 220/356] Upgrade dependencies to the latest GAs --- advanced/advanced-testing-examples/pom.xml | 8 +++--- advanced/dynamic-ftp/pom.xml | 8 +++--- advanced/dynamic-tcp-client/pom.xml | 12 ++++----- applications/cafe-scripted/pom.xml | 10 +++---- applications/cafe/cafe-amqp/pom.xml | 8 +++--- applications/cafe/cafe-jms/pom.xml | 12 ++++----- applications/cafe/cafe-si/pom.xml | 8 +++--- applications/file-split-ftp/pom.xml | 12 ++++----- applications/loan-broker/pom.xml | 8 +++--- applications/loanshark/pom.xml | 12 ++++----- applications/stomp-chat/pom.xml | 12 ++++----- basic/amqp/pom.xml | 8 +++--- basic/barrier/pom.xml | 12 ++++----- basic/control-bus/pom.xml | 8 +++--- basic/enricher/pom.xml | 10 +++---- basic/feed/pom.xml | 8 +++--- basic/file/pom.xml | 8 +++--- basic/ftp/pom.xml | 8 +++--- basic/helloworld/pom.xml | 8 +++--- basic/http/pom.xml | 8 +++--- basic/jdbc/pom.xml | 10 +++---- basic/jms/pom.xml | 12 ++++----- basic/jmx/pom.xml | 8 +++--- basic/jpa/pom.xml | 14 +++++----- basic/kafka/pom.xml | 16 ++++++------ basic/mail/pom.xml | 8 +++--- basic/mongodb/pom.xml | 8 +++--- basic/mqtt/pom.xml | 12 ++++----- basic/oddeven/pom.xml | 8 +++--- basic/quote/pom.xml | 8 +++--- basic/sftp/pom.xml | 8 +++--- basic/splunk/pom.xml | 12 ++++----- basic/tcp-amqp/pom.xml | 8 +++--- basic/tcp-broadcast/pom.xml | 12 ++++----- basic/tcp-client-server/pom.xml | 8 +++--- basic/tcp-with-headers/pom.xml | 12 ++++----- basic/testing-examples/pom.xml | 8 +++--- basic/twitter/pom.xml | 8 +++--- basic/web-sockets/pom.xml | 12 ++++----- basic/ws-inbound-gateway/pom.xml | 8 +++--- basic/ws-outbound-gateway/pom.xml | 8 +++--- basic/xml/pom.xml | 8 +++--- basic/xmpp/pom.xml | 8 +++--- build.gradle | 26 +++++++++---------- dsl/cafe-dsl/pom.xml | 12 ++++----- dsl/kafka-dsl/pom.xml | 14 +++++----- dsl/pom.xml | 8 +++--- dsl/si4demo/pom.xml | 12 ++++----- gradle.properties | 2 +- intermediate/async-gateway/pom.xml | 8 +++--- intermediate/dynamic-poller/pom.xml | 8 +++--- intermediate/errorhandling/pom.xml | 8 +++--- intermediate/file-processing/pom.xml | 8 +++--- intermediate/mail-attachments/pom.xml | 8 +++--- intermediate/monitoring/pom.xml | 8 +++--- intermediate/multipart-http/pom.xml | 8 +++--- intermediate/rest-http/pom.xml | 8 +++--- intermediate/retry-and-more/pom.xml | 8 +++--- .../splitter-aggregator-reaper/pom.xml | 8 +++--- intermediate/stored-procedures-derby/pom.xml | 8 +++--- intermediate/stored-procedures-ms/pom.xml | 8 +++--- intermediate/stored-procedures-oracle/pom.xml | 8 +++--- .../stored-procedures-postgresql/pom.xml | 8 +++--- .../tcp-client-server-multiplex/pom.xml | 8 +++--- intermediate/travel/pom.xml | 8 +++--- intermediate/tx-synch/pom.xml | 10 +++---- 66 files changed, 312 insertions(+), 312 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 58e82f406..b933d03b3 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -129,7 +129,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -171,21 +171,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 19582afc8..8c681b346 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 98ce98653..62008cdb1 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT org.springframework.integration.samples dynamic-tcp-client @@ -110,7 +110,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -171,28 +171,28 @@ org.springframework.boot spring-boot-dependencies - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index b384942a7..577439557 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -123,7 +123,7 @@ org.codehaus.groovy groovy-all - 2.5.6 + 2.5.8 compile @@ -175,7 +175,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -217,21 +217,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 4cb8dddea..44e772c63 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -118,7 +118,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -160,21 +160,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index bc7578d46..a4df44497 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -67,7 +67,7 @@ org.apache.activemq activemq-broker - 5.15.9 + 5.15.11 compile @@ -79,7 +79,7 @@ org.apache.activemq activemq-kahadb-store - 5.15.9 + 5.15.11 compile @@ -158,7 +158,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -200,21 +200,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index f44413966..d330674b9 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -117,7 +117,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -159,21 +159,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index f1007217d..e2167c10e 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT org.springframework.integration.samples file-split-ftp @@ -167,7 +167,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -239,28 +239,28 @@ org.springframework.boot spring-boot-dependencies - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index d5dbcdbc2..ec5454c17 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index abdd4ce78..e6efd8818 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -110,7 +110,7 @@ org.aspectj aspectjtools - 1.9.4 + 1.9.5 compile @@ -239,7 +239,7 @@ org.hsqldb hsqldb - 2.4.1 + 2.5.0 compile @@ -399,7 +399,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -441,21 +441,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index a3c30312a..ca8ed423c 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT org.springframework.integration.samples stomp-chat @@ -132,7 +132,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -193,28 +193,28 @@ org.springframework.boot spring-boot-dependencies - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 16e664db9..a8949356e 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -129,7 +129,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -171,21 +171,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index edacaf5cf..da4582db8 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT org.springframework.integration.samples barrier @@ -143,7 +143,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -204,28 +204,28 @@ org.springframework.boot spring-boot-dependencies - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 00fdb9b33..1d29cb5a2 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index e08055c50..6a6e96ad7 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -66,7 +66,7 @@ com.h2database h2 - 1.4.199 + 1.4.200 compile @@ -118,7 +118,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -160,21 +160,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 6b5fd56a9..9c9b613c2 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 72753eb52..a11f1b212 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 17598da0b..5444b51d6 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -142,7 +142,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -207,21 +207,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 94f57a930..3c0b37e2f 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 6a2a6eb6a..3d6c51a9e 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -176,7 +176,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -218,21 +218,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 56d4140cd..53de22aca 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -66,7 +66,7 @@ com.h2database h2 - 1.4.199 + 1.4.200 compile @@ -118,7 +118,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -160,21 +160,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index eac4dadb8..a253ef91f 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -89,7 +89,7 @@ org.apache.activemq activemq-broker - 5.15.9 + 5.15.11 compile @@ -101,7 +101,7 @@ org.apache.activemq activemq-kahadb-store - 5.15.9 + 5.15.11 compile @@ -157,7 +157,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -210,21 +210,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 0fb4812aa..c77e3d825 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -117,7 +117,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -159,21 +159,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index fbb0a96e2..05044d54e 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT org.springframework.integration.samples jpa @@ -82,7 +82,7 @@ com.h2database h2 - 1.4.199 + 1.4.200 compile @@ -145,7 +145,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -206,28 +206,28 @@ org.springframework.boot spring-boot-dependencies - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 14d3fee84..53b7342d0 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT org.springframework.integration.samples kafka @@ -71,7 +71,7 @@ org.springframework.integration spring-integration-kafka - 3.2.0.RELEASE + 3.2.1.RELEASE compile @@ -98,7 +98,7 @@ org.springframework.kafka spring-kafka - 2.3.0.RELEASE + 2.3.4.RELEASE compile @@ -150,7 +150,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -211,28 +211,28 @@ org.springframework.boot spring-boot-dependencies - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index c9c538070..6961c12d7 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -141,7 +141,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -183,21 +183,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index eb1c8d58a..780900f1e 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index b49d0dd8d..836f3e370 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT org.springframework.integration.samples mqtt @@ -121,7 +121,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -193,28 +193,28 @@ org.springframework.boot spring-boot-dependencies - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index ce85a3470..81261cc58 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 328a840c1..b0f8765f6 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index d86ef0a24..5a4fbc38e 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -160,21 +160,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index dc8b67c75..5dd5714c5 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT org.springframework.integration.samples splunk @@ -122,7 +122,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -183,28 +183,28 @@ org.springframework.boot spring-boot-dependencies - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 09aece067..c15542bb4 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -141,7 +141,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -183,21 +183,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 7f8f8e982..40fc804cd 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT org.springframework.integration.samples tcp-broadcast @@ -121,7 +121,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -182,28 +182,28 @@ org.springframework.boot spring-boot-dependencies - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index afcc07d44..59a59ce46 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -129,7 +129,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -171,21 +171,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 05583e9c6..68349ecd8 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT org.springframework.integration.samples tcp-with-headers @@ -121,7 +121,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -182,28 +182,28 @@ org.springframework.boot spring-boot-dependencies - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 447cca738..c2bcc0e3f 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -139,7 +139,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -192,21 +192,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 1c050f333..74e1bd130 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -107,7 +107,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -149,21 +149,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 046b5c2a3..186f26588 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT org.springframework.integration.samples web-sockets @@ -110,7 +110,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -171,28 +171,28 @@ org.springframework.boot spring-boot-dependencies - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index f26d718de..c4af70015 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -128,7 +128,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -170,21 +170,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 14ea559c8..8a2f7dda2 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -117,7 +117,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -159,21 +159,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 5c7623baa..a57cc2e45 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 7e050c3a6..51ead5c1d 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/build.gradle b/build.gradle index 105f7ac34..295bb5a15 100644 --- a/build.gradle +++ b/build.gradle @@ -3,13 +3,13 @@ buildscript { maven { url 'https://repo.spring.io/libs-snapshot' } } dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:1.0.5.RELEASE' + classpath 'io.spring.gradle:dependency-management-plugin:1.0.8.RELEASE' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" classpath "gradle.plugin.org.gretty:gretty:2.3.1" } } plugins { - id "org.sonarqube" version "2.7" + id "org.sonarqube" version "2.8" } description = 'Spring Integration Samples' @@ -169,9 +169,9 @@ subprojects { subproject -> } ext { - activeMqVersion = '5.15.9' + activeMqVersion = '5.15.11' apacheSshdVersion = '2.2.0' - aspectjVersion = '1.9.4' + aspectjVersion = '1.9.5' commonsDigesterVersion = '2.0' commonsDbcpVersion = '1.2.2' commonsFileUploadVersion = '1.4' @@ -185,10 +185,10 @@ subprojects { subproject -> hibernateValidatorVersion = '5.4.1.Final' ftpServerVersion = '1.1.1' flexjsonVersion = '2.0' - groovyVersion = '2.5.6' - hsqldbVersion = '2.4.1' - h2Version = '1.4.199' - jacksonVersion = '2.10.0' + groovyVersion = '2.5.8' + hsqldbVersion = '2.5.0' + h2Version = '1.4.200' + jacksonVersion = '2.10.1' javaxInjectVersion = '1' javaxMailVersion = '1.6.2' jodaTimeVersion = '1.6' @@ -202,18 +202,18 @@ subprojects { subproject -> junitVersion = '4.12' jythonVersion = '2.7.0' log4jVersion = '2.12.1' - mockitoVersion = '3.0.0' + mockitoVersion = '3.2.0' openJpaVersion = '2.4.0' oracleDriverVersion = '11.2.0.3' postgresVersion = '42.2.5' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springIntegrationVersion = '5.2.1.RELEASE' - springIntegrationKafkaVersion = '3.2.0.RELEASE' + springIntegrationVersion = '5.2.2.RELEASE' + springIntegrationKafkaVersion = '3.2.1.RELEASE' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.3.0.RELEASE' - springVersion = '5.2.1.RELEASE' + springKafkaVersion = '2.3.4.RELEASE' + springVersion = '5.2.2.RELEASE' springSecurityVersion = '5.2.1.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 17ebc47fc..efbb47270 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT org.springframework.integration.samples cafe-dsl @@ -122,7 +122,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -183,28 +183,28 @@ org.springframework.boot spring-boot-dependencies - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 36430dc7e..96262469c 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT org.springframework.integration.samples kafka-dsl @@ -82,7 +82,7 @@ org.springframework.integration spring-integration-kafka - 3.2.0.RELEASE + 3.2.1.RELEASE compile @@ -134,7 +134,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -195,28 +195,28 @@ org.springframework.boot spring-boot-dependencies - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 807f88baf..aaca480e3 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -81,7 +81,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -123,21 +123,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 42c457b0d..200f7bcd7 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT org.springframework.integration.samples si4demo @@ -191,7 +191,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -252,28 +252,28 @@ org.springframework.boot spring-boot-dependencies - 2.2.0.BUILD-SNAPSHOT + 2.2.2.BUILD-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/gradle.properties b/gradle.properties index 2f327e0f6..d684f1794 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ version=5.2.0.BUILD-SNAPSHOT -springBootVersion=2.2.0.BUILD-SNAPSHOT +springBootVersion=2.2.2.BUILD-SNAPSHOT org.gradle.jvmargs=-Xmx1536m diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index fc1101653..58f0087c8 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index e402ba566..d7c960170 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 5bd63e5c2..e23951f2c 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index bfef7bad0..e8c8f5328 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 02da11c98..03eece135 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -153,7 +153,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -218,21 +218,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index c461d9a3b..a5f33a1b6 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -152,7 +152,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -194,21 +194,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 82c0fdd45..9bff1a93a 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -152,7 +152,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -194,21 +194,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 0251ec0c1..44f2b1bec 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -207,7 +207,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -249,21 +249,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 0e55f9428..82a837618 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -99,7 +99,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 compile @@ -181,21 +181,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 796c1c20a..b27846f50 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -118,7 +118,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -160,21 +160,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 046f87962..1dd485aa9 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -118,7 +118,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -160,21 +160,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index c3859a617..5227ff57f 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -130,7 +130,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -172,21 +172,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index d6abf1ed5..20b90ba2d 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index ef6d25d4f..1f6647f03 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -142,7 +142,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -184,21 +184,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 3c96c1e65..0b3c39456 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -159,21 +159,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 17d674cf5..721078222 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -128,7 +128,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -170,21 +170,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 7bfefa330..1007ddd69 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -77,7 +77,7 @@ com.h2database h2 - 1.4.199 + 1.4.200 compile @@ -129,7 +129,7 @@ org.mockito mockito-core - 3.0.0 + 3.2.0 test @@ -171,21 +171,21 @@ com.fasterxml.jackson jackson-bom - 2.10.0 + 2.10.1 import pom org.springframework spring-framework-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.1.RELEASE + 5.2.2.RELEASE import pom From 3701e8bc6f44c1051f70dd0efccd920b957b6422 Mon Sep 17 00:00:00 2001 From: Max Brauer Date: Fri, 20 Dec 2019 17:57:09 +0100 Subject: [PATCH 221/356] Remove traces of old pre Java 8 Cafe DSL sample --- build.gradle | 6 +----- dsl/cafe-dsl/README.md | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 295bb5a15..95d108081 100644 --- a/build.gradle +++ b/build.gradle @@ -722,15 +722,11 @@ project('cafe-dsl') { testCompile 'org.springframework.boot:spring-boot-starter-test' } + bootRun { main = 'org.springframework.integration.samples.dsl.cafe.lambda.Application' } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.dsl.cafe.nonlambda.Application' - classpath = sourceSets.main.runtimeClasspath - } - tasks.withType(JavaExec) { standardInput = System.in } diff --git a/dsl/cafe-dsl/README.md b/dsl/cafe-dsl/README.md index 6031cfc29..f2e051d25 100644 --- a/dsl/cafe-dsl/README.md +++ b/dsl/cafe-dsl/README.md @@ -12,7 +12,4 @@ See the `cafe` project **README.md** for more details about the domain and the C Main class --> Run As --> Java Application) * or from the command line: - $ gradlew :cafe-dsl:run - -There is the second similar sample - `org.springframework.integration.samples.dsl.cafe.nonlambda.Application`, which -demonstrates how Spring Integration Java DSL can be used from pre Java 8 environment. + $ gradlew :cafe-dsl:bootRun From 086045f5b1f037ce3511d1466935e6f9ec4a0779 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 15 Jan 2020 16:07:38 -0500 Subject: [PATCH 222/356] Upgrade dependencies to the latest GAs * Upgrade to Gradle 6 --- build.gradle | 13 ++++----- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 55616 -> 58702 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 35 ++++++++++------------- gradlew.bat | 2 +- 6 files changed, 24 insertions(+), 30 deletions(-) diff --git a/build.gradle b/build.gradle index 95d108081..8b5f96423 100644 --- a/build.gradle +++ b/build.gradle @@ -181,7 +181,7 @@ subprojects { subproject -> c3p0Version = '0.9.1.2' derbyVersion = '10.14.2.0' hamcrestVersion = '1.3' - hibernateVersion = '5.4.2.Final' + hibernateVersion = '5.4.10.Final' hibernateValidatorVersion = '5.4.1.Final' ftpServerVersion = '1.1.1' flexjsonVersion = '2.0' @@ -202,18 +202,18 @@ subprojects { subproject -> junitVersion = '4.12' jythonVersion = '2.7.0' log4jVersion = '2.12.1' - mockitoVersion = '3.2.0' + mockitoVersion = '3.2.4' openJpaVersion = '2.4.0' oracleDriverVersion = '11.2.0.3' - postgresVersion = '42.2.5' + postgresVersion = '42.2.9' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springIntegrationVersion = '5.2.2.RELEASE' + springIntegrationVersion = '5.2.3.RELEASE' springIntegrationKafkaVersion = '3.2.1.RELEASE' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.3.4.RELEASE' - springVersion = '5.2.2.RELEASE' + springKafkaVersion = '2.3.5.RELEASE' + springVersion = '5.2.3.RELEASE' springSecurityVersion = '5.2.1.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' @@ -264,7 +264,6 @@ subprojects { subproject -> // suppress all console output during testing unless running `gradle -i` logging.captureStandardOutput(LogLevel.INFO) jacoco { - append = false destinationFile = file("$buildDir/jacoco.exec") } } diff --git a/gradle.properties b/gradle.properties index d684f1794..7492cc599 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ version=5.2.0.BUILD-SNAPSHOT -springBootVersion=2.2.2.BUILD-SNAPSHOT +springBootVersion=2.2.3.BUILD-SNAPSHOT org.gradle.jvmargs=-Xmx1536m diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 5c2d1cf016b3885f6930543d57b744ea8c220a1a..cc4fdc293d0e50b0ad9b65c16e7ddd1db2f6025b 100644 GIT binary patch delta 16535 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 Date: Wed, 22 Jan 2020 18:23:16 -0500 Subject: [PATCH 223/356] Move master to version 5.3 --- build.gradle | 44 +++++++++++--------------------------------- gradle.properties | 4 ++-- 2 files changed, 13 insertions(+), 35 deletions(-) diff --git a/build.gradle b/build.gradle index 8b5f96423..3e93e9001 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { maven { url 'https://repo.spring.io/libs-snapshot' } } dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:1.0.8.RELEASE' + classpath 'io.spring.gradle:dependency-management-plugin:1.0.9.RELEASE' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" classpath "gradle.plugin.org.gretty:gretty:2.3.1" } @@ -71,11 +71,17 @@ subprojects { subproject -> } developers { + developer { + id = 'abilan' + name = 'Artem Bilan' + email = 'abilan@pivotal.io' + roles = ["project lead"] + } developer { id = 'garyrussell' name = 'Gary Russell' email = 'grussell@pivotal.io' - roles = ["project lead"] + roles = ["lead emeritus"] } developer { id = 'markfisher' @@ -88,11 +94,6 @@ subprojects { subproject -> name = 'Gunnar Hillert' email = 'ghillert@pivotal.io' } - developer { - id = 'abilan' - name = 'Artem Bilan' - email = 'abilan@pivotal.io' - } } if (subproject.plugins.hasPlugin('java')) { @@ -208,13 +209,13 @@ subprojects { subproject -> postgresVersion = '42.2.9' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springIntegrationVersion = '5.2.3.RELEASE' + springIntegrationVersion = '5.3.0.M1' springIntegrationKafkaVersion = '3.2.1.RELEASE' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.3.5.RELEASE' + springKafkaVersion = '2.4.1.RELEASE' springVersion = '5.2.3.RELEASE' - springSecurityVersion = '5.2.1.RELEASE' + springSecurityVersion = '5.3.0.M1' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' validationApiVersion = '1.0.0.GA' @@ -268,28 +269,6 @@ subprojects { subproject -> } } - task checkTestConfigs { - doLast { - def configFiles = [] - sourceSets.test.allSource.srcDirs.each { - fileTree(it).include('**/*.xml').exclude('**/log4j2.xml').each { configFile -> - def configXml = new XmlParser(false, false).parse(configFile) - - if (configXml.@'xsi:schemaLocation' ==~ /.*spring-[a-z-]*\d\.\d\.xsd.*/) { - configFiles << configFile - } - } - } - if (configFiles) { - throw new InvalidUserDataException('Hardcoded XSD version in the config files:\n' + - configFiles.collect { relativePath(it) }.join('\n') + - '\nPlease, use versionless schemaLocations for Spring XSDs to avoid issues with builds ' + - 'on different versions of dependencies.') - } - } - } - - test.dependsOn checkTestConfigs build.dependsOn jacocoTestReport } @@ -1466,7 +1445,6 @@ project('tcp-with-headers') { } } - sonarqube { properties { property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec" diff --git a/gradle.properties b/gradle.properties index 7492cc599..e88ed83f1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -version=5.2.0.BUILD-SNAPSHOT -springBootVersion=2.2.3.BUILD-SNAPSHOT +version=5.3.0.BUILD-SNAPSHOT +springBootVersion=2.3.0.BUILD-SNAPSHOT org.gradle.jvmargs=-Xmx1536m From a00684726bf8c8a6ea524a9d5c61b6645fb7c149 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 26 Feb 2020 13:25:59 -0500 Subject: [PATCH 224/356] Upgrade to SI 5.3; fix SD Mongo deprecations --- advanced/advanced-testing-examples/pom.xml | 23 ++++++------ advanced/dynamic-ftp/pom.xml | 23 ++++++------ advanced/dynamic-tcp-client/pom.xml | 27 +++++++------- advanced/pom.xml | 17 +++++---- applications/cafe-scripted/pom.xml | 23 ++++++------ applications/cafe/cafe-amqp/pom.xml | 25 +++++++------ applications/cafe/cafe-jms/pom.xml | 25 +++++++------ applications/cafe/cafe-si/pom.xml | 23 ++++++------ applications/cafe/pom.xml | 17 +++++---- applications/file-split-ftp/pom.xml | 27 +++++++------- applications/loan-broker/pom.xml | 23 ++++++------ applications/loanshark/pom.xml | 25 +++++++------ applications/pom.xml | 17 +++++---- applications/stomp-chat/pom.xml | 27 +++++++------- basic/amqp/pom.xml | 23 ++++++------ basic/barrier/pom.xml | 27 +++++++------- basic/control-bus/pom.xml | 23 ++++++------ basic/enricher/pom.xml | 23 ++++++------ basic/feed/pom.xml | 23 ++++++------ basic/file/pom.xml | 23 ++++++------ basic/ftp/pom.xml | 23 ++++++------ basic/helloworld/pom.xml | 23 ++++++------ basic/http/pom.xml | 23 ++++++------ basic/jdbc/pom.xml | 23 ++++++------ basic/jms/pom.xml | 23 ++++++------ basic/jmx/pom.xml | 23 ++++++------ basic/jpa/pom.xml | 27 +++++++------- basic/kafka/pom.xml | 29 ++++++++------- basic/mail/pom.xml | 23 ++++++------ basic/mongodb/pom.xml | 35 +++++++++++++------ .../samples/mongodb/util/DemoUtils.java | 13 +++---- .../samples/mongodb/util/StringConverter.java | 5 +-- basic/mqtt/pom.xml | 27 +++++++------- basic/oddeven/pom.xml | 23 ++++++------ basic/pom.xml | 17 +++++---- basic/quote/pom.xml | 23 ++++++------ basic/sftp/pom.xml | 23 ++++++------ basic/splunk/pom.xml | 27 +++++++------- basic/tcp-amqp/pom.xml | 23 ++++++------ basic/tcp-broadcast/pom.xml | 27 +++++++------- basic/tcp-client-server/pom.xml | 23 ++++++------ basic/tcp-with-headers/pom.xml | 27 +++++++------- basic/testing-examples/pom.xml | 23 ++++++------ basic/twitter/pom.xml | 23 ++++++------ basic/web-sockets/pom.xml | 27 +++++++------- basic/ws-inbound-gateway/pom.xml | 23 ++++++------ basic/ws-outbound-gateway/pom.xml | 23 ++++++------ basic/xml/pom.xml | 23 ++++++------ basic/xmpp/pom.xml | 23 ++++++------ build.gradle | 4 ++- dsl/cafe-dsl/pom.xml | 29 ++++++++------- dsl/kafka-dsl/pom.xml | 27 +++++++------- dsl/pom.xml | 23 ++++++------ dsl/si4demo/pom.xml | 27 +++++++------- intermediate/async-gateway/pom.xml | 23 ++++++------ intermediate/dynamic-poller/pom.xml | 23 ++++++------ intermediate/errorhandling/pom.xml | 23 ++++++------ intermediate/file-processing/pom.xml | 23 ++++++------ intermediate/mail-attachments/pom.xml | 23 ++++++------ intermediate/monitoring/pom.xml | 23 ++++++------ intermediate/multipart-http/pom.xml | 23 ++++++------ intermediate/pom.xml | 17 +++++---- intermediate/rest-http/pom.xml | 27 +++++++------- intermediate/retry-and-more/pom.xml | 23 ++++++------ .../splitter-aggregator-reaper/pom.xml | 23 ++++++------ intermediate/stored-procedures-derby/pom.xml | 23 ++++++------ intermediate/stored-procedures-ms/pom.xml | 23 ++++++------ intermediate/stored-procedures-oracle/pom.xml | 23 ++++++------ .../stored-procedures-postgresql/pom.xml | 25 +++++++------ .../tcp-client-server-multiplex/pom.xml | 23 ++++++------ intermediate/travel/pom.xml | 23 ++++++------ intermediate/tx-synch/pom.xml | 23 ++++++------ 72 files changed, 943 insertions(+), 720 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index b933d03b3..3e1c87d14 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples advanced-testing-examples - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Advanced Testing Examples Advanced Testing Examples https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -129,7 +132,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -178,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 8c681b346..aa57929d1 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-ftp - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Dynamic FTP Demo Dynamic FTP Demo https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -155,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 62008cdb1..da79c783b 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT org.springframework.integration.samples dynamic-tcp-client - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Dynamic TCP Client Dynamic TCP Client https://projects.spring.io/spring-integration @@ -24,12 +24,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -45,11 +53,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -110,7 +113,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -171,7 +174,7 @@ org.springframework.boot spring-boot-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT import pom @@ -185,14 +188,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/advanced/pom.xml b/advanced/pom.xml index bd7302fda..fc4cde854 100644 --- a/advanced/pom.xml +++ b/advanced/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples advanced - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT https://projects.spring.io/spring-integration SpringIO @@ -18,12 +18,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -39,11 +47,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 577439557..c5b19778c 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-scripted - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Cafe Sample (Scripted Implementation) Cafe Sample (Scripted Implementation) https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -175,7 +178,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -224,14 +227,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 44e772c63..c4db5a2f4 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-amqp - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Cafe - With AMQP Message Broker Cafe - With AMQP Message Broker https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -55,7 +58,7 @@ org.springframework.integration.samples cafe-si - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT compile @@ -118,7 +121,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -167,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index a4df44497..a3324ef1b 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-jms - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Cafe - With JMS Message Broker Cafe - With JMS Message Broker https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -55,7 +58,7 @@ org.springframework.integration.samples cafe-si - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT compile @@ -158,7 +161,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -207,14 +210,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index d330674b9..2986a40a4 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-si - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Cafe - Pure Spring Integration Cafe - Pure Spring Integration https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -117,7 +120,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -166,14 +169,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index 0206b0dc8..f5400f13d 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT https://projects.spring.io/spring-integration SpringIO @@ -18,12 +18,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -39,11 +47,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index e2167c10e..75612f425 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT org.springframework.integration.samples file-split-ftp - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT File Split FTP File Split FTP https://projects.spring.io/spring-integration @@ -24,12 +24,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -45,11 +53,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -167,7 +170,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -239,7 +242,7 @@ org.springframework.boot spring-boot-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT import pom @@ -253,14 +256,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index ec5454c17..410690838 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loan-broker - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Loan Broker Sample Loan Broker Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -155,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index e6efd8818..a7db2e59d 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loanshark - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Loan Shark Sample Loan Shark Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -299,7 +302,7 @@ org.hibernate hibernate-entitymanager - 5.4.2.Final + 5.4.10.Final compile @@ -399,7 +402,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -448,14 +451,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/applications/pom.xml b/applications/pom.xml index de2793685..f510f3241 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples applications - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT https://projects.spring.io/spring-integration SpringIO @@ -18,12 +18,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -39,11 +47,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index ca8ed423c..4d1fbfd82 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT org.springframework.integration.samples stomp-chat - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Web Sockets Stomp Chat Sample Web Sockets Stomp Chat Sample https://projects.spring.io/spring-integration @@ -24,12 +24,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -45,11 +53,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -132,7 +135,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -193,7 +196,7 @@ org.springframework.boot spring-boot-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT import pom @@ -207,14 +210,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index a8949356e..bd026b2c5 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples amqp - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT AMQP Basic Sample AMQP Basic Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -129,7 +132,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -178,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index da4582db8..38e110daf 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT org.springframework.integration.samples barrier - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Barrier Sample Barrier Sample https://projects.spring.io/spring-integration @@ -24,12 +24,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -45,11 +53,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -143,7 +146,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -204,7 +207,7 @@ org.springframework.boot spring-boot-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT import pom @@ -218,14 +221,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 1d29cb5a2..ce6598c87 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples control-bus - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Control Bus Basic Sample Control Bus Basic Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -155,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 6a6e96ad7..12d0438bb 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples enricher - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Enricher Basic Sample Enricher Basic Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -118,7 +121,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -167,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 9c9b613c2..3f2470b83 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples feed - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Feed (RSS/ATOM) Basic Sample Feed (RSS/ATOM) Basic Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -155,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index a11f1b212..dcafe9c2e 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT File Copy Basic Sample File Copy Basic Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -155,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 5444b51d6..10fea2cd2 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ftp - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT FTP Basic Sample FTP Basic Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -142,7 +145,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -214,14 +217,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 3c0b37e2f..1ddc5791f 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples helloworld - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Hello World Sample Hello World Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -155,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 3d6c51a9e..90a417ec7 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples http - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT HTTP Sample HTTP Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -176,7 +179,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -225,14 +228,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 53de22aca..942ebb2a4 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jdbc - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT JDBC Basic Sample JDBC Basic Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -118,7 +121,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -167,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index a253ef91f..846971743 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jms - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT JMS Basic Sample JMS Basic Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -157,7 +160,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -217,14 +220,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index c77e3d825..a2d9355ab 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jmx - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT JMX Basic Sample JMX Basic Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -117,7 +120,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -166,14 +169,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 05044d54e..7915717c3 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT org.springframework.integration.samples jpa - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT JPA Basic Sample JPA Basic Sample https://projects.spring.io/spring-integration @@ -24,12 +24,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -45,11 +53,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -145,7 +148,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -206,7 +209,7 @@ org.springframework.boot spring-boot-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT import pom @@ -220,14 +223,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 53b7342d0..1c5427cdd 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT org.springframework.integration.samples kafka - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Apache Kafka Sample Apache Kafka Sample https://projects.spring.io/spring-integration @@ -24,12 +24,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -45,11 +53,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -98,7 +101,7 @@ org.springframework.kafka spring-kafka - 2.3.4.RELEASE + 2.4.1.RELEASE compile @@ -150,7 +153,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -211,7 +214,7 @@ org.springframework.boot spring-boot-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT import pom @@ -225,14 +228,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 6961c12d7..cf38c7760 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Mail (IMAP + POP3) Sample Mail (IMAP + POP3) Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -141,7 +144,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -190,14 +193,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 780900f1e..d2d976ec0 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mongodb - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT MongoDb Basic Sample MongoDb Basic Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -75,6 +78,18 @@ + + org.mongodb + mongodb-driver-sync + 4.0.0-beta1 + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + junit junit @@ -106,7 +121,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -155,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java index 52abe5d0e..e05cee01a 100644 --- a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java +++ b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/DemoUtils.java @@ -16,11 +16,11 @@ package org.springframework.integration.samples.mongodb.util; -import com.mongodb.client.MongoClients; - -import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory; +import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; + +import com.mongodb.client.MongoClients; /** * @@ -28,8 +28,8 @@ */ public class DemoUtils { - public static MongoDbFactory prepareMongoFactory(String... additionalCollectionToDrop) throws Exception { - MongoDbFactory mongoDbFactory = new SimpleMongoClientDbFactory(MongoClients.create(), "test"); + public static MongoDatabaseFactory prepareMongoFactory(String... additionalCollectionToDrop) throws Exception { + MongoDatabaseFactory mongoDbFactory = new SimpleMongoClientDatabaseFactory(MongoClients.create(), "test"); MongoTemplate template = new MongoTemplate(mongoDbFactory); template.dropCollection("messages"); template.dropCollection("data"); @@ -38,4 +38,5 @@ public static MongoDbFactory prepareMongoFactory(String... additionalCollectionT } return mongoDbFactory; } + } diff --git a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/StringConverter.java b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/StringConverter.java index 60f8aa9c2..275ccb855 100644 --- a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/StringConverter.java +++ b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/util/StringConverter.java @@ -18,8 +18,9 @@ import org.bson.Document; import org.bson.conversions.Bson; + import org.springframework.data.mapping.context.MappingContext; -import org.springframework.data.mongodb.MongoDbFactory; +import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver; import org.springframework.data.mongodb.core.convert.MappingMongoConverter; import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity; @@ -36,7 +37,7 @@ public class StringConverter extends MappingMongoConverter { public StringConverter( - MongoDbFactory mongoDbFactory, + MongoDatabaseFactory mongoDbFactory, MappingContext, MongoPersistentProperty> mappingContext) { super(new DefaultDbRefResolver(mongoDbFactory), mappingContext); } diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 836f3e370..f5467dfd4 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT org.springframework.integration.samples mqtt - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT MQTT Basic Sample MQTT Basic Sample https://projects.spring.io/spring-integration @@ -24,12 +24,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -45,11 +53,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -121,7 +124,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -193,7 +196,7 @@ org.springframework.boot spring-boot-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT import pom @@ -207,14 +210,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 81261cc58..4ee3ea73a 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples oddeven - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Odd-Even Sample Odd-Even Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -155,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/pom.xml b/basic/pom.xml index faab286a3..22575b0f7 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples basic - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT https://projects.spring.io/spring-integration SpringIO @@ -18,12 +18,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -39,11 +47,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index b0f8765f6..02f522a16 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples quote - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Quote Sample Quote Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -155,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 5a4fbc38e..04671de48 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples sftp - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT SFTP Basic Sample SFTP Basic Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -167,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 5dd5714c5..5a2cc7efa 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT org.springframework.integration.samples splunk - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Splunk Sample Splunk Sample https://projects.spring.io/spring-integration @@ -24,12 +24,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -45,11 +53,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -122,7 +125,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -183,7 +186,7 @@ org.springframework.boot spring-boot-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT import pom @@ -197,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index c15542bb4..7a27d1e4b 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-amqp - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT TCP-AMQP Basic Sample TCP-AMQP Basic Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -141,7 +144,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -190,14 +193,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 40fc804cd..5ae29703b 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT org.springframework.integration.samples tcp-broadcast - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT TCP Client Broadcast Sample TCP Client Broadcast Sample https://projects.spring.io/spring-integration @@ -24,12 +24,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -45,11 +53,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -121,7 +124,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -182,7 +185,7 @@ org.springframework.boot spring-boot-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT import pom @@ -196,14 +199,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 59a59ce46..35055a222 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT TCP Client Server Sample TCP Client Server Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -129,7 +132,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -178,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 68349ecd8..c068f673a 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT org.springframework.integration.samples tcp-with-headers - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT TCP Send/Receive with headers TCP Send/Receive with headers https://projects.spring.io/spring-integration @@ -24,12 +24,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -45,11 +53,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -121,7 +124,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -182,7 +185,7 @@ org.springframework.boot spring-boot-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT import pom @@ -196,14 +199,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index c2bcc0e3f..bad7fe82e 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testing-examples - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Testing Examples Testing Examples https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -139,7 +142,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -199,14 +202,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 74e1bd130..2d96f5631 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples twitter - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Twitter Basic Sample Twitter Basic Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -107,7 +110,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -156,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 186f26588..18b0a918e 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT org.springframework.integration.samples web-sockets - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Web Sockets Basic Sample Web Sockets Basic Sample https://projects.spring.io/spring-integration @@ -24,12 +24,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -45,11 +53,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -110,7 +113,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -171,7 +174,7 @@ org.springframework.boot spring-boot-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT import pom @@ -185,14 +188,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index c4af70015..e6246be29 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-inbound-gateway - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT WS Inbound Gateway Sample WS Inbound Gateway Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -128,7 +131,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -177,14 +180,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 8a2f7dda2..67c5076df 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-outbound-gateway - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT WS Outbound Gateway Sample WS Outbound Gateway Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -117,7 +120,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -166,14 +169,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index a57cc2e45..825277741 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xml - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT XML Sample XML Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -155,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 51ead5c1d..2d63dc2f6 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xmpp - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT XMPP Basic Sample XMPP Basic Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -155,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/build.gradle b/build.gradle index 3e93e9001..e5f070176 100644 --- a/build.gradle +++ b/build.gradle @@ -204,12 +204,13 @@ subprojects { subproject -> jythonVersion = '2.7.0' log4jVersion = '2.12.1' mockitoVersion = '3.2.4' + mongoDriverVersion = '4.0.0-beta1' openJpaVersion = '2.4.0' oracleDriverVersion = '11.2.0.3' postgresVersion = '42.2.9' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springIntegrationVersion = '5.3.0.M1' + springIntegrationVersion = '5.3.0.M2' springIntegrationKafkaVersion = '3.2.1.RELEASE' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' @@ -809,6 +810,7 @@ project('mongodb') { dependencies { compile "org.springframework.integration:spring-integration-mongodb" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + compile "org.mongodb:mongodb-driver-sync:$mongoDriverVersion" } task runMongoDbInboundAdapterDemo(type: JavaExec) { diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index efbb47270..fe1c05362 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT org.springframework.integration.samples cafe-dsl - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Java DSL Cafe Sample Java DSL Cafe Sample https://projects.spring.io/spring-integration @@ -24,12 +24,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -45,11 +53,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -60,7 +63,7 @@ org.springframework.integration.samples cafe-si - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT compile @@ -122,7 +125,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -183,7 +186,7 @@ org.springframework.boot spring-boot-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT import pom @@ -197,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 96262469c..bb7e3506a 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT org.springframework.integration.samples kafka-dsl - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Java DSL Kafka Sample Java DSL Kafka Sample https://projects.spring.io/spring-integration @@ -24,12 +24,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -45,11 +53,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -134,7 +137,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -195,7 +198,7 @@ org.springframework.boot spring-boot-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT import pom @@ -209,14 +212,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index aaca480e3..b96e95496 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dsl - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT https://projects.spring.io/spring-integration SpringIO @@ -17,12 +17,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -38,11 +46,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -81,7 +84,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -130,14 +133,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 200f7bcd7..d20d12979 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT org.springframework.integration.samples si4demo - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Java Configuration/DSL Sample Java Configuration/DSL Sample https://projects.spring.io/spring-integration @@ -24,12 +24,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -45,11 +53,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -191,7 +194,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -252,7 +255,7 @@ org.springframework.boot spring-boot-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT import pom @@ -266,14 +269,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 58f0087c8..093a6cc95 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples async-gateway - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Async Gateway Sample Async Gateway Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -155,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index d7c960170..640c67568 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-poller - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Dynamic Poller Sample Dynamic Poller Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -155,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index e23951f2c..d1d3857a0 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples errorhandling - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Error Handling Sample Error Handling Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -155,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index e8c8f5328..582db122a 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file-processing - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT File Processing Sample File Processing Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -155,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 03eece135..1ac853c28 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail-attachments - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Mail Attachment Sample Mail Attachment Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -153,7 +156,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -225,14 +228,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index a5f33a1b6..941b01516 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples monitoring - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Monitoring Application Monitoring Application https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -152,7 +155,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -201,14 +204,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 9bff1a93a..0edb7ff2e 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples multipart-http - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT HTTP Multipart Demo HTTP Multipart Demo https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -152,7 +155,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -201,14 +204,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/pom.xml b/intermediate/pom.xml index f770f61dd..79281aba5 100644 --- a/intermediate/pom.xml +++ b/intermediate/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples intermediate - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT https://projects.spring.io/spring-integration SpringIO @@ -18,12 +18,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -39,11 +47,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 44f2b1bec..1ed4eb35a 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples rest-http - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Spring Integration Rest HTTP Path Usage Demo Spring Integration Rest HTTP Path Usage Demo https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -143,7 +146,7 @@ org.springframework.security spring-security-web - 5.2.1.RELEASE + 5.3.0.M1 compile @@ -155,7 +158,7 @@ org.springframework.security spring-security-config - 5.2.1.RELEASE + 5.3.0.M1 compile @@ -207,7 +210,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -256,14 +259,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 82a837618..f2c0bd8b3 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples retry-and-more - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Retry and More Sample Retry and More Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -99,7 +102,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 compile @@ -188,14 +191,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index b27846f50..3999f892d 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Splitter-Aggregator-Reaper Sample Splitter-Aggregator-Reaper Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -118,7 +121,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -167,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 1dd485aa9..d1eae25b3 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-derby - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Derby Stored Procedures Sample Derby Stored Procedures Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -118,7 +121,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -167,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 5227ff57f..a04046538 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-ms - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT MS SQLServer Stored Procedures Sample MS SQLServer Stored Procedures Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -130,7 +133,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -179,14 +182,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 20b90ba2d..5e2aee562 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-oracle - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Oracle Stored Procedures Sample Oracle Stored Procedures Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -155,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 1f6647f03..72d12a8d9 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-postgresql - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT PostgreSQL Stored Procedures Sample PostgreSQL Stored Procedures Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -66,7 +69,7 @@ org.postgresql postgresql - 42.2.5 + 42.2.9 compile @@ -142,7 +145,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -191,14 +194,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 0b3c39456..913b1f555 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT TCP Client Server Multiplexing Sample TCP Client Server Multiplexing Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -106,7 +109,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -166,14 +169,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 721078222..1b7d01679 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples travel - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Travel Services Sample Travel Services Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -128,7 +131,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -177,14 +180,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 1007ddd69..114d2c71f 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tx-synch - 5.2.0.BUILD-SNAPSHOT + 5.3.0.BUILD-SNAPSHOT Transaction Synchronization Sample Transaction Synchronization Sample https://projects.spring.io/spring-integration @@ -19,12 +19,20 @@ + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + garyrussell Gary Russell grussell@pivotal.io - project lead + lead emeritus @@ -40,11 +48,6 @@ Gunnar Hillert ghillert@pivotal.io - - abilan - Artem Bilan - abilan@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -129,7 +132,7 @@ org.mockito mockito-core - 3.2.0 + 3.2.4 test @@ -178,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.2.RELEASE + 5.2.3.RELEASE import pom org.springframework.integration spring-integration-bom - 5.2.2.RELEASE + 5.3.0.M2 import pom From 2401452961f88f71fd07cecb1edac6ec6121b9c7 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 28 Feb 2020 11:05:36 -0500 Subject: [PATCH 225/356] Upgrade dependencies --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/cafe-amqp/pom.xml | 4 ++-- applications/cafe/cafe-jms/pom.xml | 4 ++-- applications/cafe/cafe-si/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 8 ++++---- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 6 +++--- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 4 ++-- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 6 +++--- basic/splunk/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 4 ++-- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- build.gradle | 14 +++++++------- dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 4 ++-- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 8 ++++---- intermediate/retry-and-more/pom.xml | 4 ++-- intermediate/splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- intermediate/stored-procedures-postgresql/pom.xml | 4 ++-- intermediate/tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 65 files changed, 141 insertions(+), 141 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 3e1c87d14..14df8dfb8 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -174,14 +174,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index aa57929d1..4d0e59c17 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -151,14 +151,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index da79c783b..76a9a8dee 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -181,14 +181,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index c5b19778c..1d13f8f1a 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -220,14 +220,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index c4db5a2f4..bc4654bef 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -163,14 +163,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index a3324ef1b..b4373222e 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -203,14 +203,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 2986a40a4..829260884 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -162,14 +162,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 75612f425..d143fe910 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -249,14 +249,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 410690838..0c1ff41c0 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -151,14 +151,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index a7db2e59d..e80b1b538 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -278,7 +278,7 @@ org.hibernate hibernate-validator - 5.4.1.Final + 6.1.2.Final compile @@ -302,7 +302,7 @@ org.hibernate hibernate-entitymanager - 5.4.10.Final + 5.4.11.Final compile @@ -444,14 +444,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 4d1fbfd82..7665a4cdd 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -203,14 +203,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index bd026b2c5..1bd1095e7 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -174,14 +174,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 38e110daf..b457dbee4 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -214,14 +214,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index ce6598c87..5a62eab50 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -151,14 +151,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 12d0438bb..34816c24e 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -163,14 +163,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 3f2470b83..80af886a2 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -151,14 +151,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index dcafe9c2e..04a7b3998 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -151,14 +151,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 10fea2cd2..04048b1ad 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -210,14 +210,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 1ddc5791f..c744f17d9 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -151,14 +151,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 90a417ec7..f54bf37b8 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -221,14 +221,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 942ebb2a4..846909269 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -163,14 +163,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 846971743..262df28be 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -213,14 +213,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index a2d9355ab..9eee9a339 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -162,14 +162,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 7915717c3..0e1846d8e 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -216,14 +216,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 1c5427cdd..0eecdfb6b 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -101,7 +101,7 @@ org.springframework.kafka spring-kafka - 2.4.1.RELEASE + 2.4.2.RELEASE compile @@ -221,14 +221,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index cf38c7760..2df68bd0a 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -186,14 +186,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index d2d976ec0..fad216f73 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -163,14 +163,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index f5467dfd4..ef1f193fd 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -203,14 +203,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 4ee3ea73a..812a94cbd 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -151,14 +151,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 02f522a16..4204b393b 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -151,14 +151,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 04671de48..41dd731d2 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -136,7 +136,7 @@ org.apache.sshd sshd-sftp - 2.2.0 + 2.4.0 test @@ -163,14 +163,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 5a2cc7efa..c894dd31f 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -193,14 +193,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 7a27d1e4b..be41943fb 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -186,14 +186,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 5ae29703b..db0f6a6f3 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -192,14 +192,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 35055a222..f69e7c124 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -174,14 +174,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index c068f673a..002bd87f6 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -192,14 +192,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index bad7fe82e..2aa715b39 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -195,14 +195,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 2d96f5631..da6e3b6a5 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -152,14 +152,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 18b0a918e..8442cfc74 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -181,14 +181,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index e6246be29..8f2986e8c 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -173,14 +173,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 67c5076df..3637c5fb7 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -162,14 +162,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 825277741..0e83f0490 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -151,14 +151,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 2d63dc2f6..6f6c5cfb8 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -151,14 +151,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/build.gradle b/build.gradle index e5f070176..6b70b90f7 100644 --- a/build.gradle +++ b/build.gradle @@ -171,7 +171,7 @@ subprojects { subproject -> ext { activeMqVersion = '5.15.11' - apacheSshdVersion = '2.2.0' + apacheSshdVersion = '2.4.0' aspectjVersion = '1.9.5' commonsDigesterVersion = '2.0' commonsDbcpVersion = '1.2.2' @@ -182,14 +182,14 @@ subprojects { subproject -> c3p0Version = '0.9.1.2' derbyVersion = '10.14.2.0' hamcrestVersion = '1.3' - hibernateVersion = '5.4.10.Final' - hibernateValidatorVersion = '5.4.1.Final' + hibernateVersion = '5.4.11.Final' + hibernateValidatorVersion = '6.1.2.Final' ftpServerVersion = '1.1.1' flexjsonVersion = '2.0' groovyVersion = '2.5.8' hsqldbVersion = '2.5.0' h2Version = '1.4.200' - jacksonVersion = '2.10.1' + jacksonVersion = '2.10.2.20200130' javaxInjectVersion = '1' javaxMailVersion = '1.6.2' jodaTimeVersion = '1.6' @@ -214,9 +214,9 @@ subprojects { subproject -> springIntegrationKafkaVersion = '3.2.1.RELEASE' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.4.1.RELEASE' - springVersion = '5.2.3.RELEASE' - springSecurityVersion = '5.3.0.M1' + springKafkaVersion = '2.4.2.RELEASE' + springVersion = '5.2.4.RELEASE' + springSecurityVersion = '5.3.0.RC1' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' validationApiVersion = '1.0.0.GA' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index fe1c05362..0f9cfba19 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -193,14 +193,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index bb7e3506a..e982a0a77 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -205,14 +205,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index b96e95496..d6b39e4c5 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -126,14 +126,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index d20d12979..78b2b9053 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -262,14 +262,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 093a6cc95..fce283638 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -151,14 +151,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 640c67568..aae97dbe5 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -151,14 +151,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index d1d3857a0..866a15642 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -151,14 +151,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 582db122a..8fdc73308 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -151,14 +151,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 1ac853c28..e90e5d2c1 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -221,14 +221,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 941b01516..a1694a80e 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -197,14 +197,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 0edb7ff2e..91bffa584 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -197,14 +197,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 1ed4eb35a..9dd8b021c 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -146,7 +146,7 @@ org.springframework.security spring-security-web - 5.3.0.M1 + 5.3.0.RC1 compile @@ -158,7 +158,7 @@ org.springframework.security spring-security-config - 5.3.0.M1 + 5.3.0.RC1 compile @@ -252,14 +252,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index f2c0bd8b3..641484474 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -184,14 +184,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 3999f892d..6c063723e 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -163,14 +163,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index d1eae25b3..05dc7b6ba 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -163,14 +163,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index a04046538..ec9611e68 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -175,14 +175,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 5e2aee562..7055fd974 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -151,14 +151,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 72d12a8d9..0d140ce90 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -187,14 +187,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 913b1f555..563309999 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -162,14 +162,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 1b7d01679..1afee4138 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -173,14 +173,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 114d2c71f..57cffc81b 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -174,14 +174,14 @@ com.fasterxml.jackson jackson-bom - 2.10.1 + 2.10.2.20200130 import pom org.springframework spring-framework-bom - 5.2.3.RELEASE + 5.2.4.RELEASE import pom From 1c2b95ed074cd770c3f74e52eedefb23cbcd445e Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 28 Feb 2020 12:00:31 -0500 Subject: [PATCH 226/356] GH-195: Fix cafe-dsl for missed subscriber Fixes https://github.com/spring-projects/spring-integration-samples/issues/195 After some Java DSL modification to request an explicit subscriber for replies into a main flow from the `route()`, the `cafe-dsl` has stopped to work * Remove redundant `defaultOutputToParentFlow()` since it doesn't bring any value into a flow logic * add `bridge()` into all the route sub-flows as a thirds subscriber to make an explicit reply into a main flow after delay and logging --- .../integration/samples/dsl/cafe/lambda/Application.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java index cd4ae6c2b..1843b8f27 100644 --- a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java +++ b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java @@ -93,7 +93,8 @@ public IntegrationFlow orders() { " prepared cold drink #" + this.coldDrinkCounter.incrementAndGet() + " for order #" + p.getOrderNumber() + ": " + p) - .handle(m -> System.out.println(m.getPayload()))))) + .handle(m -> System.out.println(m.getPayload())))) + .bridge()) .subFlowMapping(false, sf -> sf .channel(c -> c.queue(10)) .publishSubscribeChannel(c -> c @@ -104,8 +105,8 @@ public IntegrationFlow orders() { " prepared hot drink #" + this.hotDrinkCounter.incrementAndGet() + " for order #" + p.getOrderNumber() + ": " + p) - .handle(m -> System.out.println(m.getPayload()))))) - .defaultOutputToParentFlow()) + .handle(m -> System.out.println(m.getPayload())))) + .bridge())) .transform(orderItem -> new Drink(orderItem.getOrderNumber(), orderItem.getDrinkType(), From bce03dec791de5f36c035e8f728618afbeab669c Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 11 Mar 2020 16:48:20 -0400 Subject: [PATCH 227/356] Upgrade to SI-5.3 M3; S-Kafka-2.4.4 --- advanced/advanced-testing-examples/pom.xml | 2 +- advanced/dynamic-ftp/pom.xml | 2 +- advanced/dynamic-tcp-client/pom.xml | 2 +- applications/cafe-scripted/pom.xml | 2 +- applications/cafe/cafe-amqp/pom.xml | 2 +- applications/cafe/cafe-jms/pom.xml | 2 +- applications/cafe/cafe-si/pom.xml | 2 +- applications/file-split-ftp/pom.xml | 2 +- applications/loan-broker/pom.xml | 2 +- applications/loanshark/pom.xml | 2 +- applications/stomp-chat/pom.xml | 2 +- basic/amqp/pom.xml | 2 +- basic/barrier/pom.xml | 2 +- basic/control-bus/pom.xml | 2 +- basic/enricher/pom.xml | 2 +- basic/feed/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/kafka/pom.xml | 4 ++-- basic/mail/pom.xml | 2 +- basic/mongodb/pom.xml | 2 +- basic/mqtt/pom.xml | 2 +- basic/oddeven/pom.xml | 2 +- basic/quote/pom.xml | 2 +- basic/sftp/pom.xml | 2 +- basic/splunk/pom.xml | 2 +- basic/tcp-amqp/pom.xml | 2 +- basic/tcp-broadcast/pom.xml | 2 +- basic/tcp-client-server/pom.xml | 2 +- basic/tcp-with-headers/pom.xml | 2 +- basic/testing-examples/pom.xml | 2 +- basic/twitter/pom.xml | 2 +- basic/web-sockets/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 +- build.gradle | 4 ++-- dsl/cafe-dsl/pom.xml | 2 +- dsl/kafka-dsl/pom.xml | 2 +- dsl/pom.xml | 2 +- dsl/si4demo/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/rest-http/pom.xml | 2 +- intermediate/retry-and-more/pom.xml | 2 +- intermediate/splitter-aggregator-reaper/pom.xml | 2 +- intermediate/stored-procedures-derby/pom.xml | 2 +- intermediate/stored-procedures-ms/pom.xml | 2 +- intermediate/stored-procedures-oracle/pom.xml | 2 +- intermediate/stored-procedures-postgresql/pom.xml | 2 +- intermediate/tcp-client-server-multiplex/pom.xml | 2 +- intermediate/travel/pom.xml | 2 +- intermediate/tx-synch/pom.xml | 2 +- 65 files changed, 67 insertions(+), 67 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 14df8dfb8..66b05997e 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -188,7 +188,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 4d0e59c17..96aafdfdf 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 76a9a8dee..7b634d34e 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -195,7 +195,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 1d13f8f1a..8264fd8be 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -234,7 +234,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index bc4654bef..c6b72b3e4 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -177,7 +177,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index b4373222e..4b927f108 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -217,7 +217,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 829260884..45c1cc8a4 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -176,7 +176,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index d143fe910..5dfccebd6 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -263,7 +263,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 0c1ff41c0..75478824e 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index e80b1b538..9553a0199 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -458,7 +458,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 7665a4cdd..bfc93241b 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -217,7 +217,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 1bd1095e7..d068ad3fb 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -188,7 +188,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index b457dbee4..c15bf0efc 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -228,7 +228,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 5a62eab50..96e1199a5 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 34816c24e..27650c636 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -177,7 +177,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 80af886a2..97182f90b 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 04a7b3998..8784ad461 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 04048b1ad..a66d3946c 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -224,7 +224,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index c744f17d9..4d7f379b9 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index f54bf37b8..0c10c79c1 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -235,7 +235,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 846909269..4ba2014c0 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -177,7 +177,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 262df28be..3020be7c8 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -227,7 +227,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 9eee9a339..37ff26863 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -176,7 +176,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 0e1846d8e..55735f176 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -230,7 +230,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 0eecdfb6b..c9a42e982 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -101,7 +101,7 @@ org.springframework.kafka spring-kafka - 2.4.2.RELEASE + 2.4.4.RELEASE compile @@ -235,7 +235,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 2df68bd0a..fe1547419 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -200,7 +200,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index fad216f73..d2a4b72ed 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -177,7 +177,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index ef1f193fd..c47f1a50c 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -217,7 +217,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 812a94cbd..dc67c58a2 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 4204b393b..875ec0e26 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 41dd731d2..1b89a5981 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -177,7 +177,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index c894dd31f..725aff759 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -207,7 +207,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index be41943fb..d0e2a790e 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -200,7 +200,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index db0f6a6f3..e608e18a4 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -206,7 +206,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index f69e7c124..3baafd431 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -188,7 +188,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 002bd87f6..4cd41cdef 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -206,7 +206,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 2aa715b39..de75044b4 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -209,7 +209,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index da6e3b6a5..2c72d97bf 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -166,7 +166,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 8442cfc74..5c66afbfc 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -195,7 +195,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 8f2986e8c..c7976cd7a 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -187,7 +187,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 3637c5fb7..731aaec07 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -176,7 +176,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 0e83f0490..5c61e4c15 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 6f6c5cfb8..3601161d2 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/build.gradle b/build.gradle index 6b70b90f7..fc2613c24 100644 --- a/build.gradle +++ b/build.gradle @@ -210,11 +210,11 @@ subprojects { subproject -> postgresVersion = '42.2.9' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springIntegrationVersion = '5.3.0.M2' + springIntegrationVersion = '5.3.0.M3' springIntegrationKafkaVersion = '3.2.1.RELEASE' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.4.2.RELEASE' + springKafkaVersion = '2.4.4.RELEASE' springVersion = '5.2.4.RELEASE' springSecurityVersion = '5.3.0.RC1' springWebFlowVersion = '2.3.3.RELEASE' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 0f9cfba19..2062fe9db 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -207,7 +207,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index e982a0a77..3d16c94f2 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -219,7 +219,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index d6b39e4c5..26a2f273b 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -140,7 +140,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 78b2b9053..0f0174cfa 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -276,7 +276,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index fce283638..327b406f9 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index aae97dbe5..8f810b7a3 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 866a15642..250e140b2 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 8fdc73308..31fa27719 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index e90e5d2c1..86455c8b9 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -235,7 +235,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index a1694a80e..5764247a4 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -211,7 +211,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 91bffa584..33dd398fd 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -211,7 +211,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 9dd8b021c..354e3aa12 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -266,7 +266,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 641484474..57acea20a 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -198,7 +198,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 6c063723e..531e89752 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -177,7 +177,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 05dc7b6ba..7cdce0ffa 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -177,7 +177,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index ec9611e68..5fd9b1613 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -189,7 +189,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 7055fd974..e11b99852 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 0d140ce90..8bc808ee4 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -201,7 +201,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 563309999..56028ad17 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -176,7 +176,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 1afee4138..91738650f 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -187,7 +187,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 57cffc81b..52b8b4d8d 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -188,7 +188,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M2 + 5.3.0.M3 import pom From 427f28642ba9ac7ec612e88b3c4ae2420a959b0f Mon Sep 17 00:00:00 2001 From: Daniel Frey Date: Mon, 16 Mar 2020 15:53:15 -0400 Subject: [PATCH 228/356] Add testcontainers-rabbitmq sample * update the project with requested changes * cleaned up commented code * `travisci` distribution update * remove transitive dependency * generate pom * Fix code format for tab indents * Add `Jackson2JsonMessageConverter` to avoid Java serialization over the network --- .travis.yml | 1 + build.gradle | 40 +++ .../testcontainers-rabbitmq/README.md | 53 ++++ intermediate/testcontainers-rabbitmq/pom.xml | 283 ++++++++++++++++++ .../IntegrationConfig.java | 46 +++ .../testcontainersrabbitmq/Request.java | 48 +++ .../testcontainersrabbitmq/Response.java | 48 +++ .../TestcontainersRabbitmqApplication.java | 29 ++ .../src/main/resources/application.yml | 1 + .../IntegrationConfigTests.java | 105 +++++++ .../testcontainersrabbitmq/Receiver.java | 85 ++++++ .../src/test/resources/application.yml | 11 + 12 files changed, 750 insertions(+) create mode 100644 intermediate/testcontainers-rabbitmq/README.md create mode 100644 intermediate/testcontainers-rabbitmq/pom.xml create mode 100644 intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/IntegrationConfig.java create mode 100644 intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/Request.java create mode 100644 intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/Response.java create mode 100644 intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/TestcontainersRabbitmqApplication.java create mode 100644 intermediate/testcontainers-rabbitmq/src/main/resources/application.yml create mode 100644 intermediate/testcontainers-rabbitmq/src/test/java/org/springframework/integration/samples/testcontainersrabbitmq/IntegrationConfigTests.java create mode 100644 intermediate/testcontainers-rabbitmq/src/test/java/org/springframework/integration/samples/testcontainersrabbitmq/Receiver.java create mode 100644 intermediate/testcontainers-rabbitmq/src/test/resources/application.yml diff --git a/.travis.yml b/.travis.yml index 3a412a0a4..e0891e448 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: trusty language: java jdk: oraclejdk8 sudo: false diff --git a/build.gradle b/build.gradle index fc2613c24..85e82e3c2 100644 --- a/build.gradle +++ b/build.gradle @@ -210,6 +210,7 @@ subprojects { subproject -> postgresVersion = '42.2.9' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' + springCloudVersion ='Hoxton.SR3' springIntegrationVersion = '5.3.0.M3' springIntegrationKafkaVersion = '3.2.1.RELEASE' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' @@ -218,6 +219,7 @@ subprojects { subproject -> springVersion = '5.2.4.RELEASE' springSecurityVersion = '5.3.0.RC1' springWebFlowVersion = '2.3.3.RELEASE' + testcontainersVersion = '1.13.0' tilesJspVersion = '2.2.1' validationApiVersion = '1.0.0.GA' } @@ -917,6 +919,44 @@ project('tcp-client-server') { } } +project('testcontainers-rabbitmq') { + description = 'Testcontainers RabbitMQ Sample' + + apply plugin: 'org.springframework.boot' + + bootRun { + main = 'org.springframework.integration.samples.testcontainersrabbitmq.TestcontainersRabbitmqApplication' + } + + dependencies { + compile "org.springframework.boot:spring-boot-starter-integration" + compile "org.springframework.integration:spring-integration-amqp" + compile "org.springframework.boot:spring-boot-starter-json" + + testCompile('org.springframework.boot:spring-boot-starter-test') { + exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' + } + testCompile 'org.springframework.integration:spring-integration-test' + testCompile 'org.springframework.amqp:spring-rabbit-test' + testCompile 'org.springframework.cloud:spring-cloud-starter' + + testCompile "org.testcontainers:junit-jupiter:$testcontainersVersion" + testCompile "com.playtika.testcontainers:embedded-rabbitmq:1.42" + + } + + dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-dependencies:$springCloudVersion" + } + } + + test { + useJUnitPlatform() + } + +} + project('testing-examples') { description = 'Testing Examples' diff --git a/intermediate/testcontainers-rabbitmq/README.md b/intermediate/testcontainers-rabbitmq/README.md new file mode 100644 index 000000000..aa131dac0 --- /dev/null +++ b/intermediate/testcontainers-rabbitmq/README.md @@ -0,0 +1,53 @@ +Testcontainers - RabbitMQ Sample +================================== + +Testcontainers is a Java library that supports JUnit tests, providing lightweight, throwaway instances of common databases, Selenium web browsers, or anything else that can run in a Docker container. + +[Testcontainers](https://www.testcontainers.org/) + +This sample demonstrates how to setup and configure the embedded RabbitMQ Docker container for use in testing Spring Integration projects that require RabbitMQ. + +A simple `IntegrationFlow` is setup to establish a message is published to an `OutboundGateway` and handled by some _downstream_ process. +It expects a response to come back on some reply-to channel established by the `RabbitTemplate`. + +In the real world scenario, the Topic Exchange and Queues would have already been established by the _downstream_ application. +To aid in testing, when the RabbitMQ Testcontainer comes up, the correct Topic Exchange and Queues are created and provide simple message and handling and responses. + +**Note**: These tests take a bit longer run to allow time for the Docker image to spin up and tear down. + +## Embedded RabbitMQ + +The project dependency adds Spring Boot Autoconfiguration for test containers that automatically sets up and configures the embedded docker image + +```groovy +testCompile "com.playtika.testcontainers:embedded-rabbitmq:1.42" +``` + +Configuration is performed in `src/test/resources/application.yml` to point the Spring Boot RabbitMQ Autoconfiguration to the properties exposed by the library + +```yml +spring: + rabbitmq: + host: ${embedded.rabbitmq.host} + port: ${embedded.rabbitmq.port} + username: ${embedded.rabbitmq.user} + password: ${embedded.rabbitmq.password} + virtual-host: ${embedded.rabbitmq.vhost} +``` + +[testcontainers-spring-boot](https://github.com/testcontainers/testcontainers-spring-boot) + +## Architecture + +The `IntegrationFlow` is setup to publish a message to a RabbitMQ `TopicExchange`. A `RoutingKey` is used to direct this message to an appropriate `Queue`. +The result is sent back to the _flow_ on a separate reply-to `Queue`. + +It is deliberately setup this way to model a real-world scenario we ran into. The calling application is a Spring Boot application and the downstream application is a Python ML application. + +## Execute the tests + +The Gradle Wrapper is provided to execute the tests. + +```bash +$ ./gradlew :testcontainers-rabbitmq:test +``` \ No newline at end of file diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml new file mode 100644 index 000000000..1a74c00b6 --- /dev/null +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -0,0 +1,283 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.3.0.BUILD-SNAPSHOT + + org.springframework.integration.samples + testcontainers-rabbitmq + 5.3.0.BUILD-SNAPSHOT + Testcontainers RabbitMQ Sample + Testcontainers RabbitMQ Sample + https://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + + + garyrussell + Gary Russell + grussell@pivotal.io + + lead emeritus + + + + markfisher + Mark Fisher + mfisher@pivotal.io + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@pivotal.io + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + org.springframework.boot + spring-boot-starter-integration + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + org.springframework.integration + spring-integration-amqp + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + org.springframework.boot + spring-boot-starter-json + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + junit + junit + 4.12 + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + * + org.hamcrest + + + + + org.hamcrest + hamcrest-all + 1.3 + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + org.mockito + mockito-core + 3.2.4 + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + * + org.hamcrest + + + + + org.springframework + spring-test + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + org.springframework.boot + spring-boot-starter-test + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + junit-vintage-engine + org.junit.vintage + + + + + org.springframework.integration + spring-integration-test + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + org.springframework.amqp + spring-rabbit-test + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + org.springframework.cloud + spring-cloud-starter + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + org.testcontainers + junit-jupiter + 1.13.0 + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + com.playtika.testcontainers + embedded-rabbitmq + 1.42 + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + org.springframework.cloud + spring-cloud-dependencies + Hoxton.SR3 + import + pom + + + org.springframework.boot + spring-boot-dependencies + 2.3.0.BUILD-SNAPSHOT + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.10.2.20200130 + import + pom + + + org.springframework + spring-framework-bom + 5.2.4.RELEASE + import + pom + + + org.springframework.integration + spring-integration-bom + 5.3.0.M3 + import + pom + + + + diff --git a/intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/IntegrationConfig.java b/intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/IntegrationConfig.java new file mode 100644 index 000000000..6b470d38a --- /dev/null +++ b/intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/IntegrationConfig.java @@ -0,0 +1,46 @@ +/* + * Copyright 2002-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.testcontainersrabbitmq; + +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; +import org.springframework.amqp.support.converter.MessageConverter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.integration.amqp.dsl.Amqp; +import org.springframework.integration.dsl.IntegrationFlow; + +import com.fasterxml.jackson.databind.ObjectMapper; + +@Configuration +public class IntegrationConfig { + + @Bean + public IntegrationFlow request(RabbitTemplate amqpTemplate) { + return f -> f + .log() + .handle(Amqp.outboundGateway(amqpTemplate) + .exchangeName("downstream") + .routingKey("downstream.request")); + } + + @Bean + public MessageConverter jsonMessageConverter(ObjectMapper objectMapper) { + return new Jackson2JsonMessageConverter(objectMapper); + } + +} diff --git a/intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/Request.java b/intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/Request.java new file mode 100644 index 000000000..415015ee4 --- /dev/null +++ b/intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/Request.java @@ -0,0 +1,48 @@ +/* + * Copyright 2002-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.testcontainersrabbitmq; + +import java.util.UUID; + +public class Request { + + private final UUID id; + + private final Integer messageId; + + public Request(UUID id, Integer messageId) { + this.id = id; + this.messageId = messageId; + } + + public UUID getId() { + return this.id; + } + + public Integer getMessageId() { + return this.messageId; + } + + @Override + public String toString() { + return "Request{" + + "id=" + this.id + + ", messageId=" + this.messageId + + '}'; + } + +} diff --git a/intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/Response.java b/intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/Response.java new file mode 100644 index 000000000..c2f39bf01 --- /dev/null +++ b/intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/Response.java @@ -0,0 +1,48 @@ +/* + * Copyright 2002-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.testcontainersrabbitmq; + +import java.util.UUID; + +public class Response { + + private final UUID requestId; + + private final String message; + + public Response(UUID requestId, String message) { + this.requestId = requestId; + this.message = message; + } + + public UUID getRequestId() { + return this.requestId; + } + + public String getMessage() { + return this.message; + } + + @Override + public String toString() { + return "Response{" + + "requestId=" + this.requestId + + ", message='" + this.message + '\'' + + '}'; + } + +} diff --git a/intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/TestcontainersRabbitmqApplication.java b/intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/TestcontainersRabbitmqApplication.java new file mode 100644 index 000000000..a77eb35ce --- /dev/null +++ b/intermediate/testcontainers-rabbitmq/src/main/java/org/springframework/integration/samples/testcontainersrabbitmq/TestcontainersRabbitmqApplication.java @@ -0,0 +1,29 @@ +/* + * Copyright 2002-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.testcontainersrabbitmq; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TestcontainersRabbitmqApplication { + + public static void main(String[] args) { + SpringApplication.run(TestcontainersRabbitmqApplication.class, args); + } + +} diff --git a/intermediate/testcontainers-rabbitmq/src/main/resources/application.yml b/intermediate/testcontainers-rabbitmq/src/main/resources/application.yml new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/intermediate/testcontainers-rabbitmq/src/main/resources/application.yml @@ -0,0 +1 @@ + diff --git a/intermediate/testcontainers-rabbitmq/src/test/java/org/springframework/integration/samples/testcontainersrabbitmq/IntegrationConfigTests.java b/intermediate/testcontainers-rabbitmq/src/test/java/org/springframework/integration/samples/testcontainersrabbitmq/IntegrationConfigTests.java new file mode 100644 index 000000000..260dc3ac9 --- /dev/null +++ b/intermediate/testcontainers-rabbitmq/src/test/java/org/springframework/integration/samples/testcontainersrabbitmq/IntegrationConfigTests.java @@ -0,0 +1,105 @@ +/* + * Copyright 2002-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.testcontainersrabbitmq; + +import org.junit.jupiter.api.Test; + +import org.springframework.amqp.core.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Import; +import org.springframework.integration.core.MessagingTemplate; +import org.springframework.integration.test.context.SpringIntegrationTest; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.support.MessageBuilder; + +import java.util.UUID; + +import static org.assertj.core.api.Assertions.assertThat; + +@SpringBootTest +@SpringIntegrationTest +@Import({ Receiver.class, IntegrationConfigTests.Config.class }) +class IntegrationConfigTests { + + @Autowired + @Qualifier("request.input") + private MessageChannel requestInput; + + @Test + public void test() { + MessagingTemplate messagingTemplate = new MessagingTemplate(); + UUID requestId = UUID.randomUUID(); + Request fakeRequest = new Request(requestId, 1); + + Message receive = + messagingTemplate + .sendAndReceive(requestInput, + MessageBuilder + .withPayload(fakeRequest) + .setHeader("Content-Type", "application/json") + .build() + ); + assertThat(receive).isNotNull(); + assertThat(receive.getPayload()).isInstanceOf(Response.class); + + Response actual = (Response) receive.getPayload(); + assertThat(actual.getRequestId()).isEqualTo(requestId); + assertThat(actual.getMessage()).isEqualTo("This is message 1"); + + } + + @TestConfiguration + public static class Config { + + public static final String TOPIC_EXCHANGE = "downstream"; + + public static final String RESULTS_QUEUE = "downstream.results"; + + public static final String RESULTS_ROUTING_KEY = "downstream.results.#"; + + @Bean + TopicExchange topicExchange() { + + return ExchangeBuilder + .topicExchange(TOPIC_EXCHANGE) + .build(); + } + + @Bean + Queue resultsQueue() { + + return QueueBuilder + .nonDurable(RESULTS_QUEUE) + .build(); + } + + @Bean + Binding resultsBinding(TopicExchange topicExchange, Queue resultsQueue) { + + return BindingBuilder.bind(resultsQueue) + .to(topicExchange) + .with(RESULTS_ROUTING_KEY); + } + + } + +} diff --git a/intermediate/testcontainers-rabbitmq/src/test/java/org/springframework/integration/samples/testcontainersrabbitmq/Receiver.java b/intermediate/testcontainers-rabbitmq/src/test/java/org/springframework/integration/samples/testcontainersrabbitmq/Receiver.java new file mode 100644 index 000000000..f54d94c18 --- /dev/null +++ b/intermediate/testcontainers-rabbitmq/src/test/java/org/springframework/integration/samples/testcontainersrabbitmq/Receiver.java @@ -0,0 +1,85 @@ +/* + * Copyright 2002-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.testcontainersrabbitmq; + +import java.util.HashMap; +import java.util.Map; +import java.util.Random; + +import javax.annotation.PostConstruct; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.springframework.amqp.rabbit.annotation.Exchange; +import org.springframework.amqp.rabbit.annotation.Queue; +import org.springframework.amqp.rabbit.annotation.QueueBinding; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.messaging.handler.annotation.SendTo; +import org.springframework.stereotype.Component; + +@Component +public class Receiver { + + private static final Logger log = LoggerFactory.getLogger(Receiver.class); + + private static final Map messages; + + static { + + messages = new HashMap<>(); + + messages.put(1, "This is message 1"); + messages.put(2, "This is message 2"); + messages.put(3, "This is message 3"); + messages.put(4, "This is message 4"); + messages.put(5, "This is message 5"); + + } + + @PostConstruct + public void initialize() { + log.info("Receiver initialized!"); + } + + @RabbitListener( + bindings = @QueueBinding( + value = @Queue(value = "downstream.request", durable = "true"), + exchange = @Exchange(value = "downstream", ignoreDeclarationExceptions = "true", type = "topic"), + key = "downstream.request.#" + ) + ) + @SendTo("downstream.results") + public Response handleMessage(Request request) { + log.info("handleMessage : received message [{}]", request); + + Integer messageId; + if (null != request.getMessageId()) { + + messageId = request.getMessageId(); + + } + else { + + messageId = new Random().ints(1, 5).findFirst().getAsInt(); + + } + + return new Response(request.getId(), messages.get(messageId)); + } + +} diff --git a/intermediate/testcontainers-rabbitmq/src/test/resources/application.yml b/intermediate/testcontainers-rabbitmq/src/test/resources/application.yml new file mode 100644 index 000000000..140c9767d --- /dev/null +++ b/intermediate/testcontainers-rabbitmq/src/test/resources/application.yml @@ -0,0 +1,11 @@ +logging.level: + org.springframework.integration: DEBUG + com.playtika.test: DEBUG + +spring: + rabbitmq: + host: ${embedded.rabbitmq.host} + port: ${embedded.rabbitmq.port} + username: ${embedded.rabbitmq.user} + password: ${embedded.rabbitmq.password} + virtual-host: ${embedded.rabbitmq.vhost} From 40bbcf94e91b2aeecc774c3626ea36b00264e545 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 24 Mar 2020 15:44:47 -0400 Subject: [PATCH 229/356] .gitignore sts4-cache --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bc4753daa..b3bf74958 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ derby.log .idea activemq-data .settings/ - +.sts4-cache /.gradle build/ From c68d40458ef4c66cf1f3038263e22f388340fa42 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 1 Apr 2020 16:00:21 -0400 Subject: [PATCH 230/356] Upgrade to SI-5.3.0.M4 --- advanced/advanced-testing-examples/pom.xml | 2 +- advanced/dynamic-ftp/pom.xml | 2 +- advanced/dynamic-tcp-client/pom.xml | 2 +- applications/cafe-scripted/pom.xml | 2 +- applications/cafe/cafe-amqp/pom.xml | 2 +- applications/cafe/cafe-jms/pom.xml | 2 +- applications/cafe/cafe-si/pom.xml | 2 +- applications/file-split-ftp/pom.xml | 2 +- applications/loan-broker/pom.xml | 2 +- applications/loanshark/pom.xml | 2 +- applications/stomp-chat/pom.xml | 2 +- basic/amqp/pom.xml | 2 +- basic/barrier/pom.xml | 2 +- basic/control-bus/pom.xml | 2 +- basic/enricher/pom.xml | 2 +- basic/feed/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/kafka/pom.xml | 2 +- basic/mail/pom.xml | 2 +- basic/mongodb/pom.xml | 2 +- basic/mqtt/pom.xml | 2 +- basic/oddeven/pom.xml | 2 +- basic/quote/pom.xml | 2 +- basic/sftp/pom.xml | 2 +- basic/splunk/pom.xml | 2 +- basic/tcp-amqp/pom.xml | 2 +- basic/tcp-broadcast/pom.xml | 2 +- basic/tcp-client-server/pom.xml | 2 +- basic/tcp-with-headers/pom.xml | 2 +- basic/testing-examples/pom.xml | 2 +- basic/twitter/pom.xml | 2 +- basic/web-sockets/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 +- build.gradle | 4 ++-- dsl/cafe-dsl/pom.xml | 2 +- dsl/kafka-dsl/pom.xml | 2 +- dsl/pom.xml | 2 +- dsl/si4demo/pom.xml | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 58702 -> 58694 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew.bat | 3 +++ 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/rest-http/pom.xml | 2 +- intermediate/retry-and-more/pom.xml | 2 +- .../splitter-aggregator-reaper/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/testcontainers-rabbitmq/pom.xml | 2 +- intermediate/travel/pom.xml | 2 +- intermediate/tx-synch/pom.xml | 2 +- 69 files changed, 71 insertions(+), 68 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 66b05997e..2125e6c18 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -188,7 +188,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 96aafdfdf..a97046f91 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 7b634d34e..1b828bdfc 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -195,7 +195,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 8264fd8be..5c5cd32f8 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -234,7 +234,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index c6b72b3e4..1d779383a 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -177,7 +177,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 4b927f108..2065d56f1 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -217,7 +217,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 45c1cc8a4..7653f1e7a 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -176,7 +176,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 5dfccebd6..548c891e7 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -263,7 +263,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 75478824e..94649764f 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 9553a0199..29ad8404d 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -458,7 +458,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index bfc93241b..7379cdd92 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -217,7 +217,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index d068ad3fb..9eb004ece 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -188,7 +188,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index c15bf0efc..cca64d1d6 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -228,7 +228,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 96e1199a5..c17ec8dbd 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 27650c636..51014973e 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -177,7 +177,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 97182f90b..dda12680e 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 8784ad461..e38bcc75c 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index a66d3946c..3c7cd7030 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -224,7 +224,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 4d7f379b9..6428a549d 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 0c10c79c1..8b4cae723 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -235,7 +235,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 4ba2014c0..5648ac5d1 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -177,7 +177,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 3020be7c8..3bd70d283 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -227,7 +227,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 37ff26863..4c9cb52a6 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -176,7 +176,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 55735f176..46d3167bb 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -230,7 +230,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index c9a42e982..676fc7c70 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -235,7 +235,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index fe1547419..0904b4b3f 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -200,7 +200,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index d2a4b72ed..77666e92e 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -177,7 +177,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index c47f1a50c..f4bf3106a 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -217,7 +217,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index dc67c58a2..6a3e99af8 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 875ec0e26..fff1d6d0c 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 1b89a5981..12db913d5 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -177,7 +177,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 725aff759..e51301fa6 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -207,7 +207,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index d0e2a790e..d5a4feb81 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -200,7 +200,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index e608e18a4..6081edd77 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -206,7 +206,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 3baafd431..ff475dfa9 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -188,7 +188,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 4cd41cdef..d6ff97484 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -206,7 +206,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index de75044b4..2809cee26 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -209,7 +209,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 2c72d97bf..eb6c0b8e0 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -166,7 +166,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 5c66afbfc..d0e4b7f19 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -195,7 +195,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index c7976cd7a..5be581ebc 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -187,7 +187,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 731aaec07..0b569b35c 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -176,7 +176,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 5c61e4c15..e670beebf 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 3601161d2..29f17b878 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/build.gradle b/build.gradle index 85e82e3c2..0b1dcc7bd 100644 --- a/build.gradle +++ b/build.gradle @@ -161,7 +161,7 @@ subprojects { subproject -> apply plugin: 'io.spring.dependency-management' jacoco { - toolVersion = "0.7.9" + toolVersion = "0.8.5" } compileJava { @@ -211,7 +211,7 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' springCloudVersion ='Hoxton.SR3' - springIntegrationVersion = '5.3.0.M3' + springIntegrationVersion = '5.3.0.M4' springIntegrationKafkaVersion = '3.2.1.RELEASE' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 2062fe9db..9cb948986 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -207,7 +207,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 3d16c94f2..3fce0f01b 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -219,7 +219,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 26a2f273b..926e96be6 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -140,7 +140,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 0f0174cfa..1d66bad0a 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -276,7 +276,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index cc4fdc293d0e50b0ad9b65c16e7ddd1db2f6025b..490fda8577df6c95960ba7077c43220e5bb2c0d9 100644 GIT binary patch delta 18348 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 H|2F2obH5>< delta 18428 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 94920145f..a4b442974 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew.bat b/gradlew.bat index 24467a141..9109989e3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 327b406f9..603b74b1e 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 8f810b7a3..63c5d247b 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 250e140b2..be574e299 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 31fa27719..2450e3bda 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 86455c8b9..1150cff90 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -235,7 +235,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 5764247a4..e4f423755 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -211,7 +211,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 33dd398fd..6aa0387c8 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -211,7 +211,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 354e3aa12..104f56c90 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -266,7 +266,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 57acea20a..5707a0c85 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -198,7 +198,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 531e89752..c8fdba9c3 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -177,7 +177,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 7cdce0ffa..6a195d403 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -177,7 +177,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 5fd9b1613..34a55f020 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -189,7 +189,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index e11b99852..49fcbe1e9 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -165,7 +165,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 8bc808ee4..a2b74acc8 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -201,7 +201,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 56028ad17..141bb8ad1 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -176,7 +176,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 1a74c00b6..46f41a46d 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -274,7 +274,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 91738650f..8b1ccc605 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -187,7 +187,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 52b8b4d8d..41bcf148b 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -188,7 +188,7 @@ org.springframework.integration spring-integration-bom - 5.3.0.M3 + 5.3.0.M4 import pom From 2fcf28a9d48201202ebba4a0f070576f359478e5 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 17 Apr 2020 15:25:51 -0400 Subject: [PATCH 231/356] Upgrade dependencies --- advanced/advanced-testing-examples/pom.xml | 6 +++--- advanced/dynamic-ftp/pom.xml | 6 +++--- advanced/dynamic-tcp-client/pom.xml | 6 +++--- applications/cafe-scripted/pom.xml | 6 +++--- applications/cafe/cafe-amqp/pom.xml | 6 +++--- applications/cafe/cafe-jms/pom.xml | 6 +++--- applications/cafe/cafe-si/pom.xml | 6 +++--- applications/file-split-ftp/pom.xml | 6 +++--- applications/loan-broker/pom.xml | 6 +++--- applications/loanshark/pom.xml | 6 +++--- applications/stomp-chat/pom.xml | 6 +++--- basic/amqp/pom.xml | 6 +++--- basic/barrier/pom.xml | 6 +++--- basic/control-bus/pom.xml | 6 +++--- basic/enricher/pom.xml | 6 +++--- basic/feed/pom.xml | 6 +++--- basic/file/pom.xml | 6 +++--- basic/ftp/pom.xml | 6 +++--- basic/helloworld/pom.xml | 6 +++--- basic/http/pom.xml | 6 +++--- basic/jdbc/pom.xml | 6 +++--- basic/jms/pom.xml | 6 +++--- basic/jmx/pom.xml | 6 +++--- basic/jpa/pom.xml | 6 +++--- basic/kafka/pom.xml | 10 +++++----- basic/mail/pom.xml | 6 +++--- basic/mongodb/pom.xml | 8 ++++---- basic/mqtt/pom.xml | 6 +++--- basic/oddeven/pom.xml | 6 +++--- basic/quote/pom.xml | 6 +++--- basic/sftp/pom.xml | 6 +++--- basic/splunk/pom.xml | 6 +++--- basic/tcp-amqp/pom.xml | 6 +++--- basic/tcp-broadcast/pom.xml | 6 +++--- basic/tcp-client-server/pom.xml | 6 +++--- basic/tcp-with-headers/pom.xml | 6 +++--- basic/testing-examples/pom.xml | 6 +++--- basic/twitter/pom.xml | 6 +++--- basic/web-sockets/pom.xml | 6 +++--- basic/ws-inbound-gateway/pom.xml | 6 +++--- basic/ws-outbound-gateway/pom.xml | 6 +++--- basic/xml/pom.xml | 6 +++--- basic/xmpp/pom.xml | 6 +++--- build.gradle | 14 +++++++------- dsl/cafe-dsl/pom.xml | 6 +++--- dsl/kafka-dsl/pom.xml | 8 ++++---- dsl/pom.xml | 6 +++--- dsl/si4demo/pom.xml | 6 +++--- intermediate/async-gateway/pom.xml | 6 +++--- intermediate/dynamic-poller/pom.xml | 6 +++--- intermediate/errorhandling/pom.xml | 6 +++--- intermediate/file-processing/pom.xml | 6 +++--- intermediate/mail-attachments/pom.xml | 6 +++--- intermediate/monitoring/pom.xml | 6 +++--- intermediate/multipart-http/pom.xml | 6 +++--- intermediate/rest-http/pom.xml | 10 +++++----- intermediate/retry-and-more/pom.xml | 6 +++--- intermediate/splitter-aggregator-reaper/pom.xml | 6 +++--- intermediate/stored-procedures-derby/pom.xml | 6 +++--- intermediate/stored-procedures-ms/pom.xml | 6 +++--- intermediate/stored-procedures-oracle/pom.xml | 6 +++--- intermediate/stored-procedures-postgresql/pom.xml | 6 +++--- intermediate/tcp-client-server-multiplex/pom.xml | 6 +++--- intermediate/testcontainers-rabbitmq/pom.xml | 6 +++--- intermediate/travel/pom.xml | 6 +++--- intermediate/tx-synch/pom.xml | 6 +++--- 66 files changed, 208 insertions(+), 208 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 2125e6c18..07ed6cb33 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -174,21 +174,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index a97046f91..bdde3b632 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 1b828bdfc..395eda957 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -181,21 +181,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 5c5cd32f8..7fbc39fa1 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -220,21 +220,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 1d779383a..d541204ac 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 2065d56f1..f953e6564 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -203,21 +203,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 7653f1e7a..38abacbf1 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -162,21 +162,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 548c891e7..4fd46c47e 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -249,21 +249,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 94649764f..b2362301d 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 29ad8404d..16480cfde 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -444,21 +444,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 7379cdd92..cbe801779 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -203,21 +203,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 9eb004ece..9151a1cfc 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -174,21 +174,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index cca64d1d6..bd762bf9d 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -214,21 +214,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index c17ec8dbd..37a95e606 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 51014973e..365e98b26 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index dda12680e..66d474080 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index e38bcc75c..22947cfef 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 3c7cd7030..740b2e4ae 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -210,21 +210,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 6428a549d..8cd56ac9b 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 8b4cae723..86d5cc7fb 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -221,21 +221,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 5648ac5d1..6e935f219 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 3bd70d283..d608bcd53 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -213,21 +213,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 4c9cb52a6..e29e88e3d 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -162,21 +162,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 46d3167bb..c77cf1c13 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -216,21 +216,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 676fc7c70..b58478c64 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -74,7 +74,7 @@ org.springframework.integration spring-integration-kafka - 3.2.1.RELEASE + 3.3.0.BUILD-SNAPSHOT compile @@ -101,7 +101,7 @@ org.springframework.kafka spring-kafka - 2.4.4.RELEASE + 2.5.0.BUILD-SNAPSHOT compile @@ -221,21 +221,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 0904b4b3f..38b6e40df 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -186,21 +186,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 77666e92e..8a2f39f52 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -81,7 +81,7 @@ org.mongodb mongodb-driver-sync - 4.0.0-beta1 + 4.0.1 compile @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index f4bf3106a..c6fb0deab 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -203,21 +203,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 6a3e99af8..6dc663a5e 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index fff1d6d0c..1aad34391 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 12db913d5..b42687c0d 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index e51301fa6..416c493fe 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -193,21 +193,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index d5a4feb81..6f9373dbc 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -186,21 +186,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 6081edd77..3c9b1672d 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -192,21 +192,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index ff475dfa9..eb3f9fcc7 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -174,21 +174,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index d6ff97484..c97fa94e4 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -192,21 +192,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 2809cee26..e5db531f7 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -195,21 +195,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index eb6c0b8e0..0e5647b27 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -152,21 +152,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index d0e4b7f19..96e6fff4e 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -181,21 +181,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 5be581ebc..152f758c9 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -173,21 +173,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 0b569b35c..f2fdd49f7 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -162,21 +162,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index e670beebf..33b07f68a 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 29f17b878..d025a3416 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/build.gradle b/build.gradle index 0b1dcc7bd..451c0201e 100644 --- a/build.gradle +++ b/build.gradle @@ -189,7 +189,7 @@ subprojects { subproject -> groovyVersion = '2.5.8' hsqldbVersion = '2.5.0' h2Version = '1.4.200' - jacksonVersion = '2.10.2.20200130' + jacksonVersion = '2.10.3' javaxInjectVersion = '1' javaxMailVersion = '1.6.2' jodaTimeVersion = '1.6' @@ -204,20 +204,20 @@ subprojects { subproject -> jythonVersion = '2.7.0' log4jVersion = '2.12.1' mockitoVersion = '3.2.4' - mongoDriverVersion = '4.0.0-beta1' + mongoDriverVersion = '4.0.1' openJpaVersion = '2.4.0' oracleDriverVersion = '11.2.0.3' postgresVersion = '42.2.9' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' springCloudVersion ='Hoxton.SR3' - springIntegrationVersion = '5.3.0.M4' - springIntegrationKafkaVersion = '3.2.1.RELEASE' + springIntegrationVersion = '5.3.0.BUILD-SNAPSHOT' + springIntegrationKafkaVersion = '3.3.0.BUILD-SNAPSHOT' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.4.4.RELEASE' - springVersion = '5.2.4.RELEASE' - springSecurityVersion = '5.3.0.RC1' + springKafkaVersion = '2.5.0.BUILD-SNAPSHOT' + springVersion = '5.2.5.RELEASE' + springSecurityVersion = '5.3.1.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.13.0' tilesJspVersion = '2.2.1' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 9cb948986..82b6c5fdd 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -193,21 +193,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 3fce0f01b..aef61c48b 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -85,7 +85,7 @@ org.springframework.integration spring-integration-kafka - 3.2.1.RELEASE + 3.3.0.BUILD-SNAPSHOT compile @@ -205,21 +205,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 926e96be6..7aa9920e7 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -126,21 +126,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 1d66bad0a..97422b77f 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -262,21 +262,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 603b74b1e..0852f2fba 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 63c5d247b..7bdc3020c 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index be574e299..533189385 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 2450e3bda..3836221d7 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 1150cff90..a9914336c 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -221,21 +221,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index e4f423755..cd77006b9 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -197,21 +197,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 6aa0387c8..4edb4c196 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -197,21 +197,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 104f56c90..e98202d6d 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -146,7 +146,7 @@ org.springframework.security spring-security-web - 5.3.0.RC1 + 5.3.1.RELEASE compile @@ -158,7 +158,7 @@ org.springframework.security spring-security-config - 5.3.0.RC1 + 5.3.1.RELEASE compile @@ -252,21 +252,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 5707a0c85..c9d19118c 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -184,21 +184,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index c8fdba9c3..7d1153d57 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 6a195d403..b202b1510 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 34a55f020..cdcfd0daa 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -175,21 +175,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 49fcbe1e9..60c1e08c8 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index a2b74acc8..7ec146c2f 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -187,21 +187,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 141bb8ad1..6021ccc9c 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -162,21 +162,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 46f41a46d..86f448389 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -260,21 +260,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 8b1ccc605..590c07b14 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -173,21 +173,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 41bcf148b..356d41a30 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -174,21 +174,21 @@ com.fasterxml.jackson jackson-bom - 2.10.2.20200130 + 2.10.3 import pom org.springframework spring-framework-bom - 5.2.4.RELEASE + 5.2.5.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.M4 + 5.3.0.BUILD-SNAPSHOT import pom From b7afbb45dc4f1a60ebd6aa1b088301cbe62da179 Mon Sep 17 00:00:00 2001 From: "C.A. Little" Date: Tue, 21 Apr 2020 09:47:15 -0400 Subject: [PATCH 232/356] Update README.adoc in tcp-with-headers Corrected command line for running sample. --- basic/tcp-with-headers/README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basic/tcp-with-headers/README.adoc b/basic/tcp-with-headers/README.adoc index 59d978053..b138e9b16 100644 --- a/basic/tcp-with-headers/README.adoc +++ b/basic/tcp-with-headers/README.adoc @@ -6,7 +6,7 @@ This example demonstrates how to use standard framework components to encode the It takes console input and, if the input starts with a lower case, uppercases it and vice versa. Whether to upper case or lower case the input is conveyed in a header 'type'. -Run from your favorite IDE, or from the command line `./gradlew :dynamic-tcp-client:run`. +Run from your favorite IDE, or from the command line `./gradlew :tcp-with-headers:run`. Here is an example run... From 23cd0b8f84c81e4d46ded4ade4595345378bd32d Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 29 Apr 2020 15:01:55 -0400 Subject: [PATCH 233/356] Upgrade dependencies --- build.gradle | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 451c0201e..db405cd7b 100644 --- a/build.gradle +++ b/build.gradle @@ -170,7 +170,7 @@ subprojects { subproject -> } ext { - activeMqVersion = '5.15.11' + activeMqVersion = '5.15.12' apacheSshdVersion = '2.4.0' aspectjVersion = '1.9.5' commonsDigesterVersion = '2.0' @@ -182,11 +182,11 @@ subprojects { subproject -> c3p0Version = '0.9.1.2' derbyVersion = '10.14.2.0' hamcrestVersion = '1.3' - hibernateVersion = '5.4.11.Final' + hibernateVersion = '5.4.13.Final' hibernateValidatorVersion = '6.1.2.Final' ftpServerVersion = '1.1.1' flexjsonVersion = '2.0' - groovyVersion = '2.5.8' + groovyVersion = '2.5.10' hsqldbVersion = '2.5.0' h2Version = '1.4.200' jacksonVersion = '2.10.3' @@ -202,21 +202,21 @@ subprojects { subproject -> jstlVersion = '1.2' junitVersion = '4.12' jythonVersion = '2.7.0' - log4jVersion = '2.12.1' + log4jVersion = '2.13.2' mockitoVersion = '3.2.4' - mongoDriverVersion = '4.0.1' + mongoDriverVersion = '4.0.2' openJpaVersion = '2.4.0' oracleDriverVersion = '11.2.0.3' postgresVersion = '42.2.9' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' springCloudVersion ='Hoxton.SR3' - springIntegrationVersion = '5.3.0.BUILD-SNAPSHOT' - springIntegrationKafkaVersion = '3.3.0.BUILD-SNAPSHOT' + springIntegrationVersion = '5.3.0.RC1' + springIntegrationKafkaVersion = '3.3.0.RC1' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.5.0.BUILD-SNAPSHOT' - springVersion = '5.2.5.RELEASE' + springKafkaVersion = '2.5.0.RC1' + springVersion = '5.2.6.RELEASE' springSecurityVersion = '5.3.1.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.13.0' From 18f3fcf9121c192eafd42449f05d04c2c8fff96d Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 14 May 2020 15:15:47 -0400 Subject: [PATCH 234/356] Upgrade dependencies --- advanced/advanced-testing-examples/pom.xml | 6 +++--- advanced/dynamic-ftp/pom.xml | 6 +++--- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 8 ++++---- applications/cafe/cafe-amqp/pom.xml | 6 +++--- applications/cafe/cafe-jms/pom.xml | 10 +++++----- applications/cafe/cafe-si/pom.xml | 6 +++--- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 6 +++--- applications/loanshark/pom.xml | 8 ++++---- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 6 +++--- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 6 +++--- basic/enricher/pom.xml | 6 +++--- basic/feed/pom.xml | 6 +++--- basic/file/pom.xml | 6 +++--- basic/ftp/pom.xml | 6 +++--- basic/helloworld/pom.xml | 6 +++--- basic/http/pom.xml | 6 +++--- basic/jdbc/pom.xml | 6 +++--- basic/jms/pom.xml | 10 +++++----- basic/jmx/pom.xml | 6 +++--- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 10 +++++----- basic/mail/pom.xml | 6 +++--- basic/mongodb/pom.xml | 8 ++++---- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 6 +++--- basic/quote/pom.xml | 6 +++--- basic/sftp/pom.xml | 6 +++--- basic/splunk/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 6 +++--- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 6 +++--- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 6 +++--- basic/twitter/pom.xml | 6 +++--- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 6 +++--- basic/ws-outbound-gateway/pom.xml | 6 +++--- basic/xml/pom.xml | 6 +++--- basic/xmpp/pom.xml | 6 +++--- build.gradle | 8 ++++---- dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 8 ++++---- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 6 +++--- intermediate/dynamic-poller/pom.xml | 6 +++--- intermediate/errorhandling/pom.xml | 6 +++--- intermediate/file-processing/pom.xml | 6 +++--- intermediate/mail-attachments/pom.xml | 6 +++--- intermediate/monitoring/pom.xml | 6 +++--- intermediate/multipart-http/pom.xml | 6 +++--- intermediate/rest-http/pom.xml | 10 +++++----- intermediate/retry-and-more/pom.xml | 6 +++--- intermediate/splitter-aggregator-reaper/pom.xml | 6 +++--- intermediate/stored-procedures-derby/pom.xml | 6 +++--- intermediate/stored-procedures-ms/pom.xml | 6 +++--- intermediate/stored-procedures-oracle/pom.xml | 6 +++--- intermediate/stored-procedures-postgresql/pom.xml | 6 +++--- intermediate/tcp-client-server-multiplex/pom.xml | 6 +++--- intermediate/testcontainers-rabbitmq/pom.xml | 4 ++-- intermediate/travel/pom.xml | 6 +++--- intermediate/tx-synch/pom.xml | 6 +++--- 66 files changed, 197 insertions(+), 197 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 07ed6cb33..e074a7542 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -92,7 +92,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index bdde3b632..356478722 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 395eda957..3bc21cec7 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 7fbc39fa1..ea6cda73d 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -126,7 +126,7 @@ org.codehaus.groovy groovy-all - 2.5.8 + 2.5.10 compile @@ -138,7 +138,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -227,14 +227,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index d541204ac..8fb24ff5f 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -81,7 +81,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index f953e6564..29f8ab267 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -70,7 +70,7 @@ org.apache.activemq activemq-broker - 5.15.11 + 5.15.12 compile @@ -82,7 +82,7 @@ org.apache.activemq activemq-kahadb-store - 5.15.11 + 5.15.12 compile @@ -121,7 +121,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 38abacbf1..993a6d20f 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -80,7 +80,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -169,14 +169,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 4fd46c47e..af44440cb 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -256,14 +256,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index b2362301d..a77a5ff94 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 16480cfde..d9ac040d9 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -302,7 +302,7 @@ org.hibernate hibernate-entitymanager - 5.4.11.Final + 5.4.13.Final compile @@ -338,7 +338,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 runtime @@ -451,14 +451,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index cbe801779..158a6e583 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 9151a1cfc..1d4833bbd 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -80,7 +80,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index bd762bf9d..980cea7b1 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -221,14 +221,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 37a95e606..c355835c6 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 365e98b26..a66632672 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -81,7 +81,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 66d474080..fc2c40265 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 22947cfef..c2c8e6a60 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 740b2e4ae..44cd95809 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -172,7 +172,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 test @@ -217,14 +217,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 8cd56ac9b..67cb4944a 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 86d5cc7fb..3c65f7c05 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -139,7 +139,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -228,14 +228,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 6e935f219..51556a60b 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -81,7 +81,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index d608bcd53..1146a89e7 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -92,7 +92,7 @@ org.apache.activemq activemq-broker - 5.15.11 + 5.15.12 compile @@ -104,7 +104,7 @@ org.apache.activemq activemq-kahadb-store - 5.15.11 + 5.15.12 compile @@ -120,7 +120,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -220,14 +220,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index e29e88e3d..2b218bb15 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -80,7 +80,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -169,14 +169,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index c77cf1c13..b70d10a44 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -223,14 +223,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index b58478c64..7107ee6c1 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -74,7 +74,7 @@ org.springframework.integration spring-integration-kafka - 3.3.0.BUILD-SNAPSHOT + 3.3.0.RELEASE compile @@ -101,7 +101,7 @@ org.springframework.kafka spring-kafka - 2.5.0.BUILD-SNAPSHOT + 2.5.0.RELEASE compile @@ -113,7 +113,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -228,14 +228,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 38b6e40df..f65d2103f 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -104,7 +104,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -193,14 +193,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 8a2f39f52..9af593c00 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -81,7 +81,7 @@ org.mongodb mongodb-driver-sync - 4.0.1 + 4.0.2 compile @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index c6fb0deab..2604dbf66 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 6dc663a5e..0ad26188b 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 1aad34391..730ffeaec 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index b42687c0d..51743a9a1 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 416c493fe..eaa5966f4 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 6f9373dbc..fc39419b6 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -92,7 +92,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 runtime @@ -193,14 +193,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 3c9b1672d..540f548a9 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index eb3f9fcc7..6003a74b7 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -92,7 +92,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index c97fa94e4..d29457d0f 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index e5db531f7..43f44f36a 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -102,7 +102,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -202,14 +202,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 0e5647b27..6064ee144 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -70,7 +70,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 96e6fff4e..519f5732a 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 152f758c9..4bd1df547 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -91,7 +91,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index f2fdd49f7..f4cd9c821 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -80,7 +80,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -169,14 +169,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 33b07f68a..945864bba 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index d025a3416..be3b57662 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/build.gradle b/build.gradle index db405cd7b..e549a087f 100644 --- a/build.gradle +++ b/build.gradle @@ -211,13 +211,13 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' springCloudVersion ='Hoxton.SR3' - springIntegrationVersion = '5.3.0.RC1' - springIntegrationKafkaVersion = '3.3.0.RC1' + springIntegrationVersion = '5.3.0.RELEASE' + springIntegrationKafkaVersion = '3.3.0.RELEASE' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.5.0.RC1' + springKafkaVersion = '2.5.0.RELEASE' springVersion = '5.2.6.RELEASE' - springSecurityVersion = '5.3.1.RELEASE' + springSecurityVersion = '5.3.2.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.13.0' tilesJspVersion = '2.2.1' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 82b6c5fdd..b68df0d68 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index aef61c48b..535b1108b 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -85,7 +85,7 @@ org.springframework.integration spring-integration-kafka - 3.3.0.BUILD-SNAPSHOT + 3.3.0.RELEASE compile @@ -97,7 +97,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -212,14 +212,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 7aa9920e7..9f9883a60 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -133,14 +133,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 97422b77f..e0965d722 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -269,14 +269,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 0852f2fba..6874214f2 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 7bdc3020c..95d5d7620 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 533189385..bdae159bb 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 3836221d7..55c1b36b3 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index a9914336c..e04860ada 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -116,7 +116,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -228,14 +228,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index cd77006b9..b903c7f32 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -115,7 +115,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 4edb4c196..316472b3f 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -115,7 +115,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index e98202d6d..a2540d6fa 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -146,7 +146,7 @@ org.springframework.security spring-security-web - 5.3.1.RELEASE + 5.3.2.RELEASE compile @@ -158,7 +158,7 @@ org.springframework.security spring-security-config - 5.3.1.RELEASE + 5.3.2.RELEASE compile @@ -170,7 +170,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -259,14 +259,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index c9d19118c..e4b354fbd 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -130,7 +130,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -191,14 +191,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 7d1153d57..1b0f73bf5 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -81,7 +81,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index b202b1510..275df8a81 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -81,7 +81,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index cdcfd0daa..9a484b6e5 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -93,7 +93,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -182,14 +182,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 60c1e08c8..8809d2228 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 7ec146c2f..804869e44 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -105,7 +105,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 6021ccc9c..2d1e23455 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -169,14 +169,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 86f448389..7efb6846f 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -267,14 +267,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 590c07b14..751a60183 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -91,7 +91,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 356d41a30..9af935fbf 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -92,7 +92,7 @@ org.apache.logging.log4j log4j-core - 2.12.1 + 2.13.2 compile @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.5.RELEASE + 5.2.6.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE import pom From 8a83eb23dd1c24495591330a61332fb3b08f2d2c Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 2 Jun 2020 16:13:25 -0400 Subject: [PATCH 235/356] Add TCP Bi-Directional Async Sample * Add a second client and address PR comments. --- build.gradle | 28 +++ gradle.properties | 4 +- .../tcp-async-bi-directional/.gitignore | 31 +++ .../tcp-async-bi-directional/README.md | 6 + intermediate/tcp-async-bi-directional/pom.xml | 215 ++++++++++++++++++ .../samples/tcpasyncbi/SampleProperties.java | 41 ++++ .../TcpAsyncBiDirectionalApplication.java | 146 ++++++++++++ .../src/main/resources/application.yml | 5 + ...TcpAsyncBiDirectionalApplicationTests.java | 87 +++++++ 9 files changed, 561 insertions(+), 2 deletions(-) create mode 100644 intermediate/tcp-async-bi-directional/.gitignore create mode 100644 intermediate/tcp-async-bi-directional/README.md create mode 100644 intermediate/tcp-async-bi-directional/pom.xml create mode 100644 intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/SampleProperties.java create mode 100644 intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java create mode 100644 intermediate/tcp-async-bi-directional/src/main/resources/application.yml create mode 100644 intermediate/tcp-async-bi-directional/src/test/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplicationTests.java diff --git a/build.gradle b/build.gradle index e549a087f..620155be7 100644 --- a/build.gradle +++ b/build.gradle @@ -1301,6 +1301,34 @@ project('stored-procedures-postgresql') { } } +project('tcp-async-bi-directional') { + description = 'Bi-Directional TCP Sample' + + apply plugin: 'org.springframework.boot' + + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-ip" + + testCompile 'org.springframework.boot:spring-boot-starter-test' + testCompile "org.springframework.integration:spring-integration-test" + } + + bootRun { + main = 'org.springframework.integration.samples.tcpasyncbi.TcpAsyncBiDirectionalApplication' + } + + task run(type: JavaExec) { + main 'org.springframework.integration.samples.tcpasyncbi.TcpAsyncBiDirectionalApplication' + classpath = sourceSets.main.runtimeClasspath + } + + test { + useJUnitPlatform() + } + +} + project('tcp-client-server-multiplex') { description = 'TCP Client Server Multiplexing Sample' diff --git a/gradle.properties b/gradle.properties index e88ed83f1..16bc4d5b0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -version=5.3.0.BUILD-SNAPSHOT -springBootVersion=2.3.0.BUILD-SNAPSHOT +version=5.3.0.RELEASE +springBootVersion=2.3.0.RELEASE org.gradle.jvmargs=-Xmx1536m diff --git a/intermediate/tcp-async-bi-directional/.gitignore b/intermediate/tcp-async-bi-directional/.gitignore new file mode 100644 index 000000000..a2a3040aa --- /dev/null +++ b/intermediate/tcp-async-bi-directional/.gitignore @@ -0,0 +1,31 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ + +### VS Code ### +.vscode/ diff --git a/intermediate/tcp-async-bi-directional/README.md b/intermediate/tcp-async-bi-directional/README.md new file mode 100644 index 000000000..7f7fd059d --- /dev/null +++ b/intermediate/tcp-async-bi-directional/README.md @@ -0,0 +1,6 @@ +TCP Async Bi-Directional Sample +================================== + +If this is your first experience with the spring-integration-ip module, start with the **tcp-client-server** project in the basic folder. + +This sample demonstrates asynchronous, arbitrary bi-directional communication between 2 peers. diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml new file mode 100644 index 000000000..b70458070 --- /dev/null +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -0,0 +1,215 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.3.0.RELEASE + + org.springframework.integration.samples + tcp-async-bi-directional + 5.3.0.RELEASE + Bi-Directional TCP Sample + Bi-Directional TCP Sample + https://projects.spring.io/spring-integration + + SpringIO + https://spring.io + + + + The Apache Software License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + abilan + Artem Bilan + abilan@pivotal.io + + project lead + + + + garyrussell + Gary Russell + grussell@pivotal.io + + lead emeritus + + + + markfisher + Mark Fisher + mfisher@pivotal.io + + project founder and lead emeritus + + + + ghillert + Gunnar Hillert + ghillert@pivotal.io + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + + org.springframework.boot + spring-boot-starter-integration + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + org.springframework.integration + spring-integration-ip + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + junit + junit + 4.12 + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + * + org.hamcrest + + + + + org.hamcrest + hamcrest-all + 1.3 + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + org.mockito + mockito-core + 3.2.4 + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + * + org.hamcrest + + + + + org.springframework + spring-test + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + org.springframework.boot + spring-boot-starter-test + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + org.springframework.integration + spring-integration-test + test + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/libs-milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/libs-snapshot + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + org.springframework.boot + spring-boot-dependencies + 2.3.0.RELEASE + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.10.3 + import + pom + + + org.springframework + spring-framework-bom + 5.2.6.RELEASE + import + pom + + + org.springframework.integration + spring-integration-bom + 5.3.0.RELEASE + import + pom + + + + diff --git a/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/SampleProperties.java b/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/SampleProperties.java new file mode 100644 index 000000000..2224e6ca7 --- /dev/null +++ b/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/SampleProperties.java @@ -0,0 +1,41 @@ +/* + * Copyright 2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.tcpasyncbi; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +/** + * Properties for the sample. + * + * @author Gary Russell + * @since 5.3 + * + */ +@ConfigurationProperties("tcp") +public class SampleProperties { + + private int serverPort; + + public int getServerPort() { + return this.serverPort; + } + + public void setServerPort(int serverPort) { + this.serverPort = serverPort; + } + +} diff --git a/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java b/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java new file mode 100644 index 000000000..44cfbe712 --- /dev/null +++ b/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java @@ -0,0 +1,146 @@ +/* + * Copyright 2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.tcpasyncbi; + +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.event.EventListener; +import org.springframework.integration.dsl.IntegrationFlow; +import org.springframework.integration.dsl.IntegrationFlows; +import org.springframework.integration.dsl.Pollers; +import org.springframework.integration.dsl.Transformers; +import org.springframework.integration.ip.IpHeaders; +import org.springframework.integration.ip.dsl.Tcp; +import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; +import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; +import org.springframework.integration.ip.tcp.connection.TcpConnectionCloseEvent; +import org.springframework.integration.ip.tcp.connection.TcpConnectionOpenEvent; + +/** + * Demonstrates independent bi-directional communication between peers. + * One side opens the connection and they proceed to send messages to each + * other on different schedules. + * There are two client instances. + * + * @author Gary Russell + * @since 5.3 + * + */ +@SpringBootApplication +@EnableConfigurationProperties(SampleProperties.class) +public class TcpAsyncBiDirectionalApplication { + + public static void main(String[] args) { + SpringApplication.run(TcpAsyncBiDirectionalApplication.class, args); + } + +} + +@Configuration +class ClientPeer { + + @Bean + public AbstractClientConnectionFactory client1(SampleProperties properties) { + return Tcp.netClient("localhost", properties.getServerPort()).get(); + } + + @Bean + public IntegrationFlow client1Out(AbstractClientConnectionFactory client1) { + return IntegrationFlows.from(() -> "Hello from client1", e -> e.id("client1Adapter") + .poller(Pollers.fixedDelay(3000))) + .handle(Tcp.outboundAdapter(client1)) + .get(); + } + + @Bean + public IntegrationFlow client1In(AbstractClientConnectionFactory client1) { + return IntegrationFlows.from(Tcp.inboundAdapter(client1)) + .transform(Transformers.objectToString()) + .log(msg -> "client1: " + msg.getPayload()) + .get(); + } + + @Bean + public AbstractClientConnectionFactory client2(SampleProperties properties) { + return Tcp.netClient("localhost", properties.getServerPort()).get(); + } + + @Bean + public IntegrationFlow client2Out(AbstractClientConnectionFactory client2) { + return IntegrationFlows.from(() -> "Hello from client2", e -> e.id("client2Adapter") + .poller(Pollers.fixedDelay(2000))) + .handle(Tcp.outboundAdapter(client2)) + .get(); + } + + @Bean + public IntegrationFlow client2In(AbstractClientConnectionFactory client2) { + return IntegrationFlows.from(Tcp.inboundAdapter(client2)) + .transform(Transformers.objectToString()) + .log(msg -> "client2: " + msg.getPayload()) + .get(); + } + +} + +@Configuration +class ServerPeer { + + private final Set clients = ConcurrentHashMap.newKeySet(); + + @Bean + public AbstractServerConnectionFactory server(SampleProperties properties) { + return Tcp.netServer(properties.getServerPort()).get(); + } + + @Bean + public IntegrationFlow serverIn(AbstractServerConnectionFactory server) { + return IntegrationFlows.from(Tcp.inboundAdapter(server)) + .transform(Transformers.objectToString()) + .log(msg -> "server: " + msg.getPayload()) + .get(); + } + + @Bean + public IntegrationFlow serverOut(AbstractServerConnectionFactory server) { + return IntegrationFlows.from(() -> "seed", e -> e.poller(Pollers.fixedDelay(5000))) + .split(this.clients, "iterator") + .enrichHeaders(h -> h.headerExpression(IpHeaders.CONNECTION_ID, "payload")) + .transform(p -> "Hello from server") + .handle(Tcp.outboundAdapter(server)) + .get(); + } + + @EventListener + public void open(TcpConnectionOpenEvent event) { + if (event.getConnectionFactoryName().equals("server")) { + this.clients.add(event.getConnectionId()); + } + } + + @EventListener + public void close(TcpConnectionCloseEvent event) { + this.clients.remove(event.getConnectionId()); + } + +} diff --git a/intermediate/tcp-async-bi-directional/src/main/resources/application.yml b/intermediate/tcp-async-bi-directional/src/main/resources/application.yml new file mode 100644 index 000000000..71da36339 --- /dev/null +++ b/intermediate/tcp-async-bi-directional/src/main/resources/application.yml @@ -0,0 +1,5 @@ +tcp: + server-port: 1234 +#logging: +# level: +# org.springframework.integration: debug diff --git a/intermediate/tcp-async-bi-directional/src/test/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplicationTests.java b/intermediate/tcp-async-bi-directional/src/test/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplicationTests.java new file mode 100644 index 000000000..d08fe95bb --- /dev/null +++ b/intermediate/tcp-async-bi-directional/src/test/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplicationTests.java @@ -0,0 +1,87 @@ +package org.springframework.integration.samples.tcpasyncbi; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +import org.junit.jupiter.api.Test; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.integration.channel.AbstractMessageChannel; +import org.springframework.integration.endpoint.SourcePollingChannelAdapter; +import org.springframework.integration.test.context.SpringIntegrationTest; +import org.springframework.lang.Nullable; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.support.ChannelInterceptor; + +@SpringBootTest +@SpringIntegrationTest(noAutoStartup = { "client1Adapter", "client2Adapter" }) +class TcpAsyncBiDirectionalApplicationTests { + + @Autowired + @Qualifier("client1Adapter") + private SourcePollingChannelAdapter adapter1; + + @Autowired + @Qualifier("client2Adapter") + private SourcePollingChannelAdapter adapter2; + + @Autowired + @Qualifier("client1In.channel#0") + private AbstractMessageChannel client1In; + + @Autowired + @Qualifier("client2In.channel#0") + private AbstractMessageChannel client2In; + + @Autowired + @Qualifier("serverIn.channel#0") + private AbstractMessageChannel serverIn; + + @Test + void testBothReceive() throws InterruptedException { + CountDownLatch serverLatch = new CountDownLatch(1); + CountDownLatch client1Latch = new CountDownLatch(1); + CountDownLatch client2Latch = new CountDownLatch(1); + this.serverIn.addInterceptor(new ChannelInterceptor() { + + @Override + @Nullable + public Message preSend(Message message, MessageChannel channel) { + serverLatch.countDown(); + return message; + } + + }); + this.client1In.addInterceptor(new ChannelInterceptor() { + + @Override + @Nullable + public Message preSend(Message message, MessageChannel channel) { + client1Latch.countDown(); + return message; + } + + }); + this.client2In.addInterceptor(new ChannelInterceptor() { + + @Override + @Nullable + public Message preSend(Message message, MessageChannel channel) { + client2Latch.countDown(); + return message; + } + + }); + this.adapter1.start(); + this.adapter2.start(); + assertThat(serverLatch.await(10, TimeUnit.SECONDS)).isTrue(); + assertThat(client1Latch.await(10, TimeUnit.SECONDS)).isTrue(); + assertThat(client2Latch.await(10, TimeUnit.SECONDS)).isTrue(); + } + +} From 239da188d3e817ab59204b8acc4bcf569e18c57c Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 2 Jun 2020 16:27:41 -0400 Subject: [PATCH 236/356] Fix copyright on test - unsaved local change --- .../TcpAsyncBiDirectionalApplicationTests.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/intermediate/tcp-async-bi-directional/src/test/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplicationTests.java b/intermediate/tcp-async-bi-directional/src/test/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplicationTests.java index d08fe95bb..7dea93403 100644 --- a/intermediate/tcp-async-bi-directional/src/test/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplicationTests.java +++ b/intermediate/tcp-async-bi-directional/src/test/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.integration.samples.tcpasyncbi; import static org.assertj.core.api.Assertions.assertThat; From defeb47ab8f6af855d41a6d1d676177497ed2568 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 2 Jun 2020 17:06:01 -0400 Subject: [PATCH 237/356] Add new sample to main README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7465d3179..42dee9d72 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,8 @@ This category targets developers who are already more familiar with the Spring I * **stored-procedures-ms** Provides an example of the stored procedure Outbound Gateway using *Microsoft SQL Server* * **stored-procedures-oracle** Provides an example of the stored procedure Outbound Gateway using *ORACLE XE* * **stored-procedures-postgresql** Provides an example of the stored procedure Outbound Gateway using *[PostgreSQL](https://www.postgresql.org/)* -* **tcp-client-server-multiplex** - Demonstrates the use of *Collaborating Channel Adapters* +* **tcp-async-bi-directional** - Demonstrates the use of *Collaborating Channel Adapters* for arbitrary async messaging (not request/reply) between peers. +* **tcp-client-server-multiplex** - Demonstrates the use of *Collaborating Channel Adapters* with multiple in-flight requests/responses over a single connection. * **travel** - More sophisticated example showing the retrieval of weather (SOAP Web Service) and traffic (HTTP Service) reports using real services * **tx-synch** Provides a sample demonstrating the use of transaction synchronization, renaming an input file to a different filename, depending on whether the transaction commits, or rolls back. From 85abae9647379967c7a75f2c482b0a2d3d7be859 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 23 Jun 2020 09:45:19 -0400 Subject: [PATCH 238/356] Upgrade dependencies --- build.gradle | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 620155be7..40c7b6c23 100644 --- a/build.gradle +++ b/build.gradle @@ -170,7 +170,7 @@ subprojects { subproject -> } ext { - activeMqVersion = '5.15.12' + activeMqVersion = '5.15.13' apacheSshdVersion = '2.4.0' aspectjVersion = '1.9.5' commonsDigesterVersion = '2.0' @@ -182,14 +182,14 @@ subprojects { subproject -> c3p0Version = '0.9.1.2' derbyVersion = '10.14.2.0' hamcrestVersion = '1.3' - hibernateVersion = '5.4.13.Final' + hibernateVersion = '5.4.17.Final' hibernateValidatorVersion = '6.1.2.Final' ftpServerVersion = '1.1.1' flexjsonVersion = '2.0' groovyVersion = '2.5.10' hsqldbVersion = '2.5.0' h2Version = '1.4.200' - jacksonVersion = '2.10.3' + jacksonVersion = '2.11.0' javaxInjectVersion = '1' javaxMailVersion = '1.6.2' jodaTimeVersion = '1.6' @@ -200,24 +200,24 @@ subprojects { subproject -> jpa21ApiVersion = '1.0.0.Final' jpaApiVersion = '2.0.0' jstlVersion = '1.2' - junitVersion = '4.12' + junitVersion = '4.13' jythonVersion = '2.7.0' - log4jVersion = '2.13.2' + log4jVersion = '2.13.3' mockitoVersion = '3.2.4' - mongoDriverVersion = '4.0.2' + mongoDriverVersion = '4.0.4' openJpaVersion = '2.4.0' oracleDriverVersion = '11.2.0.3' postgresVersion = '42.2.9' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' springCloudVersion ='Hoxton.SR3' - springIntegrationVersion = '5.3.0.RELEASE' + springIntegrationVersion = '5.3.1.RELEASE' springIntegrationKafkaVersion = '3.3.0.RELEASE' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.5.0.RELEASE' - springVersion = '5.2.6.RELEASE' - springSecurityVersion = '5.3.2.RELEASE' + springKafkaVersion = '2.5.2.RELEASE' + springVersion = '5.2.7.RELEASE' + springSecurityVersion = '5.3.3.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.13.0' tilesJspVersion = '2.2.1' From c72d642f35414089cfe33a2b32414ec0a869f8a6 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 23 Jun 2020 10:09:17 -0400 Subject: [PATCH 239/356] Fix Spring Boot Gradle plugin usage * Upgrade dependencies * Regenerate poms --- advanced/advanced-testing-examples/pom.xml | 12 +- advanced/dynamic-ftp/pom.xml | 12 +- advanced/dynamic-tcp-client/pom.xml | 14 +- advanced/pom.xml | 2 +- applications/cafe-scripted/pom.xml | 12 +- applications/cafe/cafe-amqp/pom.xml | 14 +- applications/cafe/cafe-jms/pom.xml | 18 +- applications/cafe/cafe-si/pom.xml | 12 +- applications/cafe/pom.xml | 2 +- applications/file-split-ftp/pom.xml | 14 +- applications/loan-broker/pom.xml | 12 +- applications/loanshark/pom.xml | 14 +- applications/pom.xml | 2 +- applications/stomp-chat/pom.xml | 14 +- basic/amqp/pom.xml | 12 +- basic/barrier/pom.xml | 14 +- basic/control-bus/pom.xml | 12 +- basic/enricher/pom.xml | 12 +- basic/feed/pom.xml | 12 +- basic/file/pom.xml | 12 +- basic/ftp/pom.xml | 12 +- basic/helloworld/pom.xml | 12 +- basic/http/pom.xml | 12 +- basic/jdbc/pom.xml | 12 +- basic/jms/pom.xml | 16 +- basic/jmx/pom.xml | 12 +- basic/jpa/pom.xml | 14 +- basic/kafka/pom.xml | 18 +- basic/mail/pom.xml | 12 +- basic/mongodb/pom.xml | 14 +- basic/mqtt/pom.xml | 14 +- basic/oddeven/pom.xml | 12 +- basic/pom.xml | 2 +- basic/quote/pom.xml | 12 +- basic/sftp/pom.xml | 12 +- basic/splunk/pom.xml | 14 +- basic/tcp-amqp/pom.xml | 12 +- basic/tcp-broadcast/pom.xml | 14 +- basic/tcp-client-server/pom.xml | 12 +- basic/tcp-with-headers/pom.xml | 14 +- basic/testing-examples/pom.xml | 12 +- basic/twitter/pom.xml | 12 +- basic/web-sockets/pom.xml | 14 +- basic/ws-inbound-gateway/pom.xml | 12 +- basic/ws-outbound-gateway/pom.xml | 12 +- basic/xml/pom.xml | 12 +- basic/xmpp/pom.xml | 12 +- build.gradle | 2180 +++++++++-------- dsl/cafe-dsl/pom.xml | 16 +- dsl/kafka-dsl/pom.xml | 16 +- dsl/pom.xml | 10 +- dsl/si4demo/pom.xml | 14 +- gradle.properties | 2 +- intermediate/async-gateway/pom.xml | 12 +- intermediate/dynamic-poller/pom.xml | 12 +- intermediate/errorhandling/pom.xml | 12 +- intermediate/file-processing/pom.xml | 12 +- intermediate/mail-attachments/pom.xml | 12 +- intermediate/monitoring/pom.xml | 12 +- intermediate/multipart-http/pom.xml | 12 +- intermediate/pom.xml | 2 +- intermediate/rest-http/pom.xml | 16 +- intermediate/retry-and-more/pom.xml | 12 +- .../splitter-aggregator-reaper/pom.xml | 12 +- intermediate/stored-procedures-derby/pom.xml | 12 +- intermediate/stored-procedures-ms/pom.xml | 12 +- intermediate/stored-procedures-oracle/pom.xml | 12 +- .../stored-procedures-postgresql/pom.xml | 12 +- intermediate/tcp-async-bi-directional/pom.xml | 12 +- .../tcp-client-server-multiplex/pom.xml | 12 +- intermediate/testcontainers-rabbitmq/pom.xml | 14 +- intermediate/travel/pom.xml | 12 +- intermediate/tx-synch/pom.xml | 12 +- 73 files changed, 1521 insertions(+), 1519 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index e074a7542..b25ccbe6d 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples advanced-testing-examples - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Advanced Testing Examples Advanced Testing Examples https://projects.spring.io/spring-integration @@ -92,7 +92,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -104,7 +104,7 @@ junit junit - 4.12 + 4.13 test @@ -174,21 +174,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 356478722..148e6ef7e 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-ftp - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Dynamic FTP Demo Dynamic FTP Demo https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 3bc21cec7..1508d2550 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE org.springframework.integration.samples dynamic-tcp-client - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Dynamic TCP Client Dynamic TCP Client https://projects.spring.io/spring-integration @@ -85,7 +85,7 @@ junit junit - 4.12 + 4.13 test @@ -174,28 +174,28 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE import pom com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/advanced/pom.xml b/advanced/pom.xml index fc4cde854..8eee9d06d 100644 --- a/advanced/pom.xml +++ b/advanced/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples advanced - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE https://projects.spring.io/spring-integration SpringIO diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index ea6cda73d..b3d244af7 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-scripted - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Cafe Sample (Scripted Implementation) Cafe Sample (Scripted Implementation) https://projects.spring.io/spring-integration @@ -138,7 +138,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -150,7 +150,7 @@ junit junit - 4.12 + 4.13 test @@ -220,21 +220,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 8fb24ff5f..9afafa348 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-amqp - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Cafe - With AMQP Message Broker Cafe - With AMQP Message Broker https://projects.spring.io/spring-integration @@ -58,7 +58,7 @@ org.springframework.integration.samples cafe-si - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE compile @@ -81,7 +81,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -93,7 +93,7 @@ junit junit - 4.12 + 4.13 test @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 29f8ab267..353faf609 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-jms - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Cafe - With JMS Message Broker Cafe - With JMS Message Broker https://projects.spring.io/spring-integration @@ -58,7 +58,7 @@ org.springframework.integration.samples cafe-si - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE compile @@ -70,7 +70,7 @@ org.apache.activemq activemq-broker - 5.15.12 + 5.15.13 compile @@ -82,7 +82,7 @@ org.apache.activemq activemq-kahadb-store - 5.15.12 + 5.15.13 compile @@ -121,7 +121,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -133,7 +133,7 @@ junit junit - 4.12 + 4.13 test @@ -203,21 +203,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 993a6d20f..3f2271852 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-si - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Cafe - Pure Spring Integration Cafe - Pure Spring Integration https://projects.spring.io/spring-integration @@ -80,7 +80,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -92,7 +92,7 @@ junit junit - 4.12 + 4.13 test @@ -162,21 +162,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index f5400f13d..621052fc7 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE https://projects.spring.io/spring-integration SpringIO diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index af44440cb..4b00e0b97 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE org.springframework.integration.samples file-split-ftp - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE File Split FTP File Split FTP https://projects.spring.io/spring-integration @@ -142,7 +142,7 @@ junit junit - 4.12 + 4.13 test @@ -242,28 +242,28 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE import pom com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index a77a5ff94..64e7a378a 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loan-broker - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Loan Broker Sample Loan Broker Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index d9ac040d9..85a7d9e46 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loanshark - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Loan Shark Sample Loan Shark Sample https://projects.spring.io/spring-integration @@ -302,7 +302,7 @@ org.hibernate hibernate-entitymanager - 5.4.13.Final + 5.4.17.Final compile @@ -338,7 +338,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 runtime @@ -374,7 +374,7 @@ junit junit - 4.12 + 4.13 test @@ -444,21 +444,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/applications/pom.xml b/applications/pom.xml index f510f3241..dd331756b 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples applications - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE https://projects.spring.io/spring-integration SpringIO diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 158a6e583..c4cab173a 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE org.springframework.integration.samples stomp-chat - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Web Sockets Stomp Chat Sample Web Sockets Stomp Chat Sample https://projects.spring.io/spring-integration @@ -107,7 +107,7 @@ junit junit - 4.12 + 4.13 test @@ -196,28 +196,28 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE import pom com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 1d4833bbd..6e1d45d76 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples amqp - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE AMQP Basic Sample AMQP Basic Sample https://projects.spring.io/spring-integration @@ -80,7 +80,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -104,7 +104,7 @@ junit junit - 4.12 + 4.13 test @@ -174,21 +174,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 980cea7b1..2b90e30d7 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE org.springframework.integration.samples barrier - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Barrier Sample Barrier Sample https://projects.spring.io/spring-integration @@ -118,7 +118,7 @@ junit junit - 4.12 + 4.13 test @@ -207,28 +207,28 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE import pom com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index c355835c6..ce935e6c1 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples control-bus - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Control Bus Basic Sample Control Bus Basic Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index a66632672..c159f8e12 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples enricher - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Enricher Basic Sample Enricher Basic Sample https://projects.spring.io/spring-integration @@ -81,7 +81,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -93,7 +93,7 @@ junit junit - 4.12 + 4.13 test @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index fc2c40265..6c2202bd3 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples feed - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Feed (RSS/ATOM) Basic Sample Feed (RSS/ATOM) Basic Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index c2c8e6a60..cd45801ab 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE File Copy Basic Sample File Copy Basic Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 44cd95809..620486577 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ftp - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE FTP Basic Sample FTP Basic Sample https://projects.spring.io/spring-integration @@ -117,7 +117,7 @@ junit junit - 4.12 + 4.13 test @@ -172,7 +172,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 test @@ -210,21 +210,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 67cb4944a..9874fdb75 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples helloworld - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Hello World Sample Hello World Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 3c65f7c05..e69a35df0 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples http - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE HTTP Sample HTTP Sample https://projects.spring.io/spring-integration @@ -139,7 +139,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -151,7 +151,7 @@ junit junit - 4.12 + 4.13 test @@ -221,21 +221,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 51556a60b..a725a2f66 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jdbc - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE JDBC Basic Sample JDBC Basic Sample https://projects.spring.io/spring-integration @@ -81,7 +81,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -93,7 +93,7 @@ junit junit - 4.12 + 4.13 test @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 1146a89e7..22b4a4abf 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jms - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE JMS Basic Sample JMS Basic Sample https://projects.spring.io/spring-integration @@ -92,7 +92,7 @@ org.apache.activemq activemq-broker - 5.15.12 + 5.15.13 compile @@ -104,7 +104,7 @@ org.apache.activemq activemq-kahadb-store - 5.15.12 + 5.15.13 compile @@ -120,7 +120,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -132,7 +132,7 @@ junit junit - 4.12 + 4.13 test @@ -213,21 +213,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 2b218bb15..e743ae7d5 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jmx - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE JMX Basic Sample JMX Basic Sample https://projects.spring.io/spring-integration @@ -80,7 +80,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -92,7 +92,7 @@ junit junit - 4.12 + 4.13 test @@ -162,21 +162,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index b70d10a44..adfaefe8e 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE org.springframework.integration.samples jpa - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE JPA Basic Sample JPA Basic Sample https://projects.spring.io/spring-integration @@ -120,7 +120,7 @@ junit junit - 4.12 + 4.13 test @@ -209,28 +209,28 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE import pom com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 7107ee6c1..ca0d14b0b 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE org.springframework.integration.samples kafka - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Apache Kafka Sample Apache Kafka Sample https://projects.spring.io/spring-integration @@ -101,7 +101,7 @@ org.springframework.kafka spring-kafka - 2.5.0.RELEASE + 2.5.2.RELEASE compile @@ -113,7 +113,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -125,7 +125,7 @@ junit junit - 4.12 + 4.13 test @@ -214,28 +214,28 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE import pom com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index f65d2103f..ad615588e 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Mail (IMAP + POP3) Sample Mail (IMAP + POP3) Sample https://projects.spring.io/spring-integration @@ -104,7 +104,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -116,7 +116,7 @@ junit junit - 4.12 + 4.13 test @@ -186,21 +186,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 9af593c00..3c807b0c5 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mongodb - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE MongoDb Basic Sample MongoDb Basic Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ org.mongodb mongodb-driver-sync - 4.0.2 + 4.0.4 compile @@ -93,7 +93,7 @@ junit junit - 4.12 + 4.13 test @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 2604dbf66..7d224fa27 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE org.springframework.integration.samples mqtt - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE MQTT Basic Sample MQTT Basic Sample https://projects.spring.io/spring-integration @@ -96,7 +96,7 @@ junit junit - 4.12 + 4.13 test @@ -196,28 +196,28 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE import pom com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 0ad26188b..0557e1be3 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples oddeven - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Odd-Even Sample Odd-Even Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/pom.xml b/basic/pom.xml index 22575b0f7..191fff615 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples basic - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE https://projects.spring.io/spring-integration SpringIO diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 730ffeaec..cf8c54706 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples quote - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Quote Sample Quote Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 51743a9a1..cbbc26af8 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples sftp - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE SFTP Basic Sample SFTP Basic Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index eaa5966f4..88872a586 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE org.springframework.integration.samples splunk - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Splunk Sample Splunk Sample https://projects.spring.io/spring-integration @@ -97,7 +97,7 @@ junit junit - 4.12 + 4.13 test @@ -186,28 +186,28 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE import pom com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index fc39419b6..7f00419ed 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-amqp - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE TCP-AMQP Basic Sample TCP-AMQP Basic Sample https://projects.spring.io/spring-integration @@ -92,7 +92,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 runtime @@ -116,7 +116,7 @@ junit junit - 4.12 + 4.13 test @@ -186,21 +186,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 540f548a9..45b3ad4f0 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE org.springframework.integration.samples tcp-broadcast - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE TCP Client Broadcast Sample TCP Client Broadcast Sample https://projects.spring.io/spring-integration @@ -96,7 +96,7 @@ junit junit - 4.12 + 4.13 test @@ -185,28 +185,28 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE import pom com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 6003a74b7..05c04ecc5 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE TCP Client Server Sample TCP Client Server Sample https://projects.spring.io/spring-integration @@ -92,7 +92,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -104,7 +104,7 @@ junit junit - 4.12 + 4.13 test @@ -174,21 +174,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index d29457d0f..f3e59210d 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE org.springframework.integration.samples tcp-with-headers - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE TCP Send/Receive with headers TCP Send/Receive with headers https://projects.spring.io/spring-integration @@ -96,7 +96,7 @@ junit junit - 4.12 + 4.13 test @@ -185,28 +185,28 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE import pom com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 43f44f36a..047ecd82d 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testing-examples - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Testing Examples Testing Examples https://projects.spring.io/spring-integration @@ -102,7 +102,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -114,7 +114,7 @@ junit junit - 4.12 + 4.13 test @@ -195,21 +195,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 6064ee144..0ed9b41ba 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples twitter - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Twitter Basic Sample Twitter Basic Sample https://projects.spring.io/spring-integration @@ -70,7 +70,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -82,7 +82,7 @@ junit junit - 4.12 + 4.13 test @@ -152,21 +152,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 519f5732a..1d88a3ac0 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE org.springframework.integration.samples web-sockets - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Web Sockets Basic Sample Web Sockets Basic Sample https://projects.spring.io/spring-integration @@ -85,7 +85,7 @@ junit junit - 4.12 + 4.13 test @@ -174,28 +174,28 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE import pom com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 4bd1df547..6a72d12b9 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-inbound-gateway - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE WS Inbound Gateway Sample WS Inbound Gateway Sample https://projects.spring.io/spring-integration @@ -91,7 +91,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -103,7 +103,7 @@ junit junit - 4.12 + 4.13 test @@ -173,21 +173,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index f4cd9c821..e7f8cc940 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-outbound-gateway - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE WS Outbound Gateway Sample WS Outbound Gateway Sample https://projects.spring.io/spring-integration @@ -80,7 +80,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -92,7 +92,7 @@ junit junit - 4.12 + 4.13 test @@ -162,21 +162,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 945864bba..853f94882 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xml - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE XML Sample XML Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index be3b57662..6d3f26465 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xmpp - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE XMPP Basic Sample XMPP Basic Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/build.gradle b/build.gradle index 40c7b6c23..6ed09521b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,15 @@ buildscript { - repositories { - maven { url 'https://repo.spring.io/libs-snapshot' } - } - dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:1.0.9.RELEASE' - classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" - classpath "gradle.plugin.org.gretty:gretty:2.3.1" - } + repositories { + maven { url 'https://repo.spring.io/libs-snapshot' } + } + dependencies { + classpath 'io.spring.gradle:dependency-management-plugin:1.0.9.RELEASE' + classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" + classpath "gradle.plugin.org.gretty:gretty:2.3.1" + } } plugins { - id "org.sonarqube" version "2.8" + id "org.sonarqube" version "2.8" } description = 'Spring Integration Samples' @@ -18,1511 +18,1513 @@ apply plugin: 'base' apply plugin: 'idea' ext { - linkHomepage = 'https://projects.spring.io/spring-integration' - linkCi = 'https://build.spring.io/browse/INTSAMPLES' - linkIssue = 'https://jira.spring.io/browse/INTSAMPLES' - linkScmUrl = 'https://github.com/spring-projects/spring-integration-samples' - linkScmConnection = 'scm:git:git://github.com/spring-projects/spring-integration-samples.git' - linkScmDevConnection = 'scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git' + linkHomepage = 'https://projects.spring.io/spring-integration' + linkCi = 'https://build.spring.io/browse/INTSAMPLES' + linkIssue = 'https://jira.spring.io/browse/INTSAMPLES' + linkScmUrl = 'https://github.com/spring-projects/spring-integration-samples' + linkScmConnection = 'scm:git:git://github.com/spring-projects/spring-integration-samples.git' + linkScmDevConnection = 'scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git' } allprojects { - group = 'org.springframework.integration.samples' + group = 'org.springframework.integration.samples' - repositories { - maven { url 'https://repo.spring.io/libs-snapshot' } - maven { url 'https://repo.spring.io/libs-milestone' } + repositories { + maven { url 'https://repo.spring.io/libs-snapshot' } + maven { url 'https://repo.spring.io/libs-milestone' } // maven { url 'https://repo.spring.io/libs-staging-local' } - } + } } subprojects { subproject -> - apply plugin: 'eclipse' - apply plugin: 'idea' - apply plugin: 'maven' - - task generatePom { - doLast { - pom { - project { - name = project.description - description = project.description - url = linkHomepage - - organization { - name = 'SpringIO' - url = 'https://spring.io' - } - - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'https://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } - } - - scm { - url = linkScmUrl - connection = 'scm:git:' + linkScmConnection - developerConnection = 'scm:git:' + linkScmDevConnection - } - - developers { - developer { - id = 'abilan' - name = 'Artem Bilan' - email = 'abilan@pivotal.io' - roles = ["project lead"] - } - developer { - id = 'garyrussell' - name = 'Gary Russell' - email = 'grussell@pivotal.io' - roles = ["lead emeritus"] - } - developer { - id = 'markfisher' - name = 'Mark Fisher' - email = 'mfisher@pivotal.io' - roles = ["project founder and lead emeritus"] - } - developer { - id = 'ghillert' - name = 'Gunnar Hillert' - email = 'ghillert@pivotal.io' - } - } - - if (subproject.plugins.hasPlugin('java')) { - repositories { - repository { - id = 'repo.spring.io.milestone' - name = 'Spring Framework Maven Milestone Repository' - url = 'https://repo.spring.io/libs-milestone' - } - repository { - id = 'repo.spring.io.snapshot' - name = 'Spring Framework Maven Snapshot Repository' - url = 'https://repo.spring.io/libs-snapshot' - } - } - } - - if (subproject.plugins.hasPlugin('org.springframework.boot')) { - parent { - groupId = 'org.springframework.boot' - artifactId = 'spring-boot-starter-parent' - version = springBootVersion - } - } - }.withXml { - if (subproject.plugins.hasPlugin('org.akhikhl.gretty')) { - asNode().appendNode('packaging', 'war') - asNode().appendNode('build') - .appendNode('plugins') - .appendNode('plugin').with { - appendNode('groupId', 'org.mortbay.jetty') - appendNode('artifactId', 'jetty-maven-plugin') - appendNode('version', '8.1.14.v20131031') - appendNode('configuration') - .appendNode('webAppConfig') - .appendNode('contextPath', '/' + subproject.name) - } - } - if (subproject.plugins.hasPlugin('org.springframework.boot')) { - asNode().appendNode('build').appendNode('plugins') - .appendNode('plugin').with { - appendNode('groupId', 'org.springframework.boot') - appendNode('artifactId', 'spring-boot-maven-plugin') - } - } - if (subproject.plugins.hasPlugin('io.spring.dependency-management')) { - dependencyManagement.pomConfigurer.configurePom(asNode()) - } - }.writeTo('pom.xml') - } - - } - } - - eclipse { - project { - natures += 'org.springframework.ide.eclipse.core.springnature' - } - } - - if (!(subproject.name in ['advanced', 'applications', 'basic', 'intermediate', 'cafe'])) { - - apply plugin: 'java' - apply plugin: 'jacoco' - apply plugin: 'io.spring.dependency-management' - - jacoco { - toolVersion = "0.8.5" - } - - compileJava { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 - } - - ext { - activeMqVersion = '5.15.13' - apacheSshdVersion = '2.4.0' - aspectjVersion = '1.9.5' - commonsDigesterVersion = '2.0' - commonsDbcpVersion = '1.2.2' - commonsFileUploadVersion = '1.4' - commonsIoVersion = '2.6' - commonsLangVersion = '2.6' - commonsPoolVersion = '1.5.4' - c3p0Version = '0.9.1.2' - derbyVersion = '10.14.2.0' - hamcrestVersion = '1.3' - hibernateVersion = '5.4.17.Final' - hibernateValidatorVersion = '6.1.2.Final' - ftpServerVersion = '1.1.1' - flexjsonVersion = '2.0' - groovyVersion = '2.5.10' - hsqldbVersion = '2.5.0' - h2Version = '1.4.200' - jacksonVersion = '2.11.0' - javaxInjectVersion = '1' - javaxMailVersion = '1.6.2' - jodaTimeVersion = '1.6' - jtaVersion = '1.1' - jtdsVersion = '1.2.6' - jmsApiVersion = '2.0.1' - jrubyVersion = '1.7.12' - jpa21ApiVersion = '1.0.0.Final' - jpaApiVersion = '2.0.0' - jstlVersion = '1.2' - junitVersion = '4.13' - jythonVersion = '2.7.0' - log4jVersion = '2.13.3' - mockitoVersion = '3.2.4' - mongoDriverVersion = '4.0.4' - openJpaVersion = '2.4.0' - oracleDriverVersion = '11.2.0.3' - postgresVersion = '42.2.9' - subethasmtpVersion = '1.2' - slf4jVersion = '1.7.25' - springCloudVersion ='Hoxton.SR3' - springIntegrationVersion = '5.3.1.RELEASE' - springIntegrationKafkaVersion = '3.3.0.RELEASE' - springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' - springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.5.2.RELEASE' - springVersion = '5.2.7.RELEASE' - springSecurityVersion = '5.3.3.RELEASE' - springWebFlowVersion = '2.3.3.RELEASE' - testcontainersVersion = '1.13.0' - tilesJspVersion = '2.2.1' - validationApiVersion = '1.0.0.GA' - } - - sourceSets.each { - it.resources.srcDirs = ["src/${it.name}/resources", "src/${it.name}/java"] - } - - dependencyManagement { - imports { - mavenBom "org.springframework.integration:spring-integration-bom:$springIntegrationVersion" - mavenBom "org.springframework:spring-framework-bom:$springVersion" - mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonVersion" - } - } - - // dependencies that are common across all java projects - dependencies { - testCompile("junit:junit:$junitVersion") { - exclude group: 'org.hamcrest' - } - testCompile "org.hamcrest:hamcrest-all:$hamcrestVersion" - testCompile("org.mockito:mockito-core:$mockitoVersion") { - exclude group: 'org.hamcrest' - } - testCompile "org.springframework:spring-test" - } - - configurations { - all*.exclude group: 'com.fasterxml.jackson.module', module: 'jackson-module-kotlin' - } - - // enable all compiler warnings; individual projects may customize further - ext.xLintArg = '-Xlint:all,-options,-processing' - [compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg] - - jacocoTestReport { - reports { - xml.enabled false - csv.enabled false - html.destination file("${buildDir}/reports/jacoco/html") - } - } - - test { - // suppress all console output during testing unless running `gradle -i` - logging.captureStandardOutput(LogLevel.INFO) - jacoco { - destinationFile = file("$buildDir/jacoco.exec") - } - } - - build.dependsOn jacocoTestReport - } - - task cleanTarget(type: Delete) { - delete 'target' - } - - clean.dependsOn cleanTarget + apply plugin: 'eclipse' + apply plugin: 'idea' + apply plugin: 'maven' + + task generatePom { + doLast { + pom { + project { + name = project.description + description = project.description + url = linkHomepage + + organization { + name = 'SpringIO' + url = 'https://spring.io' + } + + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'https://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' + } + } + + scm { + url = linkScmUrl + connection = 'scm:git:' + linkScmConnection + developerConnection = 'scm:git:' + linkScmDevConnection + } + + developers { + developer { + id = 'abilan' + name = 'Artem Bilan' + email = 'abilan@pivotal.io' + roles = ["project lead"] + } + developer { + id = 'garyrussell' + name = 'Gary Russell' + email = 'grussell@pivotal.io' + roles = ["lead emeritus"] + } + developer { + id = 'markfisher' + name = 'Mark Fisher' + email = 'mfisher@pivotal.io' + roles = ["project founder and lead emeritus"] + } + developer { + id = 'ghillert' + name = 'Gunnar Hillert' + email = 'ghillert@pivotal.io' + } + } + + if (subproject.plugins.hasPlugin('java')) { + repositories { + repository { + id = 'repo.spring.io.milestone' + name = 'Spring Framework Maven Milestone Repository' + url = 'https://repo.spring.io/libs-milestone' + } + repository { + id = 'repo.spring.io.snapshot' + name = 'Spring Framework Maven Snapshot Repository' + url = 'https://repo.spring.io/libs-snapshot' + } + } + } + + if (subproject.plugins.hasPlugin('org.springframework.boot')) { + parent { + groupId = 'org.springframework.boot' + artifactId = 'spring-boot-starter-parent' + version = springBootVersion + } + } + }.withXml { + if (subproject.plugins.hasPlugin('org.akhikhl.gretty')) { + asNode().appendNode('packaging', 'war') + asNode().appendNode('build') + .appendNode('plugins') + .appendNode('plugin').with { + appendNode('groupId', 'org.mortbay.jetty') + appendNode('artifactId', 'jetty-maven-plugin') + appendNode('version', '8.1.14.v20131031') + appendNode('configuration') + .appendNode('webAppConfig') + .appendNode('contextPath', '/' + subproject.name) + } + } + if (subproject.plugins.hasPlugin('org.springframework.boot')) { + asNode().appendNode('build').appendNode('plugins') + .appendNode('plugin').with { + appendNode('groupId', 'org.springframework.boot') + appendNode('artifactId', 'spring-boot-maven-plugin') + } + } + if (subproject.plugins.hasPlugin('io.spring.dependency-management')) { + dependencyManagement.pomConfigurer.configurePom(asNode()) + } + }.writeTo('pom.xml') + } + + } + } + + eclipse { + project { + natures += 'org.springframework.ide.eclipse.core.springnature' + } + } + + if (!(subproject.name in ['advanced', 'applications', 'basic', 'intermediate', 'cafe'])) { + + apply plugin: 'java' + apply plugin: 'jacoco' + apply plugin: 'io.spring.dependency-management' + + jacoco { + toolVersion = "0.8.5" + } + + compileJava { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + } + + ext { + activeMqVersion = '5.15.13' + apacheSshdVersion = '2.4.0' + aspectjVersion = '1.9.5' + commonsDigesterVersion = '2.0' + commonsDbcpVersion = '1.2.2' + commonsFileUploadVersion = '1.4' + commonsIoVersion = '2.6' + commonsLangVersion = '2.6' + commonsPoolVersion = '1.5.4' + c3p0Version = '0.9.1.2' + derbyVersion = '10.14.2.0' + hamcrestVersion = '1.3' + hibernateVersion = '5.4.17.Final' + hibernateValidatorVersion = '6.1.2.Final' + ftpServerVersion = '1.1.1' + flexjsonVersion = '2.0' + groovyVersion = '2.5.10' + hsqldbVersion = '2.5.0' + h2Version = '1.4.200' + jacksonVersion = '2.11.0' + javaxInjectVersion = '1' + javaxMailVersion = '1.6.2' + jodaTimeVersion = '1.6' + jtaVersion = '1.1' + jtdsVersion = '1.2.6' + jmsApiVersion = '2.0.1' + jrubyVersion = '1.7.12' + jpa21ApiVersion = '1.0.0.Final' + jpaApiVersion = '2.0.0' + jstlVersion = '1.2' + junitVersion = '4.13' + jythonVersion = '2.7.0' + log4jVersion = '2.13.3' + mockitoVersion = '3.2.4' + mongoDriverVersion = '4.0.4' + openJpaVersion = '2.4.0' + oracleDriverVersion = '11.2.0.3' + postgresVersion = '42.2.9' + subethasmtpVersion = '1.2' + slf4jVersion = '1.7.25' + springCloudVersion = 'Hoxton.SR3' + springIntegrationVersion = '5.3.1.RELEASE' + springIntegrationKafkaVersion = '3.3.0.RELEASE' + springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' + springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' + springKafkaVersion = '2.5.2.RELEASE' + springVersion = '5.2.7.RELEASE' + springSecurityVersion = '5.3.3.RELEASE' + springWebFlowVersion = '2.3.3.RELEASE' + testcontainersVersion = '1.13.0' + tilesJspVersion = '2.2.1' + validationApiVersion = '1.0.0.GA' + } + + sourceSets.each { + it.resources.srcDirs = ["src/${it.name}/resources", "src/${it.name}/java"] + } + + dependencyManagement { + imports { + mavenBom "org.springframework.integration:spring-integration-bom:$springIntegrationVersion" + mavenBom "org.springframework:spring-framework-bom:$springVersion" + mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonVersion" + } + } + + // dependencies that are common across all java projects + dependencies { + testCompile("junit:junit:$junitVersion") { + exclude group: 'org.hamcrest' + } + testCompile "org.hamcrest:hamcrest-all:$hamcrestVersion" + testCompile("org.mockito:mockito-core:$mockitoVersion") { + exclude group: 'org.hamcrest' + } + testCompile "org.springframework:spring-test" + } + + configurations { + all*.exclude group: 'com.fasterxml.jackson.module', module: 'jackson-module-kotlin' + } + + // enable all compiler warnings; individual projects may customize further + ext.xLintArg = '-Xlint:all,-options,-processing' + [compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg] + + jacocoTestReport { + reports { + xml.enabled false + csv.enabled false + html.destination file("${buildDir}/reports/jacoco/html") + } + } + + test { + // suppress all console output during testing unless running `gradle -i` + logging.captureStandardOutput(LogLevel.INFO) + jacoco { + destinationFile = file("$buildDir/jacoco.exec") + } + } + + build.dependsOn jacocoTestReport + } + + task cleanTarget(type: Delete) { + delete 'target' + } + + clean.dependsOn cleanTarget } project('advanced-testing-examples') { - description = 'Advanced Testing Examples' + description = 'Advanced Testing Examples' - dependencies { - compile "javax.jms:javax.jms-api:$jmsApiVersion" - compile "org.springframework.integration:spring-integration-jms" - compile "org.springframework.integration:spring-integration-groovy" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "javax.jms:javax.jms-api:$jmsApiVersion" + compile "org.springframework.integration:spring-integration-jms" + compile "org.springframework.integration:spring-integration-groovy" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('dynamic-ftp') { - description = 'Dynamic FTP Demo' + description = 'Dynamic FTP Demo' - dependencies { - compile "org.springframework.integration:spring-integration-ftp" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-ftp" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('cafe-si') { - description = 'Cafe - Pure Spring Integration' + description = 'Cafe - Pure Spring Integration' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.cafe.xml.CafeDemoApp' + mainClassName = 'org.springframework.integration.samples.cafe.xml.CafeDemoApp' - dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile 'com.fasterxml.jackson.core:jackson-databind' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-stream" + compile 'com.fasterxml.jackson.core:jackson-databind' + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('cafe-amqp') { - description = 'Cafe - With AMQP Message Broker' + description = 'Cafe - With AMQP Message Broker' - dependencies { - compile project(":cafe-si") - compile "org.springframework.integration:spring-integration-amqp" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile project(":cafe-si") + compile "org.springframework.integration:spring-integration-amqp" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('cafe-jms') { - description = 'Cafe - With JMS Message Broker' + description = 'Cafe - With JMS Message Broker' - dependencies { - compile project(":cafe-si") - compile "org.apache.activemq:activemq-broker:$activeMqVersion" - compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { - exclude group: "org.springframework" - } - compile "org.springframework.integration:spring-integration-jms" - compile "javax.jms:javax.jms-api:$jmsApiVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile project(":cafe-si") + compile "org.apache.activemq:activemq-broker:$activeMqVersion" + compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { + exclude group: "org.springframework" + } + compile "org.springframework.integration:spring-integration-jms" + compile "javax.jms:javax.jms-api:$jmsApiVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('cafe-scripted') { - description = 'Cafe Sample (Scripted Implementation)' - - dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-groovy" - compile "org.springframework.integration:spring-integration-rmi" - compile "org.springframework.integration:spring-integration-jmx" - compile "org.jruby:jruby:$jrubyVersion" - compile "org.python:jython-standalone:$jythonVersion" - compile "org.codehaus.groovy:groovy-all:$groovyVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } - - task runCafeDemoApp(type: JavaExec) { - main 'org.springframework.integration.samples.cafe.demo.CafeDemoApp' - args project.hasProperty('lang') ? project.lang : '' - classpath = sourceSets.main.runtimeClasspath - } - - task runControlBus(type: JavaExec) { - main 'org.springframework.integration.samples.cafe.demo.ControlBusMain' - classpath = sourceSets.main.runtimeClasspath - } + description = 'Cafe Sample (Scripted Implementation)' + + dependencies { + compile "org.springframework.integration:spring-integration-stream" + compile "org.springframework.integration:spring-integration-groovy" + compile "org.springframework.integration:spring-integration-rmi" + compile "org.springframework.integration:spring-integration-jmx" + compile "org.jruby:jruby:$jrubyVersion" + compile "org.python:jython-standalone:$jythonVersion" + compile "org.codehaus.groovy:groovy-all:$groovyVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } + + task runCafeDemoApp(type: JavaExec) { + main 'org.springframework.integration.samples.cafe.demo.CafeDemoApp' + args project.hasProperty('lang') ? project.lang : '' + classpath = sourceSets.main.runtimeClasspath + } + + task runControlBus(type: JavaExec) { + main 'org.springframework.integration.samples.cafe.demo.ControlBusMain' + classpath = sourceSets.main.runtimeClasspath + } } project('loan-broker') { - description = 'Loan Broker Sample' + description = 'Loan Broker Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.loanbroker.demo.LoanBrokerDemo' + mainClassName = 'org.springframework.integration.samples.loanbroker.demo.LoanBrokerDemo' - dependencies { - compile "org.springframework.integration:spring-integration-ip" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-ip" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - task runLoanBrokerSharkDetectorDemo(type: JavaExec) { - main 'org.springframework.integration.samples.loanbroker.demo.LoanBrokerSharkDetectorDemo' - classpath = sourceSets.main.runtimeClasspath - } + task runLoanBrokerSharkDetectorDemo(type: JavaExec) { + main 'org.springframework.integration.samples.loanbroker.demo.LoanBrokerSharkDetectorDemo' + classpath = sourceSets.main.runtimeClasspath + } } project('loanshark') { - description = 'Loan Shark Sample' - - apply plugin: 'war' - apply plugin: "org.gretty" - apply plugin: 'eclipse-wtp' - - dependencies { - compile "org.springframework.integration:spring-integration-ip" - compile "org.springframework:spring-webmvc" - compile "org.springframework:spring-orm" - compile "org.springframework:spring-aop" - compile "org.springframework:spring-aspects" - compile "org.aspectj:aspectjtools:$aspectjVersion" - compile "org.springframework:spring-jdbc" - compile "org.springframework:spring-tx" - compile "org.springframework:spring-context" - compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" - compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" - compile "commons-digester:commons-digester:$commonsDigesterVersion" - compile "commons-pool:commons-pool:$commonsPoolVersion" - compile "org.apache.tiles:tiles-jsp:$tilesJspVersion" - compile "joda-time:joda-time:$jodaTimeVersion" - compile "javax.transaction:jta:$jtaVersion" - compile "org.hsqldb:hsqldb:$hsqldbVersion" - compile "net.sf.flexjson:flexjson:$flexjsonVersion" - compile "javax.validation:validation-api:$validationApiVersion" - compile "org.hibernate:hibernate-validator:$hibernateValidatorVersion" - compile "org.eclipse.persistence:javax.persistence:$jpaApiVersion" - compile "org.hibernate:hibernate-entitymanager:$hibernateVersion" - compile "org.springframework.webflow:spring-js:$springWebFlowVersion" - compile "org.slf4j:slf4j-api:$slf4jVersion" - - runtime "org.apache.logging.log4j:log4j-core:$log4jVersion" - runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" - runtime "org.slf4j:jcl-over-slf4j:$slf4jVersion" - } + description = 'Loan Shark Sample' + + apply plugin: 'war' + apply plugin: "org.gretty" + apply plugin: 'eclipse-wtp' + + dependencies { + compile "org.springframework.integration:spring-integration-ip" + compile "org.springframework:spring-webmvc" + compile "org.springframework:spring-orm" + compile "org.springframework:spring-aop" + compile "org.springframework:spring-aspects" + compile "org.aspectj:aspectjtools:$aspectjVersion" + compile "org.springframework:spring-jdbc" + compile "org.springframework:spring-tx" + compile "org.springframework:spring-context" + compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" + compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" + compile "commons-digester:commons-digester:$commonsDigesterVersion" + compile "commons-pool:commons-pool:$commonsPoolVersion" + compile "org.apache.tiles:tiles-jsp:$tilesJspVersion" + compile "joda-time:joda-time:$jodaTimeVersion" + compile "javax.transaction:jta:$jtaVersion" + compile "org.hsqldb:hsqldb:$hsqldbVersion" + compile "net.sf.flexjson:flexjson:$flexjsonVersion" + compile "javax.validation:validation-api:$validationApiVersion" + compile "org.hibernate:hibernate-validator:$hibernateValidatorVersion" + compile "org.eclipse.persistence:javax.persistence:$jpaApiVersion" + compile "org.hibernate:hibernate-entitymanager:$hibernateVersion" + compile "org.springframework.webflow:spring-js:$springWebFlowVersion" + compile "org.slf4j:slf4j-api:$slf4jVersion" + + runtime "org.apache.logging.log4j:log4j-core:$log4jVersion" + runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" + runtime "org.slf4j:jcl-over-slf4j:$slf4jVersion" + } } project('amqp') { - description = 'AMQP Basic Sample' + description = 'AMQP Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-amqp" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - runtime "org.slf4j:slf4j-jcl:$slf4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-stream" + compile "org.springframework.integration:spring-integration-amqp" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + runtime "org.slf4j:slf4j-jcl:$slf4jVersion" + } - task runSimple(type: JavaExec) { - main 'org.springframework.integration.samples.amqp.SampleSimple' - classpath = sourceSets.main.runtimeClasspath - standardInput = System.in - // useful for debugging the GradleWorkerMain - // jvmArgs "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000" + task runSimple(type: JavaExec) { + main 'org.springframework.integration.samples.amqp.SampleSimple' + classpath = sourceSets.main.runtimeClasspath + standardInput = System.in + // useful for debugging the GradleWorkerMain + // jvmArgs "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000" - } + } - task runPubConfirmsReturns(type: JavaExec) { - main 'org.springframework.integration.samples.amqp.SamplePubConfirmsReturns' - classpath = sourceSets.main.runtimeClasspath - standardInput = System.in - // useful for debugging the GradleWorkerMain - // jvmArgs "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000" + task runPubConfirmsReturns(type: JavaExec) { + main 'org.springframework.integration.samples.amqp.SamplePubConfirmsReturns' + classpath = sourceSets.main.runtimeClasspath + standardInput = System.in + // useful for debugging the GradleWorkerMain + // jvmArgs "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000" - } + } } project('barrier') { - description = 'Barrier Sample' + description = 'Barrier Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.springframework.boot:spring-boot-starter-integration' - compile 'org.springframework.boot:spring-boot-starter-amqp' - compile "org.springframework.integration:spring-integration-amqp" - compile "org.springframework.integration:spring-integration-http" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-web' + compile 'org.springframework.boot:spring-boot-starter-integration' + compile 'org.springframework.boot:spring-boot-starter-amqp' + compile "org.springframework.integration:spring-integration-amqp" + compile "org.springframework.integration:spring-integration-http" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - bootRun { - main = 'org.springframework.integration.samples.barrier.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.barrier.Application' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.barrier.Application' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.barrier.Application' + classpath = sourceSets.main.runtimeClasspath + } } project('control-bus') { - description = 'Control Bus Basic Sample' + description = 'Control Bus Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-core" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-core" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('enricher') { - description = 'Enricher Basic Sample' + description = 'Enricher Basic Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.enricher.Main' + mainClassName = 'org.springframework.integration.samples.enricher.Main' - dependencies { - compile "org.springframework.integration:spring-integration-core" - compile "com.h2database:h2:$h2Version" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-core" + compile "com.h2database:h2:$h2Version" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('feed') { - description = 'Feed (RSS/ATOM) Basic Sample' + description = 'Feed (RSS/ATOM) Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-feed" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-feed" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('file') { - description = 'File Copy Basic Sample' + description = 'File Copy Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-file" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-file" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('ftp') { - description = 'FTP Basic Sample' + description = 'FTP Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-ftp" - compile "commons-io:commons-io:$commonsIoVersion" - compile "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" - compile "org.slf4j:slf4j-api:$slf4jVersion" + dependencies { + compile "org.springframework.integration:spring-integration-ftp" + compile "commons-io:commons-io:$commonsIoVersion" + compile "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" + compile "org.slf4j:slf4j-api:$slf4jVersion" - runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" + runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" - testCompile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" - } + testCompile "org.apache.logging.log4j:log4j-core:$log4jVersion" + testCompile "org.springframework.integration:spring-integration-test" + } - test { - include '**/TestSuite*' - } + test { + include '**/TestSuite*' + } } project('helloworld') { - description = 'Hello World Sample' + description = 'Hello World Sample' - dependencies { - compile "org.springframework.integration:spring-integration-core" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-core" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - task runHelloWorldApp(type: JavaExec) { - main 'org.springframework.integration.samples.helloworld.HelloWorldApp' - classpath = sourceSets.main.runtimeClasspath - } + task runHelloWorldApp(type: JavaExec) { + main 'org.springframework.integration.samples.helloworld.HelloWorldApp' + classpath = sourceSets.main.runtimeClasspath + } - task runPollerApp(type: JavaExec) { - main 'org.springframework.integration.samples.helloworld.PollerApp' - classpath = sourceSets.main.runtimeClasspath - } + task runPollerApp(type: JavaExec) { + main 'org.springframework.integration.samples.helloworld.PollerApp' + classpath = sourceSets.main.runtimeClasspath + } } project('http') { - description = 'HTTP Sample' + description = 'HTTP Sample' - apply plugin: 'war' - apply plugin: 'application' - apply plugin: "org.gretty" - apply plugin: 'eclipse-wtp' + apply plugin: 'war' + apply plugin: 'application' + apply plugin: "org.gretty" + apply plugin: 'eclipse-wtp' - mainClassName = 'org.springframework.integration.samples.http.HttpClientDemo' + mainClassName = 'org.springframework.integration.samples.http.HttpClientDemo' - dependencies { - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework.integration:spring-integration-mail" - compile "org.springframework:spring-webmvc" - compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" - compile "commons-io:commons-io:$commonsIoVersion" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework.integration:spring-integration-mail" + compile "org.springframework:spring-webmvc" + compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" + compile "commons-io:commons-io:$commonsIoVersion" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('splunk') { - description = 'Splunk Sample' + description = 'Splunk Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-core" - compile "org.springframework.integration:spring-integration-splunk:$springIntegrationSplunkVersion" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-core" + compile "org.springframework.integration:spring-integration-splunk:$springIntegrationSplunkVersion" + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - bootRun { - main = 'org.springframework.integration.samples.splunk.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.splunk.Application' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.splunk.Application' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.splunk.Application' + classpath = sourceSets.main.runtimeClasspath + } } project('kafka') { - description = 'Apache Kafka Sample' + description = 'Apache Kafka Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile ("org.springframework.integration:spring-integration-kafka:$springIntegrationKafkaVersion") { - exclude group: 'org.slf4j' - } - compile "org.springframework.integration:spring-integration-core" - compile "org.springframework.kafka:spring-kafka:$springKafkaVersion" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile("org.springframework.integration:spring-integration-kafka:$springIntegrationKafkaVersion") { + exclude group: 'org.slf4j' + } + compile "org.springframework.integration:spring-integration-core" + compile "org.springframework.kafka:spring-kafka:$springKafkaVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - bootRun { - main = 'org.springframework.integration.samples.kafka.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.kafka.Application' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.kafka.Application' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.kafka.Application' + classpath = sourceSets.main.runtimeClasspath + } } project('mqtt') { - description = 'MQTT Basic Sample' + description = 'MQTT Basic Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-mqtt" - testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile "org.springframework.integration:spring-integration-test" - } + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-stream" + compile "org.springframework.integration:spring-integration-mqtt" + testCompile 'org.springframework.boot:spring-boot-starter-test' + testCompile "org.springframework.integration:spring-integration-test" + } - bootRun { - main = 'org.springframework.integration.samples.mqtt.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.mqtt.Application' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.mqtt.Application' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.mqtt.Application' + classpath = sourceSets.main.runtimeClasspath + } - tasks.withType(JavaExec) { - standardInput = System.in - } + tasks.withType(JavaExec) { + standardInput = System.in + } } project('si4demo') { - description = 'Java Configuration/DSL Sample' + description = 'Java Configuration/DSL Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-mail" - compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework.integration:spring-integration-ip" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" - compile "com.rometools:rome:1.5.0" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-web' + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-mail" + compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework.integration:spring-integration-ip" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile "com.rometools:rome:1.5.0" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - bootRun { - main = 'org.springframework.integration.samples.si4demo.dsl.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.si4demo.dsl.Application' + } - tasks.withType(JavaExec) { - standardInput = System.in - } + tasks.withType(JavaExec) { + standardInput = System.in + } } project('cafe-dsl') { - description = 'Java DSL Cafe Sample' + description = 'Java DSL Cafe Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile project(":cafe-si") - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-core" + dependencies { + compile project(":cafe-si") + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-core" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - bootRun { - main = 'org.springframework.integration.samples.dsl.cafe.lambda.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.dsl.cafe.lambda.Application' + } - tasks.withType(JavaExec) { - standardInput = System.in - } + tasks.withType(JavaExec) { + standardInput = System.in + } } project('jdbc') { - description = 'JDBC Basic Sample' + description = 'JDBC Basic Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.jdbc.Main' + mainClassName = 'org.springframework.integration.samples.jdbc.Main' - dependencies { - compile "org.springframework.integration:spring-integration-jdbc" - compile "com.h2database:h2:$h2Version" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-jdbc" + compile "com.h2database:h2:$h2Version" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('jms') { - description = 'JMS Basic Sample' + description = 'JMS Basic Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.jms.Main' + mainClassName = 'org.springframework.integration.samples.jms.Main' - dependencies { - compile "javax.jms:javax.jms-api:$jmsApiVersion" - compile "org.springframework.integration:spring-integration-jms" - compile "org.springframework.integration:spring-integration-stream" - compile "org.apache.activemq:activemq-broker:$activeMqVersion" - compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { - exclude group: "org.springframework" - } - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + dependencies { + compile "javax.jms:javax.jms-api:$jmsApiVersion" + compile "org.springframework.integration:spring-integration-jms" + compile "org.springframework.integration:spring-integration-stream" + compile "org.apache.activemq:activemq-broker:$activeMqVersion" + compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { + exclude group: "org.springframework" + } + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" - } + testCompile "org.springframework.integration:spring-integration-test" + } } project('jmx') { - description = 'JMX Basic Sample' + description = 'JMX Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-jmx" - compile "org.springframework.integration:spring-integration-stream" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-jmx" + compile "org.springframework.integration:spring-integration-stream" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('jpa') { - description = 'JPA Basic Sample' + description = 'JPA Basic Sample' - apply plugin: 'application' - apply plugin: 'org.springframework.boot' + apply plugin: 'application' + apply plugin: 'org.springframework.boot' - mainClassName = 'org.springframework.integration.samples.jpa.Main' + mainClassName = 'org.springframework.integration.samples.jpa.Main' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-data-jpa' - compile "org.springframework.integration:spring-integration-jpa" - compile "com.h2database:h2:$h2Version" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-data-jpa' + compile "org.springframework.integration:spring-integration-jpa" + compile "com.h2database:h2:$h2Version" - runtime "org.springframework:spring-instrument" - runtime "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$jpa21ApiVersion" + runtime "org.springframework:spring-instrument" + runtime "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$jpa21ApiVersion" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - tasks.withType(JavaExec) { - standardInput = System.in - } + tasks.withType(JavaExec) { + standardInput = System.in + } } project('mail') { - description = 'Mail (IMAP + POP3) Sample' + description = 'Mail (IMAP + POP3) Sample' - dependencies { - compile "org.springframework.integration:spring-integration-mail" - compile "org.springframework:spring-context" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-mail" + compile "org.springframework:spring-context" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - task runGmailInboundPop3AdapterTestApp(type: JavaExec) { - main 'org.springframework.integration.samples.mail.imapidle.GmailInboundPop3AdapterTestApp' - classpath = sourceSets.main.runtimeClasspath - } + task runGmailInboundPop3AdapterTestApp(type: JavaExec) { + main 'org.springframework.integration.samples.mail.imapidle.GmailInboundPop3AdapterTestApp' + classpath = sourceSets.main.runtimeClasspath + } - task runGmailInboundImapIdleAdapterTestApp(type: JavaExec) { - main 'org.springframework.integration.samples.mail.imapidle.GmailInboundImapIdleAdapterTestApp' - classpath = sourceSets.main.runtimeClasspath - } + task runGmailInboundImapIdleAdapterTestApp(type: JavaExec) { + main 'org.springframework.integration.samples.mail.imapidle.GmailInboundImapIdleAdapterTestApp' + classpath = sourceSets.main.runtimeClasspath + } } project('mongodb') { - description = 'MongoDb Basic Sample' + description = 'MongoDb Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-mongodb" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - compile "org.mongodb:mongodb-driver-sync:$mongoDriverVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-mongodb" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + compile "org.mongodb:mongodb-driver-sync:$mongoDriverVersion" + } - task runMongoDbInboundAdapterDemo(type: JavaExec) { - main 'org.springframework.integration.samples.mongodb.inbound.MongoDbInboundAdapterDemo' - classpath = sourceSets.main.runtimeClasspath - } + task runMongoDbInboundAdapterDemo(type: JavaExec) { + main 'org.springframework.integration.samples.mongodb.inbound.MongoDbInboundAdapterDemo' + classpath = sourceSets.main.runtimeClasspath + } - task runMongoDbOutboundAdapterDemo(type: JavaExec) { - main 'org.springframework.integration.samples.mongodb.inbound.MongoDbOutboundAdapterDemo' - classpath = sourceSets.main.runtimeClasspath - } + task runMongoDbOutboundAdapterDemo(type: JavaExec) { + main 'org.springframework.integration.samples.mongodb.inbound.MongoDbOutboundAdapterDemo' + classpath = sourceSets.main.runtimeClasspath + } } project('oddeven') { - description = 'Odd-Even Sample' + description = 'Odd-Even Sample' - dependencies { - compile "org.springframework.integration:spring-integration-core" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-core" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - task runCronOddEvenDemo(type: JavaExec) { - main 'org.springframework.integration.samples.oddeven.CronOddEvenDemo' - classpath = sourceSets.main.runtimeClasspath - } + task runCronOddEvenDemo(type: JavaExec) { + main 'org.springframework.integration.samples.oddeven.CronOddEvenDemo' + classpath = sourceSets.main.runtimeClasspath + } - task runIntervalOddEvenDemoTestApp(type: JavaExec) { - main 'org.springframework.integration.samples.oddeven.IntervalOddEvenDemoTestApp' - classpath = sourceSets.main.runtimeClasspath - } + task runIntervalOddEvenDemoTestApp(type: JavaExec) { + main 'org.springframework.integration.samples.oddeven.IntervalOddEvenDemoTestApp' + classpath = sourceSets.main.runtimeClasspath + } } project('quote') { - description = 'Quote Sample' + description = 'Quote Sample' - dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-stream" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('sftp') { - description = 'SFTP Basic Sample' + description = 'SFTP Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-sftp" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.apache.sshd:sshd-sftp:$apacheSshdVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-sftp" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + testCompile "org.apache.sshd:sshd-sftp:$apacheSshdVersion" + } } project('tcp-amqp') { - description = 'TCP-AMQP Basic Sample' + description = 'TCP-AMQP Basic Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.tcpamqp.Main' + mainClassName = 'org.springframework.integration.samples.tcpamqp.Main' - dependencies { - compile "org.springframework.integration:spring-integration-amqp" - compile "org.springframework.integration:spring-integration-ip" - compile "org.slf4j:slf4j-api:$slf4jVersion" + dependencies { + compile "org.springframework.integration:spring-integration-amqp" + compile "org.springframework.integration:spring-integration-ip" + compile "org.slf4j:slf4j-api:$slf4jVersion" - runtime "org.apache.logging.log4j:log4j-core:$log4jVersion" - runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" - } + runtime "org.apache.logging.log4j:log4j-core:$log4jVersion" + runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" + } } project('tcp-broadcast') { - description = 'TCP Client Broadcast Sample' + description = 'TCP Client Broadcast Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ip" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-web' + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-ip" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - bootRun { - main = 'org.springframework.integration.samples.tcpbroadcast.TcpBroadcastApplication' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.tcpbroadcast.TcpBroadcastApplication' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.tcpbroadcast.TcpBroadcastApplication' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.tcpbroadcast.TcpBroadcastApplication' + classpath = sourceSets.main.runtimeClasspath + } } project('tcp-client-server') { - description = 'TCP Client Server Sample' + description = 'TCP Client Server Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.tcpclientserver.Main' + mainClassName = 'org.springframework.integration.samples.tcpclientserver.Main' - dependencies { - compile "org.springframework.integration:spring-integration-ip" - compile "commons-lang:commons-lang:$commonsLangVersion" - compile "org.springframework.integration:spring-integration-test" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-ip" + compile "commons-lang:commons-lang:$commonsLangVersion" + compile "org.springframework.integration:spring-integration-test" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('testcontainers-rabbitmq') { - description = 'Testcontainers RabbitMQ Sample' + description = 'Testcontainers RabbitMQ Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - bootRun { - main = 'org.springframework.integration.samples.testcontainersrabbitmq.TestcontainersRabbitmqApplication' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.testcontainersrabbitmq.TestcontainersRabbitmqApplication' + } - dependencies { - compile "org.springframework.boot:spring-boot-starter-integration" - compile "org.springframework.integration:spring-integration-amqp" - compile "org.springframework.boot:spring-boot-starter-json" + dependencies { + compile "org.springframework.boot:spring-boot-starter-integration" + compile "org.springframework.integration:spring-integration-amqp" + compile "org.springframework.boot:spring-boot-starter-json" - testCompile('org.springframework.boot:spring-boot-starter-test') { - exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' - } - testCompile 'org.springframework.integration:spring-integration-test' - testCompile 'org.springframework.amqp:spring-rabbit-test' - testCompile 'org.springframework.cloud:spring-cloud-starter' + testCompile('org.springframework.boot:spring-boot-starter-test') { + exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' + } + testCompile 'org.springframework.integration:spring-integration-test' + testCompile 'org.springframework.amqp:spring-rabbit-test' + testCompile 'org.springframework.cloud:spring-cloud-starter' - testCompile "org.testcontainers:junit-jupiter:$testcontainersVersion" - testCompile "com.playtika.testcontainers:embedded-rabbitmq:1.42" + testCompile "org.testcontainers:junit-jupiter:$testcontainersVersion" + testCompile "com.playtika.testcontainers:embedded-rabbitmq:1.42" - } + } - dependencyManagement { - imports { - mavenBom "org.springframework.cloud:spring-cloud-dependencies:$springCloudVersion" - } - } + dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-dependencies:$springCloudVersion" + } + } - test { - useJUnitPlatform() - } + test { + useJUnitPlatform() + } } project('testing-examples') { - description = 'Testing Examples' + description = 'Testing Examples' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.testing.externalgateway.Main' + mainClassName = 'org.springframework.integration.samples.testing.externalgateway.Main' - dependencies { - compile "org.springframework.integration:spring-integration-file" - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework.integration:spring-integration-ws" - compile "org.springframework:spring-webmvc" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + dependencies { + compile "org.springframework.integration:spring-integration-file" + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework.integration:spring-integration-ws" + compile "org.springframework:spring-webmvc" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" - } + testCompile "org.springframework.integration:spring-integration-test" + } } project('twitter') { - description = 'Twitter Basic Sample' + description = 'Twitter Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - test { - exclude '**/*Sample*' - } + test { + exclude '**/*Sample*' + } } project('ws-inbound-gateway') { - description = 'WS Inbound Gateway Sample' + description = 'WS Inbound Gateway Sample' - apply plugin: 'war' - apply plugin: "org.gretty" - apply plugin: 'eclipse-wtp' + apply plugin: 'war' + apply plugin: "org.gretty" + apply plugin: 'eclipse-wtp' - dependencies { - compile "org.springframework.integration:spring-integration-xml" - compile "org.springframework.integration:spring-integration-ws" - compile "org.springframework:spring-webmvc" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-xml" + compile "org.springframework.integration:spring-integration-ws" + compile "org.springframework:spring-webmvc" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - test { - exclude '**/InContainerTests*' - } + test { + exclude '**/InContainerTests*' + } } project('ws-outbound-gateway') { - description = 'WS Outbound Gateway Sample' + description = 'WS Outbound Gateway Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.ws.WebServiceDemoTestApp' + mainClassName = 'org.springframework.integration.samples.ws.WebServiceDemoTestApp' - dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-ws" + dependencies { + compile "org.springframework.integration:spring-integration-stream" + compile "org.springframework.integration:spring-integration-ws" // compile 'com.sun.xml.messaging.saaj:saaj-impl:1.3.19' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('xml') { - description = 'XML Sample' + description = 'XML Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.xml.BookOrderProcessingTestApp' + mainClassName = 'org.springframework.integration.samples.xml.BookOrderProcessingTestApp' - dependencies { - compile "org.springframework.integration:spring-integration-xml" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-xml" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('xmpp') { - description = 'XMPP Basic Sample' + description = 'XMPP Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-xmpp" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-xmpp" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - test { - exclude '**/*Sample*' - } + test { + exclude '**/*Sample*' + } } project('async-gateway') { - description = 'Async Gateway Sample' + description = 'Async Gateway Sample' - dependencies { - compile "org.springframework.integration:spring-integration-core" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-core" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('dynamic-poller') { - description = 'Dynamic Poller Sample' + description = 'Dynamic Poller Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.poller.Main' + mainClassName = 'org.springframework.integration.samples.poller.Main' - dependencies { - compile "org.springframework.integration:spring-integration-core" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-core" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('errorhandling') { - description = 'Error Handling Sample' + description = 'Error Handling Sample' - dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-stream" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('file-processing') { - description = 'File Processing Sample' + description = 'File Processing Sample' - dependencies { - compile "org.springframework.integration:spring-integration-file" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-file" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('mail-attachments') { - description = 'Mail Attachment Sample' + description = 'Mail Attachment Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.mailattachments.Main' + mainClassName = 'org.springframework.integration.samples.mailattachments.Main' - dependencies { - compile "org.springframework.integration:spring-integration-mail" - compile "org.springframework.integration:spring-integration-file" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" - compile "commons-io:commons-io:$commonsIoVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + dependencies { + compile "org.springframework.integration:spring-integration-mail" + compile "org.springframework.integration:spring-integration-file" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile "commons-io:commons-io:$commonsIoVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" - testCompile "org.subethamail:subethasmtp-wiser:$subethasmtpVersion" + testCompile "org.springframework.integration:spring-integration-test" + testCompile "org.subethamail:subethasmtp-wiser:$subethasmtpVersion" - } + } } project('monitoring') { - description = 'Monitoring Application' + description = 'Monitoring Application' - apply plugin: 'war' - apply plugin: "org.gretty" - apply plugin: 'application' - apply plugin: 'eclipse-wtp' + apply plugin: 'war' + apply plugin: "org.gretty" + apply plugin: 'application' + apply plugin: 'eclipse-wtp' - mainClassName = 'org.springintegration.SpringIntegrationTest' + mainClassName = 'org.springintegration.SpringIntegrationTest' - dependencies { - compile "org.springframework.integration:spring-integration-jmx" - compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" - compile "org.springframework.integration:spring-integration-groovy" - compile "org.springframework:spring-webmvc" - compile "javax.servlet:jstl:$jstlVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-jmx" + compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" + compile "org.springframework.integration:spring-integration-groovy" + compile "org.springframework:spring-webmvc" + compile "javax.servlet:jstl:$jstlVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('multipart-http') { - description = 'HTTP Multipart Demo' + description = 'HTTP Multipart Demo' - apply plugin: 'war' - apply plugin: "org.gretty" - apply plugin: 'eclipse-wtp' + apply plugin: 'war' + apply plugin: "org.gretty" + apply plugin: 'eclipse-wtp' - dependencies { - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework:spring-webmvc" - compile 'com.fasterxml.jackson.core:jackson-databind' - compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" - compile "commons-io:commons-io:$commonsIoVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework:spring-webmvc" + compile 'com.fasterxml.jackson.core:jackson-databind' + compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" + compile "commons-io:commons-io:$commonsIoVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('rest-http') { - description = 'Spring Integration Rest HTTP Path Usage Demo' + description = 'Spring Integration Rest HTTP Path Usage Demo' - apply plugin: 'war' - apply plugin: "org.gretty" - apply plugin: 'eclipse-wtp' + apply plugin: 'war' + apply plugin: "org.gretty" + apply plugin: 'eclipse-wtp' - dependencies { - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework:spring-webmvc" - compile "org.springframework:spring-oxm" - compile "org.springframework:spring-tx" - compile "org.springframework:spring-jdbc" - compile "org.springframework:spring-context" - compile "org.springframework:spring-aop" - compile 'com.fasterxml.jackson.core:jackson-databind' - compile "org.springframework.security:spring-security-web:$springSecurityVersion" - compile "org.springframework.security:spring-security-config:$springSecurityVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework:spring-webmvc" + compile "org.springframework:spring-oxm" + compile "org.springframework:spring-tx" + compile "org.springframework:spring-jdbc" + compile "org.springframework:spring-context" + compile "org.springframework:spring-aop" + compile 'com.fasterxml.jackson.core:jackson-databind' + compile "org.springframework.security:spring-security-web:$springSecurityVersion" + compile "org.springframework.security:spring-security-config:$springSecurityVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - test { - exclude '**/RestHttpClientTest*' - } + test { + exclude '**/RestHttpClientTest*' + } } project('retry-and-more') { - description = 'Retry and More Sample' - - dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-amqp" - compile "org.springframework.integration:spring-integration-ftp" - compile "org.springframework.integration:spring-integration-file" - compile("org.mockito:mockito-core:$mockitoVersion") { - exclude group: 'org.hamcrest' - } - compile "org.hamcrest:hamcrest-all:$hamcrestVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } - - task runCircuitBreakerDemo(type: JavaExec) { - main 'org.springframework.integration.samples.advice.CircuitBreakerDemo' - classpath = sourceSets.main.runtimeClasspath - } - - task runFileTransferDeleteAfterSuccessDemo(type: JavaExec) { - main 'org.springframework.integration.samples.advice.FileTransferDeleteAfterSuccessDemo' - classpath = sourceSets.main.runtimeClasspath - } - - task runFileTransferRenameAfterFailureDemo(type: JavaExec) { - main 'org.springframework.integration.samples.advice.FileTransferRenameAfterFailureDemo' - classpath = sourceSets.main.runtimeClasspath - } - - task runStatefulRetryDemo(type: JavaExec) { - main 'org.springframework.integration.samples.advice.StatefulRetryDemo' - classpath = sourceSets.main.runtimeClasspath - } - - task runStatelessRetryDemo(type: JavaExec) { - main 'org.springframework.integration.samples.advice.StatelessRetryDemo' - classpath = sourceSets.main.runtimeClasspath - } + description = 'Retry and More Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-stream" + compile "org.springframework.integration:spring-integration-amqp" + compile "org.springframework.integration:spring-integration-ftp" + compile "org.springframework.integration:spring-integration-file" + compile("org.mockito:mockito-core:$mockitoVersion") { + exclude group: 'org.hamcrest' + } + compile "org.hamcrest:hamcrest-all:$hamcrestVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } + + task runCircuitBreakerDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.CircuitBreakerDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runFileTransferDeleteAfterSuccessDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.FileTransferDeleteAfterSuccessDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runFileTransferRenameAfterFailureDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.FileTransferRenameAfterFailureDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runStatefulRetryDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.StatefulRetryDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runStatelessRetryDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.StatelessRetryDemo' + classpath = sourceSets.main.runtimeClasspath + } } project('splitter-aggregator-reaper') { - description = 'Splitter-Aggregator-Reaper Sample' + description = 'Splitter-Aggregator-Reaper Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.splitteraggregator.Main' + mainClassName = 'org.springframework.integration.samples.splitteraggregator.Main' - dependencies { - compile "org.springframework.integration:spring-integration-core" - compile "javax.inject:javax.inject:$javaxInjectVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-core" + compile "javax.inject:javax.inject:$javaxInjectVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('stored-procedures-derby') { - description = 'Derby Stored Procedures Sample' + description = 'Derby Stored Procedures Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' + mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' - dependencies { - compile "org.springframework.integration:spring-integration-jdbc" - compile "org.apache.derby:derby:$derbyVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-jdbc" + compile "org.apache.derby:derby:$derbyVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('stored-procedures-oracle') { - description = 'Oracle Stored Procedures Sample' + description = 'Oracle Stored Procedures Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' + mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' - repositories { - mavenLocal() //Oracle JDBC Driver - } + repositories { + mavenLocal() //Oracle JDBC Driver + } - dependencies { - compile "org.springframework.integration:spring-integration-jdbc" + dependencies { + compile "org.springframework.integration:spring-integration-jdbc" //TODO Uncomment it when the ojdbc6 artifact is available in the mavenLocal() // compile "com.oracle:ojdbc6:$oracleDriverVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - test { - exclude '**/StringConversionServiceTest*' - } + test { + exclude '**/StringConversionServiceTest*' + } } project('stored-procedures-ms') { - description = 'MS SQLServer Stored Procedures Sample' + description = 'MS SQLServer Stored Procedures Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' + mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' - dependencies { - compile "org.springframework.integration:spring-integration-jdbc" - compile "net.sourceforge.jtds:jtds:$jtdsVersion" - compile "c3p0:c3p0:$c3p0Version" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-jdbc" + compile "net.sourceforge.jtds:jtds:$jtdsVersion" + compile "c3p0:c3p0:$c3p0Version" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - test { - exclude '**/StringConversionServiceTest*' - } + test { + exclude '**/StringConversionServiceTest*' + } } project('stored-procedures-postgresql') { - description = 'PostgreSQL Stored Procedures Sample' + description = 'PostgreSQL Stored Procedures Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' + mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' - dependencies { - compile "org.springframework.integration:spring-integration-jdbc" - compile "org.postgresql:postgresql:$postgresVersion" - compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" - compile "commons-pool:commons-pool:$commonsPoolVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-jdbc" + compile "org.postgresql:postgresql:$postgresVersion" + compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" + compile "commons-pool:commons-pool:$commonsPoolVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('tcp-async-bi-directional') { - description = 'Bi-Directional TCP Sample' + description = 'Bi-Directional TCP Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ip" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-ip" - testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile "org.springframework.integration:spring-integration-test" - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + testCompile "org.springframework.integration:spring-integration-test" + } - bootRun { - main = 'org.springframework.integration.samples.tcpasyncbi.TcpAsyncBiDirectionalApplication' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.tcpasyncbi.TcpAsyncBiDirectionalApplication' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.tcpasyncbi.TcpAsyncBiDirectionalApplication' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.tcpasyncbi.TcpAsyncBiDirectionalApplication' + classpath = sourceSets.main.runtimeClasspath + } - test { - useJUnitPlatform() - } + test { + useJUnitPlatform() + } } project('tcp-client-server-multiplex') { - description = 'TCP Client Server Multiplexing Sample' + description = 'TCP Client Server Multiplexing Sample' - dependencies { - compile "org.springframework.integration:spring-integration-ip" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + dependencies { + compile "org.springframework.integration:spring-integration-ip" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" - } + testCompile "org.springframework.integration:spring-integration-test" + } } project('travel') { - description = 'Travel Services Sample' + description = 'Travel Services Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.travel.Main' + mainClassName = 'org.springframework.integration.samples.travel.Main' - dependencies { - compile "org.springframework.integration:spring-integration-ws" - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework:spring-web" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-ws" + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework:spring-web" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('tx-synch') { - description = 'Transaction Synchronization Sample' + description = 'Transaction Synchronization Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.advice.TransactionSynchronizationDemo' + mainClassName = 'org.springframework.integration.samples.advice.TransactionSynchronizationDemo' - dependencies { - compile "org.springframework.integration:spring-integration-jdbc" - compile "org.springframework.integration:spring-integration-file" - compile "com.h2database:h2:$h2Version" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-jdbc" + compile "org.springframework.integration:spring-integration-file" + compile "com.h2database:h2:$h2Version" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('web-sockets') { - description = 'Web Sockets Basic Sample' + description = 'Web Sockets Basic Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-websocket' - compile "org.springframework.integration:spring-integration-websocket" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-websocket' + compile "org.springframework.integration:spring-integration-websocket" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - bootRun { - main = 'org.springframework.integration.samples.websocket.standard.server.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.websocket.standard.server.Application' + } - tasks.withType(JavaExec) { - standardInput = System.in - } + tasks.withType(JavaExec) { + standardInput = System.in + } } project('stomp-chat') { - description = 'Web Sockets Stomp Chat Sample' + description = 'Web Sockets Stomp Chat Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-websocket' - compile "org.springframework.integration:spring-integration-websocket" - compile "org.springframework.integration:spring-integration-event" - compile "org.springframework.integration:spring-integration-groovy" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-websocket' + compile "org.springframework.integration:spring-integration-websocket" + compile "org.springframework.integration:spring-integration-event" + compile "org.springframework.integration:spring-integration-groovy" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - bootRun { - main = 'org.springframework.integration.samples.chat.stomp.server.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.chat.stomp.server.Application' + } - tasks.withType(JavaExec) { - standardInput = System.in - } + tasks.withType(JavaExec) { + standardInput = System.in + } } project('kafka-dsl') { - description = 'Java DSL Kafka Sample' + description = 'Java DSL Kafka Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-core" - compile ("org.springframework.integration:spring-integration-kafka:$springIntegrationKafkaVersion") - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } - bootRun { - main = 'org.springframework.integration.samples.dsl.kafka.Application' - } + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-core" + compile("org.springframework.integration:spring-integration-kafka:$springIntegrationKafkaVersion") + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + testCompile 'org.springframework.boot:spring-boot-starter-test' + } + springBoot { + mainClassName = 'org.springframework.integration.samples.dsl.kafka.Application' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.dsl.kafka.Application' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.dsl.kafka.Application' + classpath = sourceSets.main.runtimeClasspath + } - tasks.withType(JavaExec) { - standardInput = System.in - } + tasks.withType(JavaExec) { + standardInput = System.in + } } project('file-split-ftp') { - description = 'File Split FTP' + description = 'File Split FTP' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ftp" - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework.integration:spring-integration-mail" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-web' + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-ftp" + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework.integration:spring-integration-mail" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "com.sun.mail:javax.mail:$javaxMailVersion" - testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile "org.springframework.integration:spring-integration-test" - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + testCompile "org.springframework.integration:spring-integration-test" + } - bootRun { - main = 'org.springframework.integration.samples.filesplit.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.filesplit.Application' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.filesplit.Application' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.filesplit.Application' + classpath = sourceSets.main.runtimeClasspath + } } project('dynamic-tcp-client') { - description = 'Dynamic TCP Client' + description = 'Dynamic TCP Client' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ip" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-ip" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - bootRun { - main = 'org.springframework.integration.samples.dynamictcp.DynamicTcpClientApplication' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.dynamictcp.DynamicTcpClientApplication' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.dynamictcp.DynamicTcpClientApplication' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.dynamictcp.DynamicTcpClientApplication' + classpath = sourceSets.main.runtimeClasspath + } } project('tcp-with-headers') { - description = 'TCP Send/Receive with headers' + description = 'TCP Send/Receive with headers' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ip" - compile 'com.fasterxml.jackson.core:jackson-databind' + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-ip" + compile 'com.fasterxml.jackson.core:jackson-databind' - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - bootRun { - main = 'org.springframework.integration.samples.tcpheaders.TcpWithHeadersApplication' - standardInput = System.in - } + springBoot { + mainClassName = 'org.springframework.integration.samples.tcpheaders.TcpWithHeadersApplication' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.tcpheaders.TcpWithHeadersApplication' - classpath = sourceSets.main.runtimeClasspath - standardInput = System.in - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.tcpheaders.TcpWithHeadersApplication' + classpath = sourceSets.main.runtimeClasspath + } + + tasks.withType(JavaExec) { + standardInput = System.in + } } sonarqube { - properties { - property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec" - property "sonar.links.homepage", linkHomepage - property "sonar.links.ci", linkCi - property "sonar.links.issue", linkIssue - property "sonar.links.scm", linkScmUrl - property "sonar.links.scm_dev", linkScmDevConnection - property "sonar.java.coveragePlugin", "jacoco" - } + properties { + property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec" + property "sonar.links.homepage", linkHomepage + property "sonar.links.ci", linkCi + property "sonar.links.issue", linkIssue + property "sonar.links.scm", linkScmUrl + property "sonar.links.scm_dev", linkScmDevConnection + property "sonar.java.coveragePlugin", "jacoco" + } } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index b68df0d68..f29cd7619 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE org.springframework.integration.samples cafe-dsl - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Java DSL Cafe Sample Java DSL Cafe Sample https://projects.spring.io/spring-integration @@ -63,7 +63,7 @@ org.springframework.integration.samples cafe-si - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE compile @@ -97,7 +97,7 @@ junit junit - 4.12 + 4.13 test @@ -186,28 +186,28 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE import pom com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 535b1108b..d91ff9050 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE org.springframework.integration.samples kafka-dsl - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Java DSL Kafka Sample Java DSL Kafka Sample https://projects.spring.io/spring-integration @@ -97,7 +97,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -109,7 +109,7 @@ junit junit - 4.12 + 4.13 test @@ -198,28 +198,28 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE import pom com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 9f9883a60..98f31e07e 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dsl - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE https://projects.spring.io/spring-integration SpringIO @@ -56,7 +56,7 @@ junit junit - 4.12 + 4.13 test @@ -126,21 +126,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index e0965d722..bf32a5b97 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE org.springframework.integration.samples si4demo - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Java Configuration/DSL Sample Java Configuration/DSL Sample https://projects.spring.io/spring-integration @@ -166,7 +166,7 @@ junit junit - 4.12 + 4.13 test @@ -255,28 +255,28 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE import pom com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/gradle.properties b/gradle.properties index 16bc4d5b0..a83a765d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ version=5.3.0.RELEASE -springBootVersion=2.3.0.RELEASE +springBootVersion=2.3.1.RELEASE org.gradle.jvmargs=-Xmx1536m diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 6874214f2..8b980e34b 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples async-gateway - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Async Gateway Sample Async Gateway Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 95d5d7620..14b606fd5 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-poller - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Dynamic Poller Sample Dynamic Poller Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index bdae159bb..9b50ca9ec 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples errorhandling - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Error Handling Sample Error Handling Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 55c1b36b3..ad6588e0c 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file-processing - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE File Processing Sample File Processing Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index e04860ada..d1ef7b68c 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail-attachments - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Mail Attachment Sample Mail Attachment Sample https://projects.spring.io/spring-integration @@ -116,7 +116,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -128,7 +128,7 @@ junit junit - 4.12 + 4.13 test @@ -221,21 +221,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index b903c7f32..82a07b9ab 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples monitoring - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Monitoring Application Monitoring Application https://projects.spring.io/spring-integration @@ -115,7 +115,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -127,7 +127,7 @@ junit junit - 4.12 + 4.13 test @@ -197,21 +197,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 316472b3f..6d7f3ee3f 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples multipart-http - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE HTTP Multipart Demo HTTP Multipart Demo https://projects.spring.io/spring-integration @@ -115,7 +115,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -127,7 +127,7 @@ junit junit - 4.12 + 4.13 test @@ -197,21 +197,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/pom.xml b/intermediate/pom.xml index 79281aba5..602e8d345 100644 --- a/intermediate/pom.xml +++ b/intermediate/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples intermediate - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE https://projects.spring.io/spring-integration SpringIO diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index a2540d6fa..833dddce6 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples rest-http - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Spring Integration Rest HTTP Path Usage Demo Spring Integration Rest HTTP Path Usage Demo https://projects.spring.io/spring-integration @@ -146,7 +146,7 @@ org.springframework.security spring-security-web - 5.3.2.RELEASE + 5.3.3.RELEASE compile @@ -158,7 +158,7 @@ org.springframework.security spring-security-config - 5.3.2.RELEASE + 5.3.3.RELEASE compile @@ -170,7 +170,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -182,7 +182,7 @@ junit junit - 4.12 + 4.13 test @@ -252,21 +252,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index e4b354fbd..5220ccdcd 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples retry-and-more - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Retry and More Sample Retry and More Sample https://projects.spring.io/spring-integration @@ -130,7 +130,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -142,7 +142,7 @@ junit junit - 4.12 + 4.13 test @@ -184,21 +184,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 1b0f73bf5..e48ff6d34 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Splitter-Aggregator-Reaper Sample Splitter-Aggregator-Reaper Sample https://projects.spring.io/spring-integration @@ -81,7 +81,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -93,7 +93,7 @@ junit junit - 4.12 + 4.13 test @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 275df8a81..fcf689619 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-derby - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Derby Stored Procedures Sample Derby Stored Procedures Sample https://projects.spring.io/spring-integration @@ -81,7 +81,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -93,7 +93,7 @@ junit junit - 4.12 + 4.13 test @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 9a484b6e5..f5bb7a4ba 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-ms - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE MS SQLServer Stored Procedures Sample MS SQLServer Stored Procedures Sample https://projects.spring.io/spring-integration @@ -93,7 +93,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -105,7 +105,7 @@ junit junit - 4.12 + 4.13 test @@ -175,21 +175,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 8809d2228..b9ebd6ee1 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-oracle - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Oracle Stored Procedures Sample Oracle Stored Procedures Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 804869e44..758dd067f 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-postgresql - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE PostgreSQL Stored Procedures Sample PostgreSQL Stored Procedures Sample https://projects.spring.io/spring-integration @@ -105,7 +105,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -117,7 +117,7 @@ junit junit - 4.12 + 4.13 test @@ -187,21 +187,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index b70458070..ec8a35317 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.3.1.RELEASE org.springframework.integration.samples tcp-async-bi-directional @@ -85,7 +85,7 @@ junit junit - 4.12 + 4.13 test @@ -185,28 +185,28 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.RELEASE + 2.3.1.RELEASE import pom com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 2d1e23455..384780e55 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE TCP Client Server Multiplexing Sample TCP Client Server Multiplexing Sample https://projects.spring.io/spring-integration @@ -69,7 +69,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -81,7 +81,7 @@ junit junit - 4.12 + 4.13 test @@ -162,21 +162,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 7efb6846f..784344dfe 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE org.springframework.integration.samples testcontainers-rabbitmq - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Testcontainers RabbitMQ Sample Testcontainers RabbitMQ Sample https://projects.spring.io/spring-integration @@ -96,7 +96,7 @@ junit junit - 4.12 + 4.13 test @@ -253,28 +253,28 @@ org.springframework.boot spring-boot-dependencies - 2.3.0.BUILD-SNAPSHOT + 2.3.1.RELEASE import pom com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 751a60183..95ce905aa 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples travel - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Travel Services Sample Travel Services Sample https://projects.spring.io/spring-integration @@ -91,7 +91,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -103,7 +103,7 @@ junit junit - 4.12 + 4.13 test @@ -173,21 +173,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 9af935fbf..4609744f1 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tx-synch - 5.3.0.BUILD-SNAPSHOT + 5.3.0.RELEASE Transaction Synchronization Sample Transaction Synchronization Sample https://projects.spring.io/spring-integration @@ -92,7 +92,7 @@ org.apache.logging.log4j log4j-core - 2.13.2 + 2.13.3 compile @@ -104,7 +104,7 @@ junit junit - 4.12 + 4.13 test @@ -174,21 +174,21 @@ com.fasterxml.jackson jackson-bom - 2.10.3 + 2.11.0 import pom org.springframework spring-framework-bom - 5.2.6.RELEASE + 5.2.7.RELEASE import pom org.springframework.integration spring-integration-bom - 5.3.0.RELEASE + 5.3.1.RELEASE import pom From 99dece52a3e4cd3a95632597b533dfc0dd02cdb0 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 23 Jun 2020 10:35:51 -0400 Subject: [PATCH 240/356] Revert build.gradle tabs reformatting --- build.gradle | 2181 +++++++++++++++++++++++++------------------------- 1 file changed, 1091 insertions(+), 1090 deletions(-) diff --git a/build.gradle b/build.gradle index 6ed09521b..9ea57c824 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,15 @@ buildscript { - repositories { - maven { url 'https://repo.spring.io/libs-snapshot' } - } - dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:1.0.9.RELEASE' - classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" - classpath "gradle.plugin.org.gretty:gretty:2.3.1" - } + repositories { + maven { url 'https://repo.spring.io/libs-snapshot' } + } + dependencies { + classpath 'io.spring.gradle:dependency-management-plugin:1.0.9.RELEASE' + classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" + classpath "gradle.plugin.org.gretty:gretty:2.3.1" + } } plugins { - id "org.sonarqube" version "2.8" + id "org.sonarqube" version "2.8" } description = 'Spring Integration Samples' @@ -18,1513 +18,1514 @@ apply plugin: 'base' apply plugin: 'idea' ext { - linkHomepage = 'https://projects.spring.io/spring-integration' - linkCi = 'https://build.spring.io/browse/INTSAMPLES' - linkIssue = 'https://jira.spring.io/browse/INTSAMPLES' - linkScmUrl = 'https://github.com/spring-projects/spring-integration-samples' - linkScmConnection = 'scm:git:git://github.com/spring-projects/spring-integration-samples.git' - linkScmDevConnection = 'scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git' + linkHomepage = 'https://projects.spring.io/spring-integration' + linkCi = 'https://build.spring.io/browse/INTSAMPLES' + linkIssue = 'https://jira.spring.io/browse/INTSAMPLES' + linkScmUrl = 'https://github.com/spring-projects/spring-integration-samples' + linkScmConnection = 'scm:git:git://github.com/spring-projects/spring-integration-samples.git' + linkScmDevConnection = 'scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git' } allprojects { - group = 'org.springframework.integration.samples' + group = 'org.springframework.integration.samples' - repositories { - maven { url 'https://repo.spring.io/libs-snapshot' } - maven { url 'https://repo.spring.io/libs-milestone' } + repositories { + maven { url 'https://repo.spring.io/libs-snapshot' } + maven { url 'https://repo.spring.io/libs-milestone' } // maven { url 'https://repo.spring.io/libs-staging-local' } - } + } } subprojects { subproject -> - apply plugin: 'eclipse' - apply plugin: 'idea' - apply plugin: 'maven' - - task generatePom { - doLast { - pom { - project { - name = project.description - description = project.description - url = linkHomepage - - organization { - name = 'SpringIO' - url = 'https://spring.io' - } - - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'https://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } - } - - scm { - url = linkScmUrl - connection = 'scm:git:' + linkScmConnection - developerConnection = 'scm:git:' + linkScmDevConnection - } - - developers { - developer { - id = 'abilan' - name = 'Artem Bilan' - email = 'abilan@pivotal.io' - roles = ["project lead"] - } - developer { - id = 'garyrussell' - name = 'Gary Russell' - email = 'grussell@pivotal.io' - roles = ["lead emeritus"] - } - developer { - id = 'markfisher' - name = 'Mark Fisher' - email = 'mfisher@pivotal.io' - roles = ["project founder and lead emeritus"] - } - developer { - id = 'ghillert' - name = 'Gunnar Hillert' - email = 'ghillert@pivotal.io' - } - } - - if (subproject.plugins.hasPlugin('java')) { - repositories { - repository { - id = 'repo.spring.io.milestone' - name = 'Spring Framework Maven Milestone Repository' - url = 'https://repo.spring.io/libs-milestone' - } - repository { - id = 'repo.spring.io.snapshot' - name = 'Spring Framework Maven Snapshot Repository' - url = 'https://repo.spring.io/libs-snapshot' - } - } - } - - if (subproject.plugins.hasPlugin('org.springframework.boot')) { - parent { - groupId = 'org.springframework.boot' - artifactId = 'spring-boot-starter-parent' - version = springBootVersion - } - } - }.withXml { - if (subproject.plugins.hasPlugin('org.akhikhl.gretty')) { - asNode().appendNode('packaging', 'war') - asNode().appendNode('build') - .appendNode('plugins') - .appendNode('plugin').with { - appendNode('groupId', 'org.mortbay.jetty') - appendNode('artifactId', 'jetty-maven-plugin') - appendNode('version', '8.1.14.v20131031') - appendNode('configuration') - .appendNode('webAppConfig') - .appendNode('contextPath', '/' + subproject.name) - } - } - if (subproject.plugins.hasPlugin('org.springframework.boot')) { - asNode().appendNode('build').appendNode('plugins') - .appendNode('plugin').with { - appendNode('groupId', 'org.springframework.boot') - appendNode('artifactId', 'spring-boot-maven-plugin') - } - } - if (subproject.plugins.hasPlugin('io.spring.dependency-management')) { - dependencyManagement.pomConfigurer.configurePom(asNode()) - } - }.writeTo('pom.xml') - } - - } - } - - eclipse { - project { - natures += 'org.springframework.ide.eclipse.core.springnature' - } - } - - if (!(subproject.name in ['advanced', 'applications', 'basic', 'intermediate', 'cafe'])) { - - apply plugin: 'java' - apply plugin: 'jacoco' - apply plugin: 'io.spring.dependency-management' - - jacoco { - toolVersion = "0.8.5" - } - - compileJava { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 - } - - ext { - activeMqVersion = '5.15.13' - apacheSshdVersion = '2.4.0' - aspectjVersion = '1.9.5' - commonsDigesterVersion = '2.0' - commonsDbcpVersion = '1.2.2' - commonsFileUploadVersion = '1.4' - commonsIoVersion = '2.6' - commonsLangVersion = '2.6' - commonsPoolVersion = '1.5.4' - c3p0Version = '0.9.1.2' - derbyVersion = '10.14.2.0' - hamcrestVersion = '1.3' - hibernateVersion = '5.4.17.Final' - hibernateValidatorVersion = '6.1.2.Final' - ftpServerVersion = '1.1.1' - flexjsonVersion = '2.0' - groovyVersion = '2.5.10' - hsqldbVersion = '2.5.0' - h2Version = '1.4.200' - jacksonVersion = '2.11.0' - javaxInjectVersion = '1' - javaxMailVersion = '1.6.2' - jodaTimeVersion = '1.6' - jtaVersion = '1.1' - jtdsVersion = '1.2.6' - jmsApiVersion = '2.0.1' - jrubyVersion = '1.7.12' - jpa21ApiVersion = '1.0.0.Final' - jpaApiVersion = '2.0.0' - jstlVersion = '1.2' - junitVersion = '4.13' - jythonVersion = '2.7.0' - log4jVersion = '2.13.3' - mockitoVersion = '3.2.4' - mongoDriverVersion = '4.0.4' - openJpaVersion = '2.4.0' - oracleDriverVersion = '11.2.0.3' - postgresVersion = '42.2.9' - subethasmtpVersion = '1.2' - slf4jVersion = '1.7.25' - springCloudVersion = 'Hoxton.SR3' - springIntegrationVersion = '5.3.1.RELEASE' - springIntegrationKafkaVersion = '3.3.0.RELEASE' - springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' - springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.5.2.RELEASE' - springVersion = '5.2.7.RELEASE' - springSecurityVersion = '5.3.3.RELEASE' - springWebFlowVersion = '2.3.3.RELEASE' - testcontainersVersion = '1.13.0' - tilesJspVersion = '2.2.1' - validationApiVersion = '1.0.0.GA' - } - - sourceSets.each { - it.resources.srcDirs = ["src/${it.name}/resources", "src/${it.name}/java"] - } - - dependencyManagement { - imports { - mavenBom "org.springframework.integration:spring-integration-bom:$springIntegrationVersion" - mavenBom "org.springframework:spring-framework-bom:$springVersion" - mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonVersion" - } - } - - // dependencies that are common across all java projects - dependencies { - testCompile("junit:junit:$junitVersion") { - exclude group: 'org.hamcrest' - } - testCompile "org.hamcrest:hamcrest-all:$hamcrestVersion" - testCompile("org.mockito:mockito-core:$mockitoVersion") { - exclude group: 'org.hamcrest' - } - testCompile "org.springframework:spring-test" - } - - configurations { - all*.exclude group: 'com.fasterxml.jackson.module', module: 'jackson-module-kotlin' - } - - // enable all compiler warnings; individual projects may customize further - ext.xLintArg = '-Xlint:all,-options,-processing' - [compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg] - - jacocoTestReport { - reports { - xml.enabled false - csv.enabled false - html.destination file("${buildDir}/reports/jacoco/html") - } - } - - test { - // suppress all console output during testing unless running `gradle -i` - logging.captureStandardOutput(LogLevel.INFO) - jacoco { - destinationFile = file("$buildDir/jacoco.exec") - } - } - - build.dependsOn jacocoTestReport - } - - task cleanTarget(type: Delete) { - delete 'target' - } - - clean.dependsOn cleanTarget + apply plugin: 'eclipse' + apply plugin: 'idea' + apply plugin: 'maven' + + task generatePom { + doLast { + pom { + project { + name = project.description + description = project.description + url = linkHomepage + + organization { + name = 'SpringIO' + url = 'https://spring.io' + } + + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'https://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' + } + } + + scm { + url = linkScmUrl + connection = 'scm:git:' + linkScmConnection + developerConnection = 'scm:git:' + linkScmDevConnection + } + + developers { + developer { + id = 'abilan' + name = 'Artem Bilan' + email = 'abilan@pivotal.io' + roles = ["project lead"] + } + developer { + id = 'garyrussell' + name = 'Gary Russell' + email = 'grussell@pivotal.io' + roles = ["lead emeritus"] + } + developer { + id = 'markfisher' + name = 'Mark Fisher' + email = 'mfisher@pivotal.io' + roles = ["project founder and lead emeritus"] + } + developer { + id = 'ghillert' + name = 'Gunnar Hillert' + email = 'ghillert@pivotal.io' + } + } + + if (subproject.plugins.hasPlugin('java')) { + repositories { + repository { + id = 'repo.spring.io.milestone' + name = 'Spring Framework Maven Milestone Repository' + url = 'https://repo.spring.io/libs-milestone' + } + repository { + id = 'repo.spring.io.snapshot' + name = 'Spring Framework Maven Snapshot Repository' + url = 'https://repo.spring.io/libs-snapshot' + } + } + } + + if (subproject.plugins.hasPlugin('org.springframework.boot')) { + parent { + groupId = 'org.springframework.boot' + artifactId = 'spring-boot-starter-parent' + version = springBootVersion + } + } + }.withXml { + if (subproject.plugins.hasPlugin('org.akhikhl.gretty')) { + asNode().appendNode('packaging', 'war') + asNode().appendNode('build') + .appendNode('plugins') + .appendNode('plugin').with { + appendNode('groupId', 'org.mortbay.jetty') + appendNode('artifactId', 'jetty-maven-plugin') + appendNode('version', '8.1.14.v20131031') + appendNode('configuration') + .appendNode('webAppConfig') + .appendNode('contextPath', '/' + subproject.name) + } + } + if (subproject.plugins.hasPlugin('org.springframework.boot')) { + asNode().appendNode('build').appendNode('plugins') + .appendNode('plugin').with { + appendNode('groupId', 'org.springframework.boot') + appendNode('artifactId', 'spring-boot-maven-plugin') + } + } + if (subproject.plugins.hasPlugin('io.spring.dependency-management')) { + dependencyManagement.pomConfigurer.configurePom(asNode()) + } + }.writeTo('pom.xml') + } + + } + } + + eclipse { + project { + natures += 'org.springframework.ide.eclipse.core.springnature' + } + } + + if (!(subproject.name in ['advanced', 'applications', 'basic', 'intermediate', 'cafe'])) { + + apply plugin: 'java' + apply plugin: 'jacoco' + apply plugin: 'io.spring.dependency-management' + + jacoco { + toolVersion = "0.8.5" + } + + compileJava { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + } + + ext { + activeMqVersion = '5.15.13' + apacheSshdVersion = '2.4.0' + aspectjVersion = '1.9.5' + commonsDigesterVersion = '2.0' + commonsDbcpVersion = '1.2.2' + commonsFileUploadVersion = '1.4' + commonsIoVersion = '2.6' + commonsLangVersion = '2.6' + commonsPoolVersion = '1.5.4' + c3p0Version = '0.9.1.2' + derbyVersion = '10.14.2.0' + hamcrestVersion = '1.3' + hibernateVersion = '5.4.17.Final' + hibernateValidatorVersion = '6.1.2.Final' + ftpServerVersion = '1.1.1' + flexjsonVersion = '2.0' + groovyVersion = '2.5.10' + hsqldbVersion = '2.5.0' + h2Version = '1.4.200' + jacksonVersion = '2.11.0' + javaxInjectVersion = '1' + javaxMailVersion = '1.6.2' + jodaTimeVersion = '1.6' + jtaVersion = '1.1' + jtdsVersion = '1.2.6' + jmsApiVersion = '2.0.1' + jrubyVersion = '1.7.12' + jpa21ApiVersion = '1.0.0.Final' + jpaApiVersion = '2.0.0' + jstlVersion = '1.2' + junitVersion = '4.13' + jythonVersion = '2.7.0' + log4jVersion = '2.13.3' + mockitoVersion = '3.2.4' + mongoDriverVersion = '4.0.4' + openJpaVersion = '2.4.0' + oracleDriverVersion = '11.2.0.3' + postgresVersion = '42.2.9' + subethasmtpVersion = '1.2' + slf4jVersion = '1.7.25' + springCloudVersion ='Hoxton.SR3' + springIntegrationVersion = '5.3.1.RELEASE' + springIntegrationKafkaVersion = '3.3.0.RELEASE' + springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' + springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' + springKafkaVersion = '2.5.2.RELEASE' + springVersion = '5.2.7.RELEASE' + springSecurityVersion = '5.3.3.RELEASE' + springWebFlowVersion = '2.3.3.RELEASE' + testcontainersVersion = '1.13.0' + tilesJspVersion = '2.2.1' + validationApiVersion = '1.0.0.GA' + } + + sourceSets.each { + it.resources.srcDirs = ["src/${it.name}/resources", "src/${it.name}/java"] + } + + dependencyManagement { + imports { + mavenBom "org.springframework.integration:spring-integration-bom:$springIntegrationVersion" + mavenBom "org.springframework:spring-framework-bom:$springVersion" + mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonVersion" + } + } + + // dependencies that are common across all java projects + dependencies { + testCompile("junit:junit:$junitVersion") { + exclude group: 'org.hamcrest' + } + testCompile "org.hamcrest:hamcrest-all:$hamcrestVersion" + testCompile("org.mockito:mockito-core:$mockitoVersion") { + exclude group: 'org.hamcrest' + } + testCompile "org.springframework:spring-test" + } + + configurations { + all*.exclude group: 'com.fasterxml.jackson.module', module: 'jackson-module-kotlin' + } + + // enable all compiler warnings; individual projects may customize further + ext.xLintArg = '-Xlint:all,-options,-processing' + [compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg] + + jacocoTestReport { + reports { + xml.enabled false + csv.enabled false + html.destination file("${buildDir}/reports/jacoco/html") + } + } + + test { + // suppress all console output during testing unless running `gradle -i` + logging.captureStandardOutput(LogLevel.INFO) + jacoco { + destinationFile = file("$buildDir/jacoco.exec") + } + } + + build.dependsOn jacocoTestReport + } + + task cleanTarget(type: Delete) { + delete 'target' + } + + clean.dependsOn cleanTarget } project('advanced-testing-examples') { - description = 'Advanced Testing Examples' + description = 'Advanced Testing Examples' - dependencies { - compile "javax.jms:javax.jms-api:$jmsApiVersion" - compile "org.springframework.integration:spring-integration-jms" - compile "org.springframework.integration:spring-integration-groovy" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "javax.jms:javax.jms-api:$jmsApiVersion" + compile "org.springframework.integration:spring-integration-jms" + compile "org.springframework.integration:spring-integration-groovy" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('dynamic-ftp') { - description = 'Dynamic FTP Demo' + description = 'Dynamic FTP Demo' - dependencies { - compile "org.springframework.integration:spring-integration-ftp" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-ftp" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('cafe-si') { - description = 'Cafe - Pure Spring Integration' + description = 'Cafe - Pure Spring Integration' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.cafe.xml.CafeDemoApp' + mainClassName = 'org.springframework.integration.samples.cafe.xml.CafeDemoApp' - dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile 'com.fasterxml.jackson.core:jackson-databind' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-stream" + compile 'com.fasterxml.jackson.core:jackson-databind' + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('cafe-amqp') { - description = 'Cafe - With AMQP Message Broker' + description = 'Cafe - With AMQP Message Broker' - dependencies { - compile project(":cafe-si") - compile "org.springframework.integration:spring-integration-amqp" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile project(":cafe-si") + compile "org.springframework.integration:spring-integration-amqp" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('cafe-jms') { - description = 'Cafe - With JMS Message Broker' + description = 'Cafe - With JMS Message Broker' - dependencies { - compile project(":cafe-si") - compile "org.apache.activemq:activemq-broker:$activeMqVersion" - compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { - exclude group: "org.springframework" - } - compile "org.springframework.integration:spring-integration-jms" - compile "javax.jms:javax.jms-api:$jmsApiVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile project(":cafe-si") + compile "org.apache.activemq:activemq-broker:$activeMqVersion" + compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { + exclude group: "org.springframework" + } + compile "org.springframework.integration:spring-integration-jms" + compile "javax.jms:javax.jms-api:$jmsApiVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('cafe-scripted') { - description = 'Cafe Sample (Scripted Implementation)' - - dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-groovy" - compile "org.springframework.integration:spring-integration-rmi" - compile "org.springframework.integration:spring-integration-jmx" - compile "org.jruby:jruby:$jrubyVersion" - compile "org.python:jython-standalone:$jythonVersion" - compile "org.codehaus.groovy:groovy-all:$groovyVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } - - task runCafeDemoApp(type: JavaExec) { - main 'org.springframework.integration.samples.cafe.demo.CafeDemoApp' - args project.hasProperty('lang') ? project.lang : '' - classpath = sourceSets.main.runtimeClasspath - } - - task runControlBus(type: JavaExec) { - main 'org.springframework.integration.samples.cafe.demo.ControlBusMain' - classpath = sourceSets.main.runtimeClasspath - } + description = 'Cafe Sample (Scripted Implementation)' + + dependencies { + compile "org.springframework.integration:spring-integration-stream" + compile "org.springframework.integration:spring-integration-groovy" + compile "org.springframework.integration:spring-integration-rmi" + compile "org.springframework.integration:spring-integration-jmx" + compile "org.jruby:jruby:$jrubyVersion" + compile "org.python:jython-standalone:$jythonVersion" + compile "org.codehaus.groovy:groovy-all:$groovyVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } + + task runCafeDemoApp(type: JavaExec) { + main 'org.springframework.integration.samples.cafe.demo.CafeDemoApp' + args project.hasProperty('lang') ? project.lang : '' + classpath = sourceSets.main.runtimeClasspath + } + + task runControlBus(type: JavaExec) { + main 'org.springframework.integration.samples.cafe.demo.ControlBusMain' + classpath = sourceSets.main.runtimeClasspath + } } project('loan-broker') { - description = 'Loan Broker Sample' + description = 'Loan Broker Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.loanbroker.demo.LoanBrokerDemo' + mainClassName = 'org.springframework.integration.samples.loanbroker.demo.LoanBrokerDemo' - dependencies { - compile "org.springframework.integration:spring-integration-ip" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-ip" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - task runLoanBrokerSharkDetectorDemo(type: JavaExec) { - main 'org.springframework.integration.samples.loanbroker.demo.LoanBrokerSharkDetectorDemo' - classpath = sourceSets.main.runtimeClasspath - } + task runLoanBrokerSharkDetectorDemo(type: JavaExec) { + main 'org.springframework.integration.samples.loanbroker.demo.LoanBrokerSharkDetectorDemo' + classpath = sourceSets.main.runtimeClasspath + } } project('loanshark') { - description = 'Loan Shark Sample' - - apply plugin: 'war' - apply plugin: "org.gretty" - apply plugin: 'eclipse-wtp' - - dependencies { - compile "org.springframework.integration:spring-integration-ip" - compile "org.springframework:spring-webmvc" - compile "org.springframework:spring-orm" - compile "org.springframework:spring-aop" - compile "org.springframework:spring-aspects" - compile "org.aspectj:aspectjtools:$aspectjVersion" - compile "org.springframework:spring-jdbc" - compile "org.springframework:spring-tx" - compile "org.springframework:spring-context" - compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" - compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" - compile "commons-digester:commons-digester:$commonsDigesterVersion" - compile "commons-pool:commons-pool:$commonsPoolVersion" - compile "org.apache.tiles:tiles-jsp:$tilesJspVersion" - compile "joda-time:joda-time:$jodaTimeVersion" - compile "javax.transaction:jta:$jtaVersion" - compile "org.hsqldb:hsqldb:$hsqldbVersion" - compile "net.sf.flexjson:flexjson:$flexjsonVersion" - compile "javax.validation:validation-api:$validationApiVersion" - compile "org.hibernate:hibernate-validator:$hibernateValidatorVersion" - compile "org.eclipse.persistence:javax.persistence:$jpaApiVersion" - compile "org.hibernate:hibernate-entitymanager:$hibernateVersion" - compile "org.springframework.webflow:spring-js:$springWebFlowVersion" - compile "org.slf4j:slf4j-api:$slf4jVersion" - - runtime "org.apache.logging.log4j:log4j-core:$log4jVersion" - runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" - runtime "org.slf4j:jcl-over-slf4j:$slf4jVersion" - } + description = 'Loan Shark Sample' + + apply plugin: 'war' + apply plugin: "org.gretty" + apply plugin: 'eclipse-wtp' + + dependencies { + compile "org.springframework.integration:spring-integration-ip" + compile "org.springframework:spring-webmvc" + compile "org.springframework:spring-orm" + compile "org.springframework:spring-aop" + compile "org.springframework:spring-aspects" + compile "org.aspectj:aspectjtools:$aspectjVersion" + compile "org.springframework:spring-jdbc" + compile "org.springframework:spring-tx" + compile "org.springframework:spring-context" + compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" + compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" + compile "commons-digester:commons-digester:$commonsDigesterVersion" + compile "commons-pool:commons-pool:$commonsPoolVersion" + compile "org.apache.tiles:tiles-jsp:$tilesJspVersion" + compile "joda-time:joda-time:$jodaTimeVersion" + compile "javax.transaction:jta:$jtaVersion" + compile "org.hsqldb:hsqldb:$hsqldbVersion" + compile "net.sf.flexjson:flexjson:$flexjsonVersion" + compile "javax.validation:validation-api:$validationApiVersion" + compile "org.hibernate:hibernate-validator:$hibernateValidatorVersion" + compile "org.eclipse.persistence:javax.persistence:$jpaApiVersion" + compile "org.hibernate:hibernate-entitymanager:$hibernateVersion" + compile "org.springframework.webflow:spring-js:$springWebFlowVersion" + compile "org.slf4j:slf4j-api:$slf4jVersion" + + runtime "org.apache.logging.log4j:log4j-core:$log4jVersion" + runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" + runtime "org.slf4j:jcl-over-slf4j:$slf4jVersion" + } } project('amqp') { - description = 'AMQP Basic Sample' + description = 'AMQP Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-amqp" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - runtime "org.slf4j:slf4j-jcl:$slf4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-stream" + compile "org.springframework.integration:spring-integration-amqp" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + runtime "org.slf4j:slf4j-jcl:$slf4jVersion" + } - task runSimple(type: JavaExec) { - main 'org.springframework.integration.samples.amqp.SampleSimple' - classpath = sourceSets.main.runtimeClasspath - standardInput = System.in - // useful for debugging the GradleWorkerMain - // jvmArgs "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000" + task runSimple(type: JavaExec) { + main 'org.springframework.integration.samples.amqp.SampleSimple' + classpath = sourceSets.main.runtimeClasspath + standardInput = System.in + // useful for debugging the GradleWorkerMain + // jvmArgs "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000" - } + } - task runPubConfirmsReturns(type: JavaExec) { - main 'org.springframework.integration.samples.amqp.SamplePubConfirmsReturns' - classpath = sourceSets.main.runtimeClasspath - standardInput = System.in - // useful for debugging the GradleWorkerMain - // jvmArgs "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000" + task runPubConfirmsReturns(type: JavaExec) { + main 'org.springframework.integration.samples.amqp.SamplePubConfirmsReturns' + classpath = sourceSets.main.runtimeClasspath + standardInput = System.in + // useful for debugging the GradleWorkerMain + // jvmArgs "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000" - } + } } project('barrier') { - description = 'Barrier Sample' + description = 'Barrier Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.springframework.boot:spring-boot-starter-integration' - compile 'org.springframework.boot:spring-boot-starter-amqp' - compile "org.springframework.integration:spring-integration-amqp" - compile "org.springframework.integration:spring-integration-http" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-web' + compile 'org.springframework.boot:spring-boot-starter-integration' + compile 'org.springframework.boot:spring-boot-starter-amqp' + compile "org.springframework.integration:spring-integration-amqp" + compile "org.springframework.integration:spring-integration-http" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - springBoot { - mainClassName = 'org.springframework.integration.samples.barrier.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.barrier.Application' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.barrier.Application' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.barrier.Application' + classpath = sourceSets.main.runtimeClasspath + } } project('control-bus') { - description = 'Control Bus Basic Sample' + description = 'Control Bus Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-core" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-core" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('enricher') { - description = 'Enricher Basic Sample' + description = 'Enricher Basic Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.enricher.Main' + mainClassName = 'org.springframework.integration.samples.enricher.Main' - dependencies { - compile "org.springframework.integration:spring-integration-core" - compile "com.h2database:h2:$h2Version" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-core" + compile "com.h2database:h2:$h2Version" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('feed') { - description = 'Feed (RSS/ATOM) Basic Sample' + description = 'Feed (RSS/ATOM) Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-feed" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-feed" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('file') { - description = 'File Copy Basic Sample' + description = 'File Copy Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-file" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-file" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('ftp') { - description = 'FTP Basic Sample' + description = 'FTP Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-ftp" - compile "commons-io:commons-io:$commonsIoVersion" - compile "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" - compile "org.slf4j:slf4j-api:$slf4jVersion" + dependencies { + compile "org.springframework.integration:spring-integration-ftp" + compile "commons-io:commons-io:$commonsIoVersion" + compile "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" + compile "org.slf4j:slf4j-api:$slf4jVersion" - runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" + runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" - testCompile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" - } + testCompile "org.apache.logging.log4j:log4j-core:$log4jVersion" + testCompile "org.springframework.integration:spring-integration-test" + } - test { - include '**/TestSuite*' - } + test { + include '**/TestSuite*' + } } project('helloworld') { - description = 'Hello World Sample' + description = 'Hello World Sample' - dependencies { - compile "org.springframework.integration:spring-integration-core" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-core" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - task runHelloWorldApp(type: JavaExec) { - main 'org.springframework.integration.samples.helloworld.HelloWorldApp' - classpath = sourceSets.main.runtimeClasspath - } + task runHelloWorldApp(type: JavaExec) { + main 'org.springframework.integration.samples.helloworld.HelloWorldApp' + classpath = sourceSets.main.runtimeClasspath + } - task runPollerApp(type: JavaExec) { - main 'org.springframework.integration.samples.helloworld.PollerApp' - classpath = sourceSets.main.runtimeClasspath - } + task runPollerApp(type: JavaExec) { + main 'org.springframework.integration.samples.helloworld.PollerApp' + classpath = sourceSets.main.runtimeClasspath + } } project('http') { - description = 'HTTP Sample' + description = 'HTTP Sample' - apply plugin: 'war' - apply plugin: 'application' - apply plugin: "org.gretty" - apply plugin: 'eclipse-wtp' + apply plugin: 'war' + apply plugin: 'application' + apply plugin: "org.gretty" + apply plugin: 'eclipse-wtp' - mainClassName = 'org.springframework.integration.samples.http.HttpClientDemo' + mainClassName = 'org.springframework.integration.samples.http.HttpClientDemo' - dependencies { - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework.integration:spring-integration-mail" - compile "org.springframework:spring-webmvc" - compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" - compile "commons-io:commons-io:$commonsIoVersion" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework.integration:spring-integration-mail" + compile "org.springframework:spring-webmvc" + compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" + compile "commons-io:commons-io:$commonsIoVersion" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('splunk') { - description = 'Splunk Sample' + description = 'Splunk Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-core" - compile "org.springframework.integration:spring-integration-splunk:$springIntegrationSplunkVersion" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-core" + compile "org.springframework.integration:spring-integration-splunk:$springIntegrationSplunkVersion" + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - springBoot { - mainClassName = 'org.springframework.integration.samples.splunk.Application' - } + springBoot { + main = 'org.springframework.integration.samples.splunk.Application' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.splunk.Application' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.splunk.Application' + classpath = sourceSets.main.runtimeClasspath + } } project('kafka') { - description = 'Apache Kafka Sample' + description = 'Apache Kafka Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile("org.springframework.integration:spring-integration-kafka:$springIntegrationKafkaVersion") { - exclude group: 'org.slf4j' - } - compile "org.springframework.integration:spring-integration-core" - compile "org.springframework.kafka:spring-kafka:$springKafkaVersion" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile ("org.springframework.integration:spring-integration-kafka:$springIntegrationKafkaVersion") { + exclude group: 'org.slf4j' + } + compile "org.springframework.integration:spring-integration-core" + compile "org.springframework.kafka:spring-kafka:$springKafkaVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - springBoot { - mainClassName = 'org.springframework.integration.samples.kafka.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.kafka.Application' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.kafka.Application' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.kafka.Application' + classpath = sourceSets.main.runtimeClasspath + } } project('mqtt') { - description = 'MQTT Basic Sample' + description = 'MQTT Basic Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-mqtt" - testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile "org.springframework.integration:spring-integration-test" - } + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-stream" + compile "org.springframework.integration:spring-integration-mqtt" + testCompile 'org.springframework.boot:spring-boot-starter-test' + testCompile "org.springframework.integration:spring-integration-test" + } - springBoot { - mainClassName = 'org.springframework.integration.samples.mqtt.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.mqtt.Application' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.mqtt.Application' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.mqtt.Application' + classpath = sourceSets.main.runtimeClasspath + } - tasks.withType(JavaExec) { - standardInput = System.in - } + tasks.withType(JavaExec) { + standardInput = System.in + } } project('si4demo') { - description = 'Java Configuration/DSL Sample' + description = 'Java Configuration/DSL Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-mail" - compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework.integration:spring-integration-ip" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" - compile "com.rometools:rome:1.5.0" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-web' + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-mail" + compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework.integration:spring-integration-ip" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile "com.rometools:rome:1.5.0" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - springBoot { - mainClassName = 'org.springframework.integration.samples.si4demo.dsl.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.si4demo.dsl.Application' + } - tasks.withType(JavaExec) { - standardInput = System.in - } + tasks.withType(JavaExec) { + standardInput = System.in + } } project('cafe-dsl') { - description = 'Java DSL Cafe Sample' + description = 'Java DSL Cafe Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile project(":cafe-si") - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-core" + dependencies { + compile project(":cafe-si") + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-core" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - springBoot { - mainClassName = 'org.springframework.integration.samples.dsl.cafe.lambda.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.dsl.cafe.lambda.Application' + } - tasks.withType(JavaExec) { - standardInput = System.in - } + tasks.withType(JavaExec) { + standardInput = System.in + } } project('jdbc') { - description = 'JDBC Basic Sample' + description = 'JDBC Basic Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.jdbc.Main' + mainClassName = 'org.springframework.integration.samples.jdbc.Main' - dependencies { - compile "org.springframework.integration:spring-integration-jdbc" - compile "com.h2database:h2:$h2Version" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-jdbc" + compile "com.h2database:h2:$h2Version" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('jms') { - description = 'JMS Basic Sample' + description = 'JMS Basic Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.jms.Main' + mainClassName = 'org.springframework.integration.samples.jms.Main' - dependencies { - compile "javax.jms:javax.jms-api:$jmsApiVersion" - compile "org.springframework.integration:spring-integration-jms" - compile "org.springframework.integration:spring-integration-stream" - compile "org.apache.activemq:activemq-broker:$activeMqVersion" - compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { - exclude group: "org.springframework" - } - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + dependencies { + compile "javax.jms:javax.jms-api:$jmsApiVersion" + compile "org.springframework.integration:spring-integration-jms" + compile "org.springframework.integration:spring-integration-stream" + compile "org.apache.activemq:activemq-broker:$activeMqVersion" + compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { + exclude group: "org.springframework" + } + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" - } + testCompile "org.springframework.integration:spring-integration-test" + } } project('jmx') { - description = 'JMX Basic Sample' + description = 'JMX Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-jmx" - compile "org.springframework.integration:spring-integration-stream" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-jmx" + compile "org.springframework.integration:spring-integration-stream" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('jpa') { - description = 'JPA Basic Sample' + description = 'JPA Basic Sample' - apply plugin: 'application' - apply plugin: 'org.springframework.boot' + apply plugin: 'application' + apply plugin: 'org.springframework.boot' - mainClassName = 'org.springframework.integration.samples.jpa.Main' + mainClassName = 'org.springframework.integration.samples.jpa.Main' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-data-jpa' - compile "org.springframework.integration:spring-integration-jpa" - compile "com.h2database:h2:$h2Version" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-data-jpa' + compile "org.springframework.integration:spring-integration-jpa" + compile "com.h2database:h2:$h2Version" - runtime "org.springframework:spring-instrument" - runtime "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$jpa21ApiVersion" + runtime "org.springframework:spring-instrument" + runtime "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$jpa21ApiVersion" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - tasks.withType(JavaExec) { - standardInput = System.in - } + tasks.withType(JavaExec) { + standardInput = System.in + } } project('mail') { - description = 'Mail (IMAP + POP3) Sample' + description = 'Mail (IMAP + POP3) Sample' - dependencies { - compile "org.springframework.integration:spring-integration-mail" - compile "org.springframework:spring-context" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-mail" + compile "org.springframework:spring-context" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - task runGmailInboundPop3AdapterTestApp(type: JavaExec) { - main 'org.springframework.integration.samples.mail.imapidle.GmailInboundPop3AdapterTestApp' - classpath = sourceSets.main.runtimeClasspath - } + task runGmailInboundPop3AdapterTestApp(type: JavaExec) { + main 'org.springframework.integration.samples.mail.imapidle.GmailInboundPop3AdapterTestApp' + classpath = sourceSets.main.runtimeClasspath + } - task runGmailInboundImapIdleAdapterTestApp(type: JavaExec) { - main 'org.springframework.integration.samples.mail.imapidle.GmailInboundImapIdleAdapterTestApp' - classpath = sourceSets.main.runtimeClasspath - } + task runGmailInboundImapIdleAdapterTestApp(type: JavaExec) { + main 'org.springframework.integration.samples.mail.imapidle.GmailInboundImapIdleAdapterTestApp' + classpath = sourceSets.main.runtimeClasspath + } } project('mongodb') { - description = 'MongoDb Basic Sample' + description = 'MongoDb Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-mongodb" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - compile "org.mongodb:mongodb-driver-sync:$mongoDriverVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-mongodb" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + compile "org.mongodb:mongodb-driver-sync:$mongoDriverVersion" + } - task runMongoDbInboundAdapterDemo(type: JavaExec) { - main 'org.springframework.integration.samples.mongodb.inbound.MongoDbInboundAdapterDemo' - classpath = sourceSets.main.runtimeClasspath - } + task runMongoDbInboundAdapterDemo(type: JavaExec) { + main 'org.springframework.integration.samples.mongodb.inbound.MongoDbInboundAdapterDemo' + classpath = sourceSets.main.runtimeClasspath + } - task runMongoDbOutboundAdapterDemo(type: JavaExec) { - main 'org.springframework.integration.samples.mongodb.inbound.MongoDbOutboundAdapterDemo' - classpath = sourceSets.main.runtimeClasspath - } + task runMongoDbOutboundAdapterDemo(type: JavaExec) { + main 'org.springframework.integration.samples.mongodb.inbound.MongoDbOutboundAdapterDemo' + classpath = sourceSets.main.runtimeClasspath + } } project('oddeven') { - description = 'Odd-Even Sample' + description = 'Odd-Even Sample' - dependencies { - compile "org.springframework.integration:spring-integration-core" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-core" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - task runCronOddEvenDemo(type: JavaExec) { - main 'org.springframework.integration.samples.oddeven.CronOddEvenDemo' - classpath = sourceSets.main.runtimeClasspath - } + task runCronOddEvenDemo(type: JavaExec) { + main 'org.springframework.integration.samples.oddeven.CronOddEvenDemo' + classpath = sourceSets.main.runtimeClasspath + } - task runIntervalOddEvenDemoTestApp(type: JavaExec) { - main 'org.springframework.integration.samples.oddeven.IntervalOddEvenDemoTestApp' - classpath = sourceSets.main.runtimeClasspath - } + task runIntervalOddEvenDemoTestApp(type: JavaExec) { + main 'org.springframework.integration.samples.oddeven.IntervalOddEvenDemoTestApp' + classpath = sourceSets.main.runtimeClasspath + } } project('quote') { - description = 'Quote Sample' + description = 'Quote Sample' - dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-stream" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('sftp') { - description = 'SFTP Basic Sample' + description = 'SFTP Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-sftp" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.apache.sshd:sshd-sftp:$apacheSshdVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-sftp" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + testCompile "org.apache.sshd:sshd-sftp:$apacheSshdVersion" + } } project('tcp-amqp') { - description = 'TCP-AMQP Basic Sample' + description = 'TCP-AMQP Basic Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.tcpamqp.Main' + mainClassName = 'org.springframework.integration.samples.tcpamqp.Main' - dependencies { - compile "org.springframework.integration:spring-integration-amqp" - compile "org.springframework.integration:spring-integration-ip" - compile "org.slf4j:slf4j-api:$slf4jVersion" + dependencies { + compile "org.springframework.integration:spring-integration-amqp" + compile "org.springframework.integration:spring-integration-ip" + compile "org.slf4j:slf4j-api:$slf4jVersion" - runtime "org.apache.logging.log4j:log4j-core:$log4jVersion" - runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" - } + runtime "org.apache.logging.log4j:log4j-core:$log4jVersion" + runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" + } } project('tcp-broadcast') { - description = 'TCP Client Broadcast Sample' + description = 'TCP Client Broadcast Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ip" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-web' + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-ip" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - springBoot { - mainClassName = 'org.springframework.integration.samples.tcpbroadcast.TcpBroadcastApplication' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.tcpbroadcast.TcpBroadcastApplication' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.tcpbroadcast.TcpBroadcastApplication' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.tcpbroadcast.TcpBroadcastApplication' + classpath = sourceSets.main.runtimeClasspath + } } project('tcp-client-server') { - description = 'TCP Client Server Sample' + description = 'TCP Client Server Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.tcpclientserver.Main' + mainClassName = 'org.springframework.integration.samples.tcpclientserver.Main' - dependencies { - compile "org.springframework.integration:spring-integration-ip" - compile "commons-lang:commons-lang:$commonsLangVersion" - compile "org.springframework.integration:spring-integration-test" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-ip" + compile "commons-lang:commons-lang:$commonsLangVersion" + compile "org.springframework.integration:spring-integration-test" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('testcontainers-rabbitmq') { - description = 'Testcontainers RabbitMQ Sample' + description = 'Testcontainers RabbitMQ Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - springBoot { - mainClassName = 'org.springframework.integration.samples.testcontainersrabbitmq.TestcontainersRabbitmqApplication' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.testcontainersrabbitmq.TestcontainersRabbitmqApplication' + } - dependencies { - compile "org.springframework.boot:spring-boot-starter-integration" - compile "org.springframework.integration:spring-integration-amqp" - compile "org.springframework.boot:spring-boot-starter-json" + dependencies { + compile "org.springframework.boot:spring-boot-starter-integration" + compile "org.springframework.integration:spring-integration-amqp" + compile "org.springframework.boot:spring-boot-starter-json" - testCompile('org.springframework.boot:spring-boot-starter-test') { - exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' - } - testCompile 'org.springframework.integration:spring-integration-test' - testCompile 'org.springframework.amqp:spring-rabbit-test' - testCompile 'org.springframework.cloud:spring-cloud-starter' + testCompile('org.springframework.boot:spring-boot-starter-test') { + exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' + } + testCompile 'org.springframework.integration:spring-integration-test' + testCompile 'org.springframework.amqp:spring-rabbit-test' + testCompile 'org.springframework.cloud:spring-cloud-starter' - testCompile "org.testcontainers:junit-jupiter:$testcontainersVersion" - testCompile "com.playtika.testcontainers:embedded-rabbitmq:1.42" + testCompile "org.testcontainers:junit-jupiter:$testcontainersVersion" + testCompile "com.playtika.testcontainers:embedded-rabbitmq:1.42" - } + } - dependencyManagement { - imports { - mavenBom "org.springframework.cloud:spring-cloud-dependencies:$springCloudVersion" - } - } + dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-dependencies:$springCloudVersion" + } + } - test { - useJUnitPlatform() - } + test { + useJUnitPlatform() + } } project('testing-examples') { - description = 'Testing Examples' + description = 'Testing Examples' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.testing.externalgateway.Main' + mainClassName = 'org.springframework.integration.samples.testing.externalgateway.Main' - dependencies { - compile "org.springframework.integration:spring-integration-file" - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework.integration:spring-integration-ws" - compile "org.springframework:spring-webmvc" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + dependencies { + compile "org.springframework.integration:spring-integration-file" + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework.integration:spring-integration-ws" + compile "org.springframework:spring-webmvc" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" - } + testCompile "org.springframework.integration:spring-integration-test" + } } project('twitter') { - description = 'Twitter Basic Sample' + description = 'Twitter Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - test { - exclude '**/*Sample*' - } + test { + exclude '**/*Sample*' + } } project('ws-inbound-gateway') { - description = 'WS Inbound Gateway Sample' + description = 'WS Inbound Gateway Sample' - apply plugin: 'war' - apply plugin: "org.gretty" - apply plugin: 'eclipse-wtp' + apply plugin: 'war' + apply plugin: "org.gretty" + apply plugin: 'eclipse-wtp' - dependencies { - compile "org.springframework.integration:spring-integration-xml" - compile "org.springframework.integration:spring-integration-ws" - compile "org.springframework:spring-webmvc" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-xml" + compile "org.springframework.integration:spring-integration-ws" + compile "org.springframework:spring-webmvc" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - test { - exclude '**/InContainerTests*' - } + test { + exclude '**/InContainerTests*' + } } project('ws-outbound-gateway') { - description = 'WS Outbound Gateway Sample' + description = 'WS Outbound Gateway Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.ws.WebServiceDemoTestApp' + mainClassName = 'org.springframework.integration.samples.ws.WebServiceDemoTestApp' - dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-ws" + dependencies { + compile "org.springframework.integration:spring-integration-stream" + compile "org.springframework.integration:spring-integration-ws" // compile 'com.sun.xml.messaging.saaj:saaj-impl:1.3.19' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('xml') { - description = 'XML Sample' + description = 'XML Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.xml.BookOrderProcessingTestApp' + mainClassName = 'org.springframework.integration.samples.xml.BookOrderProcessingTestApp' - dependencies { - compile "org.springframework.integration:spring-integration-xml" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-xml" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('xmpp') { - description = 'XMPP Basic Sample' + description = 'XMPP Basic Sample' - dependencies { - compile "org.springframework.integration:spring-integration-xmpp" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-xmpp" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - test { - exclude '**/*Sample*' - } + test { + exclude '**/*Sample*' + } } project('async-gateway') { - description = 'Async Gateway Sample' + description = 'Async Gateway Sample' - dependencies { - compile "org.springframework.integration:spring-integration-core" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-core" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('dynamic-poller') { - description = 'Dynamic Poller Sample' + description = 'Dynamic Poller Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.poller.Main' + mainClassName = 'org.springframework.integration.samples.poller.Main' - dependencies { - compile "org.springframework.integration:spring-integration-core" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-core" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('errorhandling') { - description = 'Error Handling Sample' + description = 'Error Handling Sample' - dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-stream" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('file-processing') { - description = 'File Processing Sample' + description = 'File Processing Sample' - dependencies { - compile "org.springframework.integration:spring-integration-file" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-file" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('mail-attachments') { - description = 'Mail Attachment Sample' + description = 'Mail Attachment Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.mailattachments.Main' + mainClassName = 'org.springframework.integration.samples.mailattachments.Main' - dependencies { - compile "org.springframework.integration:spring-integration-mail" - compile "org.springframework.integration:spring-integration-file" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" - compile "commons-io:commons-io:$commonsIoVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + dependencies { + compile "org.springframework.integration:spring-integration-mail" + compile "org.springframework.integration:spring-integration-file" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile "commons-io:commons-io:$commonsIoVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" - testCompile "org.subethamail:subethasmtp-wiser:$subethasmtpVersion" + testCompile "org.springframework.integration:spring-integration-test" + testCompile "org.subethamail:subethasmtp-wiser:$subethasmtpVersion" - } + } } project('monitoring') { - description = 'Monitoring Application' + description = 'Monitoring Application' - apply plugin: 'war' - apply plugin: "org.gretty" - apply plugin: 'application' - apply plugin: 'eclipse-wtp' + apply plugin: 'war' + apply plugin: "org.gretty" + apply plugin: 'application' + apply plugin: 'eclipse-wtp' - mainClassName = 'org.springintegration.SpringIntegrationTest' + mainClassName = 'org.springintegration.SpringIntegrationTest' - dependencies { - compile "org.springframework.integration:spring-integration-jmx" - compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" - compile "org.springframework.integration:spring-integration-groovy" - compile "org.springframework:spring-webmvc" - compile "javax.servlet:jstl:$jstlVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-jmx" + compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" + compile "org.springframework.integration:spring-integration-groovy" + compile "org.springframework:spring-webmvc" + compile "javax.servlet:jstl:$jstlVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('multipart-http') { - description = 'HTTP Multipart Demo' + description = 'HTTP Multipart Demo' - apply plugin: 'war' - apply plugin: "org.gretty" - apply plugin: 'eclipse-wtp' + apply plugin: 'war' + apply plugin: "org.gretty" + apply plugin: 'eclipse-wtp' - dependencies { - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework:spring-webmvc" - compile 'com.fasterxml.jackson.core:jackson-databind' - compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" - compile "commons-io:commons-io:$commonsIoVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework:spring-webmvc" + compile 'com.fasterxml.jackson.core:jackson-databind' + compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" + compile "commons-io:commons-io:$commonsIoVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('rest-http') { - description = 'Spring Integration Rest HTTP Path Usage Demo' + description = 'Spring Integration Rest HTTP Path Usage Demo' - apply plugin: 'war' - apply plugin: "org.gretty" - apply plugin: 'eclipse-wtp' + apply plugin: 'war' + apply plugin: "org.gretty" + apply plugin: 'eclipse-wtp' - dependencies { - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework:spring-webmvc" - compile "org.springframework:spring-oxm" - compile "org.springframework:spring-tx" - compile "org.springframework:spring-jdbc" - compile "org.springframework:spring-context" - compile "org.springframework:spring-aop" - compile 'com.fasterxml.jackson.core:jackson-databind' - compile "org.springframework.security:spring-security-web:$springSecurityVersion" - compile "org.springframework.security:spring-security-config:$springSecurityVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework:spring-webmvc" + compile "org.springframework:spring-oxm" + compile "org.springframework:spring-tx" + compile "org.springframework:spring-jdbc" + compile "org.springframework:spring-context" + compile "org.springframework:spring-aop" + compile 'com.fasterxml.jackson.core:jackson-databind' + compile "org.springframework.security:spring-security-web:$springSecurityVersion" + compile "org.springframework.security:spring-security-config:$springSecurityVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - test { - exclude '**/RestHttpClientTest*' - } + test { + exclude '**/RestHttpClientTest*' + } } project('retry-and-more') { - description = 'Retry and More Sample' - - dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-amqp" - compile "org.springframework.integration:spring-integration-ftp" - compile "org.springframework.integration:spring-integration-file" - compile("org.mockito:mockito-core:$mockitoVersion") { - exclude group: 'org.hamcrest' - } - compile "org.hamcrest:hamcrest-all:$hamcrestVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } - - task runCircuitBreakerDemo(type: JavaExec) { - main 'org.springframework.integration.samples.advice.CircuitBreakerDemo' - classpath = sourceSets.main.runtimeClasspath - } - - task runFileTransferDeleteAfterSuccessDemo(type: JavaExec) { - main 'org.springframework.integration.samples.advice.FileTransferDeleteAfterSuccessDemo' - classpath = sourceSets.main.runtimeClasspath - } - - task runFileTransferRenameAfterFailureDemo(type: JavaExec) { - main 'org.springframework.integration.samples.advice.FileTransferRenameAfterFailureDemo' - classpath = sourceSets.main.runtimeClasspath - } - - task runStatefulRetryDemo(type: JavaExec) { - main 'org.springframework.integration.samples.advice.StatefulRetryDemo' - classpath = sourceSets.main.runtimeClasspath - } - - task runStatelessRetryDemo(type: JavaExec) { - main 'org.springframework.integration.samples.advice.StatelessRetryDemo' - classpath = sourceSets.main.runtimeClasspath - } + description = 'Retry and More Sample' + + dependencies { + compile "org.springframework.integration:spring-integration-stream" + compile "org.springframework.integration:spring-integration-amqp" + compile "org.springframework.integration:spring-integration-ftp" + compile "org.springframework.integration:spring-integration-file" + compile("org.mockito:mockito-core:$mockitoVersion") { + exclude group: 'org.hamcrest' + } + compile "org.hamcrest:hamcrest-all:$hamcrestVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } + + task runCircuitBreakerDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.CircuitBreakerDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runFileTransferDeleteAfterSuccessDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.FileTransferDeleteAfterSuccessDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runFileTransferRenameAfterFailureDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.FileTransferRenameAfterFailureDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runStatefulRetryDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.StatefulRetryDemo' + classpath = sourceSets.main.runtimeClasspath + } + + task runStatelessRetryDemo(type: JavaExec) { + main 'org.springframework.integration.samples.advice.StatelessRetryDemo' + classpath = sourceSets.main.runtimeClasspath + } } project('splitter-aggregator-reaper') { - description = 'Splitter-Aggregator-Reaper Sample' + description = 'Splitter-Aggregator-Reaper Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.splitteraggregator.Main' + mainClassName = 'org.springframework.integration.samples.splitteraggregator.Main' - dependencies { - compile "org.springframework.integration:spring-integration-core" - compile "javax.inject:javax.inject:$javaxInjectVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-core" + compile "javax.inject:javax.inject:$javaxInjectVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('stored-procedures-derby') { - description = 'Derby Stored Procedures Sample' + description = 'Derby Stored Procedures Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' + mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' - dependencies { - compile "org.springframework.integration:spring-integration-jdbc" - compile "org.apache.derby:derby:$derbyVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-jdbc" + compile "org.apache.derby:derby:$derbyVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('stored-procedures-oracle') { - description = 'Oracle Stored Procedures Sample' + description = 'Oracle Stored Procedures Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' + mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' - repositories { - mavenLocal() //Oracle JDBC Driver - } + repositories { + mavenLocal() //Oracle JDBC Driver + } - dependencies { - compile "org.springframework.integration:spring-integration-jdbc" + dependencies { + compile "org.springframework.integration:spring-integration-jdbc" //TODO Uncomment it when the ojdbc6 artifact is available in the mavenLocal() // compile "com.oracle:ojdbc6:$oracleDriverVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - test { - exclude '**/StringConversionServiceTest*' - } + test { + exclude '**/StringConversionServiceTest*' + } } project('stored-procedures-ms') { - description = 'MS SQLServer Stored Procedures Sample' + description = 'MS SQLServer Stored Procedures Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' + mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' - dependencies { - compile "org.springframework.integration:spring-integration-jdbc" - compile "net.sourceforge.jtds:jtds:$jtdsVersion" - compile "c3p0:c3p0:$c3p0Version" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-jdbc" + compile "net.sourceforge.jtds:jtds:$jtdsVersion" + compile "c3p0:c3p0:$c3p0Version" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } - test { - exclude '**/StringConversionServiceTest*' - } + test { + exclude '**/StringConversionServiceTest*' + } } project('stored-procedures-postgresql') { - description = 'PostgreSQL Stored Procedures Sample' + description = 'PostgreSQL Stored Procedures Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' + mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' - dependencies { - compile "org.springframework.integration:spring-integration-jdbc" - compile "org.postgresql:postgresql:$postgresVersion" - compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" - compile "commons-pool:commons-pool:$commonsPoolVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-jdbc" + compile "org.postgresql:postgresql:$postgresVersion" + compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" + compile "commons-pool:commons-pool:$commonsPoolVersion" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('tcp-async-bi-directional') { - description = 'Bi-Directional TCP Sample' + description = 'Bi-Directional TCP Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ip" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-ip" - testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile "org.springframework.integration:spring-integration-test" - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + testCompile "org.springframework.integration:spring-integration-test" + } - springBoot { - mainClassName = 'org.springframework.integration.samples.tcpasyncbi.TcpAsyncBiDirectionalApplication' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.tcpasyncbi.TcpAsyncBiDirectionalApplication' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.tcpasyncbi.TcpAsyncBiDirectionalApplication' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.tcpasyncbi.TcpAsyncBiDirectionalApplication' + classpath = sourceSets.main.runtimeClasspath + } - test { - useJUnitPlatform() - } + test { + useJUnitPlatform() + } } project('tcp-client-server-multiplex') { - description = 'TCP Client Server Multiplexing Sample' + description = 'TCP Client Server Multiplexing Sample' - dependencies { - compile "org.springframework.integration:spring-integration-ip" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + dependencies { + compile "org.springframework.integration:spring-integration-ip" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" - } + testCompile "org.springframework.integration:spring-integration-test" + } } project('travel') { - description = 'Travel Services Sample' + description = 'Travel Services Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.travel.Main' + mainClassName = 'org.springframework.integration.samples.travel.Main' - dependencies { - compile "org.springframework.integration:spring-integration-ws" - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework:spring-web" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-ws" + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework:spring-web" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('tx-synch') { - description = 'Transaction Synchronization Sample' + description = 'Transaction Synchronization Sample' - apply plugin: 'application' + apply plugin: 'application' - mainClassName = 'org.springframework.integration.samples.advice.TransactionSynchronizationDemo' + mainClassName = 'org.springframework.integration.samples.advice.TransactionSynchronizationDemo' - dependencies { - compile "org.springframework.integration:spring-integration-jdbc" - compile "org.springframework.integration:spring-integration-file" - compile "com.h2database:h2:$h2Version" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - } + dependencies { + compile "org.springframework.integration:spring-integration-jdbc" + compile "org.springframework.integration:spring-integration-file" + compile "com.h2database:h2:$h2Version" + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + } } project('web-sockets') { - description = 'Web Sockets Basic Sample' + description = 'Web Sockets Basic Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-websocket' - compile "org.springframework.integration:spring-integration-websocket" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-websocket' + compile "org.springframework.integration:spring-integration-websocket" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - springBoot { - mainClassName = 'org.springframework.integration.samples.websocket.standard.server.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.websocket.standard.server.Application' + } - tasks.withType(JavaExec) { - standardInput = System.in - } + tasks.withType(JavaExec) { + standardInput = System.in + } } project('stomp-chat') { - description = 'Web Sockets Stomp Chat Sample' + description = 'Web Sockets Stomp Chat Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-websocket' - compile "org.springframework.integration:spring-integration-websocket" - compile "org.springframework.integration:spring-integration-event" - compile "org.springframework.integration:spring-integration-groovy" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-websocket' + compile "org.springframework.integration:spring-integration-websocket" + compile "org.springframework.integration:spring-integration-event" + compile "org.springframework.integration:spring-integration-groovy" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - springBoot { - mainClassName = 'org.springframework.integration.samples.chat.stomp.server.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.chat.stomp.server.Application' + } - tasks.withType(JavaExec) { - standardInput = System.in - } + tasks.withType(JavaExec) { + standardInput = System.in + } } project('kafka-dsl') { - description = 'Java DSL Kafka Sample' + description = 'Java DSL Kafka Sample' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-core" - compile("org.springframework.integration:spring-integration-kafka:$springIntegrationKafkaVersion") - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } - springBoot { - mainClassName = 'org.springframework.integration.samples.dsl.kafka.Application' - } + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-core" + compile ("org.springframework.integration:spring-integration-kafka:$springIntegrationKafkaVersion") + compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.dsl.kafka.Application' - classpath = sourceSets.main.runtimeClasspath - } + springBoot { + mainClassName = 'org.springframework.integration.samples.dsl.kafka.Application' + } - tasks.withType(JavaExec) { - standardInput = System.in - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.dsl.kafka.Application' + classpath = sourceSets.main.runtimeClasspath + } + + tasks.withType(JavaExec) { + standardInput = System.in + } } project('file-split-ftp') { - description = 'File Split FTP' + description = 'File Split FTP' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ftp" - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework.integration:spring-integration-mail" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-web' + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-ftp" + compile "org.springframework.integration:spring-integration-http" + compile "org.springframework.integration:spring-integration-mail" + compile "javax.mail:javax.mail-api:$javaxMailVersion" + compile "com.sun.mail:javax.mail:$javaxMailVersion" - testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile "org.springframework.integration:spring-integration-test" - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + testCompile "org.springframework.integration:spring-integration-test" + } - springBoot { - mainClassName = 'org.springframework.integration.samples.filesplit.Application' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.filesplit.Application' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.filesplit.Application' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.filesplit.Application' + classpath = sourceSets.main.runtimeClasspath + } } project('dynamic-tcp-client') { - description = 'Dynamic TCP Client' + description = 'Dynamic TCP Client' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ip" + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-ip" - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - springBoot { - mainClassName = 'org.springframework.integration.samples.dynamictcp.DynamicTcpClientApplication' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.dynamictcp.DynamicTcpClientApplication' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.dynamictcp.DynamicTcpClientApplication' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.dynamictcp.DynamicTcpClientApplication' + classpath = sourceSets.main.runtimeClasspath + } } project('tcp-with-headers') { - description = 'TCP Send/Receive with headers' + description = 'TCP Send/Receive with headers' - apply plugin: 'org.springframework.boot' + apply plugin: 'org.springframework.boot' - dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ip" - compile 'com.fasterxml.jackson.core:jackson-databind' + dependencies { + compile 'org.springframework.boot:spring-boot-starter-integration' + compile "org.springframework.integration:spring-integration-ip" + compile 'com.fasterxml.jackson.core:jackson-databind' - testCompile 'org.springframework.boot:spring-boot-starter-test' - } + testCompile 'org.springframework.boot:spring-boot-starter-test' + } - springBoot { - mainClassName = 'org.springframework.integration.samples.tcpheaders.TcpWithHeadersApplication' - } + springBoot { + mainClassName = 'org.springframework.integration.samples.tcpheaders.TcpWithHeadersApplication' + } - task run(type: JavaExec) { - main 'org.springframework.integration.samples.tcpheaders.TcpWithHeadersApplication' - classpath = sourceSets.main.runtimeClasspath - } + task run(type: JavaExec) { + main 'org.springframework.integration.samples.tcpheaders.TcpWithHeadersApplication' + classpath = sourceSets.main.runtimeClasspath + } - tasks.withType(JavaExec) { - standardInput = System.in - } + tasks.withType(JavaExec) { + standardInput = System.in + } } sonarqube { - properties { - property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec" - property "sonar.links.homepage", linkHomepage - property "sonar.links.ci", linkCi - property "sonar.links.issue", linkIssue - property "sonar.links.scm", linkScmUrl - property "sonar.links.scm_dev", linkScmDevConnection - property "sonar.java.coveragePlugin", "jacoco" - } + properties { + property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec" + property "sonar.links.homepage", linkHomepage + property "sonar.links.ci", linkCi + property "sonar.links.issue", linkIssue + property "sonar.links.scm", linkScmUrl + property "sonar.links.scm_dev", linkScmDevConnection + property "sonar.java.coveragePlugin", "jacoco" + } } From a73500b4d4ad124395f55902364143f2b2f62b79 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 23 Jun 2020 10:41:07 -0400 Subject: [PATCH 241/356] Fix one missed `springBoot` config --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9ea57c824..2e32cd270 100644 --- a/build.gradle +++ b/build.gradle @@ -598,7 +598,7 @@ project('splunk') { } springBoot { - main = 'org.springframework.integration.samples.splunk.Application' + mainClassName = 'org.springframework.integration.samples.splunk.Application' } task run(type: JavaExec) { From cb9f6eb0a5e3808321cd2fa4ee19a21256beee6b Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 26 Jun 2020 15:43:48 -0400 Subject: [PATCH 242/356] Fix Barrier with Boot 2.3 - deprecated property was removed in Boot 2.3, but there was no test to verify operation. --- .../samples/barrier/Application.java | 7 ++++-- .../src/main/resources/application.properties | 2 +- .../samples/barrier/ApplicationTests.java | 22 ++++++++++++++++++- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java b/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java index 17ead8d4a..44fdfd07e 100644 --- a/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java +++ b/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java @@ -37,6 +37,11 @@ public class Application { public static void main(String[] args) throws Exception { ConfigurableApplicationContext server = SpringApplication.run(Application.class, args); + runClient(args); + server.close(); + } + + static void runClient(String[] args) { SpringApplication application = new SpringApplicationBuilder() .web(WebApplicationType.NONE) .bannerMode(Mode.OFF) @@ -52,8 +57,6 @@ public static void main(String[] args) throws Exception { String reply = requestGateway.echo(request); System.out.println("\n\n++++++++++++ Replied with: " + reply + " ++++++++++++\n"); client.close(); - server.close(); - System.exit(0); // AMQP-519 } diff --git a/basic/barrier/src/main/resources/application.properties b/basic/barrier/src/main/resources/application.properties index 8ef9e7d71..4b0409348 100644 --- a/basic/barrier/src/main/resources/application.properties +++ b/basic/barrier/src/main/resources/application.properties @@ -1,4 +1,4 @@ spring.output.ansi.enabled=always -spring.rabbitmq.publisher-confirms=true +spring.rabbitmq.publisher-confirm-type=correlated spring.rabbitmq.publisher-returns=true diff --git a/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java b/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java index de68fc341..6156ebe40 100644 --- a/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java +++ b/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java @@ -16,10 +16,20 @@ package org.springframework.integration.samples.barrier; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.Collections; + import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.integration.channel.AbstractMessageChannel; +import org.springframework.integration.channel.QueueChannel; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.support.GenericMessage; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** @@ -30,8 +40,18 @@ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = Application.class) public class ApplicationTests { + @Autowired + MessageChannel receiveChannel; + + @Autowired + AbstractMessageChannel release; + @Test - public void contextLoads() { + public void contextLoads() throws InterruptedException { + QueueChannel replies = new QueueChannel(); + receiveChannel.send( + new GenericMessage<>("A,B,C", Collections.singletonMap(MessageHeaders.REPLY_CHANNEL, replies))); + assertThat(replies.receive(10_000)).isNotNull(); } } From 21e44479ee3e08fae517ef741bb8f91ecb19fc0d Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 29 Jun 2020 11:00:32 -0400 Subject: [PATCH 243/356] Fix deprecation warnings * Use `MatcherAssert.assertThat()` instead of deprecated `Assert.assertThat()` * Use `IntegrationFlows.fromSupplier(Supplier)` instead of removed `IntegrationFlows.from(Supplier)` * Use `org.springframework.integration:spring-integration-test` throughout the project for more testing utilities --- advanced/advanced-testing-examples/pom.xml | 10 +++---- advanced/dynamic-ftp/pom.xml | 10 +++---- .../ftp/FtpOutboundChannelAdapterSample.java | 2 +- advanced/dynamic-tcp-client/pom.xml | 14 +++++----- advanced/pom.xml | 2 +- applications/cafe-scripted/pom.xml | 14 +++++----- .../integration/samples/cafe/ScriptTests.java | 1 + applications/cafe/cafe-amqp/pom.xml | 12 ++++----- applications/cafe/cafe-jms/pom.xml | 12 ++++----- applications/cafe/cafe-si/pom.xml | 10 +++---- applications/cafe/pom.xml | 2 +- applications/file-split-ftp/pom.xml | 25 +++++------------ applications/loan-broker/pom.xml | 10 +++---- applications/loanshark/pom.xml | 10 +++---- applications/pom.xml | 2 +- applications/stomp-chat/pom.xml | 14 +++++----- basic/amqp/pom.xml | 10 +++---- basic/barrier/pom.xml | 14 +++++----- basic/control-bus/pom.xml | 10 +++---- basic/enricher/pom.xml | 10 +++---- basic/feed/pom.xml | 10 +++---- basic/file/pom.xml | 10 +++---- basic/ftp/pom.xml | 21 ++++----------- basic/helloworld/pom.xml | 10 +++---- basic/http/pom.xml | 10 +++---- basic/jdbc/pom.xml | 10 +++---- basic/jms/pom.xml | 17 +++--------- basic/jmx/pom.xml | 10 +++---- basic/jpa/pom.xml | 14 +++++----- basic/kafka/pom.xml | 27 +++++-------------- basic/mail/pom.xml | 10 +++---- basic/mongodb/pom.xml | 10 +++---- basic/mqtt/pom.xml | 25 +++++------------ basic/oddeven/pom.xml | 10 +++---- basic/pom.xml | 2 +- basic/quote/pom.xml | 10 +++---- basic/sftp/pom.xml | 10 +++---- .../samples/sftp/SftpTestUtils.java | 2 +- basic/splunk/pom.xml | 14 +++++----- basic/tcp-amqp/pom.xml | 10 +++---- basic/tcp-broadcast/pom.xml | 14 +++++----- basic/tcp-client-server/pom.xml | 17 +++--------- basic/tcp-with-headers/pom.xml | 14 +++++----- basic/testing-examples/pom.xml | 17 +++--------- .../CommaDelimitedAggregatorTests.java | 14 +++++----- .../testing/filter/PetFilterTests.java | 26 +++++++++--------- .../samples/testing/gateway/GatewayTests.java | 14 +++++----- .../testing/router/PetRouterTests.java | 24 ++++++++--------- .../splitter/CommaDelimitedSplitterTests.java | 14 +++++----- basic/twitter/pom.xml | 10 +++---- basic/web-sockets/pom.xml | 14 +++++----- .../websocket/standard/ApplicationTests.java | 2 +- basic/ws-inbound-gateway/pom.xml | 10 +++---- .../samples/ws/InContainerTests.java | 2 +- .../samples/ws/InboundGatewayTests.java | 2 +- basic/ws-outbound-gateway/pom.xml | 10 +++---- basic/xml/pom.xml | 10 +++---- basic/xmpp/pom.xml | 10 +++---- build.gradle | 23 +++++++--------- dsl/cafe-dsl/pom.xml | 16 +++++------ dsl/kafka-dsl/pom.xml | 15 +++++------ dsl/pom.xml | 10 +++---- dsl/si4demo/pom.xml | 14 +++++----- gradle.properties | 4 +-- intermediate/async-gateway/pom.xml | 10 +++---- .../{MonoTest.java => MonoGatewayTests.java} | 10 +++---- intermediate/dynamic-poller/pom.xml | 10 +++---- intermediate/errorhandling/pom.xml | 10 +++---- intermediate/file-processing/pom.xml | 10 +++---- intermediate/mail-attachments/pom.xml | 17 +++--------- intermediate/monitoring/pom.xml | 10 +++---- intermediate/multipart-http/pom.xml | 10 +++---- intermediate/pom.xml | 2 +- intermediate/rest-http/pom.xml | 14 +++++----- intermediate/retry-and-more/pom.xml | 10 +++---- .../splitter-aggregator-reaper/pom.xml | 10 +++---- intermediate/stored-procedures-derby/pom.xml | 10 +++---- intermediate/stored-procedures-ms/pom.xml | 10 +++---- intermediate/stored-procedures-oracle/pom.xml | 10 +++---- .../stored-procedures-postgresql/pom.xml | 10 +++---- intermediate/tcp-async-bi-directional/pom.xml | 25 +++++------------ .../TcpAsyncBiDirectionalApplication.java | 6 ++--- .../tcp-client-server-multiplex/pom.xml | 17 +++--------- .../TcpClientServerDemoTest.java | 2 +- intermediate/testcontainers-rabbitmq/pom.xml | 27 ++++++------------- intermediate/travel/pom.xml | 10 +++---- intermediate/tx-synch/pom.xml | 10 +++---- 87 files changed, 438 insertions(+), 564 deletions(-) rename intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/{MonoTest.java => MonoGatewayTests.java} (93%) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index b25ccbe6d..84284e4b4 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples advanced-testing-examples - 5.3.0.RELEASE + 5.4.0 Advanced Testing Examples Advanced Testing Examples https://projects.spring.io/spring-integration @@ -146,8 +146,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 148e6ef7e..8f9bdf91c 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-ftp - 5.3.0.RELEASE + 5.4.0 Dynamic FTP Demo Dynamic FTP Demo https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java index efbc9a84d..f9013df8d 100644 --- a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java +++ b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java @@ -15,9 +15,9 @@ */ package org.springframework.integration.samples.ftp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.io.File; diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 1508d2550..47341e7af 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples dynamic-tcp-client - 5.3.0.RELEASE + 5.4.0 Dynamic TCP Client Dynamic TCP Client https://projects.spring.io/spring-integration @@ -127,8 +127,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -174,7 +174,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/advanced/pom.xml b/advanced/pom.xml index 8eee9d06d..58310766b 100644 --- a/advanced/pom.xml +++ b/advanced/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples advanced - 5.3.0.RELEASE + 5.4.0 https://projects.spring.io/spring-integration SpringIO diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index b3d244af7..158a0d5b0 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-scripted - 5.3.0.RELEASE + 5.4.0 Cafe Sample (Scripted Implementation) Cafe Sample (Scripted Implementation) https://projects.spring.io/spring-integration @@ -101,8 +101,8 @@ org.jruby - jruby - 1.7.12 + jruby-complete + 9.2.11.1 compile @@ -192,8 +192,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -227,14 +227,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java index fd8a8ebd7..0bad12503 100644 --- a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java +++ b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java @@ -30,6 +30,7 @@ * */ public class ScriptTests { + @Test public void testRuby() { ScriptExecutor executor = ScriptExecutorFactory.getScriptExecutor("ruby"); diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 9afafa348..f83ba3fae 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-amqp - 5.3.0.RELEASE + 5.4.0 Cafe - With AMQP Message Broker Cafe - With AMQP Message Broker https://projects.spring.io/spring-integration @@ -58,7 +58,7 @@ org.springframework.integration.samples cafe-si - 5.3.0.RELEASE + 5.4.0 compile @@ -135,8 +135,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 353faf609..e209452de 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-jms - 5.3.0.RELEASE + 5.4.0 Cafe - With JMS Message Broker Cafe - With JMS Message Broker https://projects.spring.io/spring-integration @@ -58,7 +58,7 @@ org.springframework.integration.samples cafe-si - 5.3.0.RELEASE + 5.4.0 compile @@ -175,8 +175,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 3f2271852..cf2766e7b 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-si - 5.3.0.RELEASE + 5.4.0 Cafe - Pure Spring Integration Cafe - Pure Spring Integration https://projects.spring.io/spring-integration @@ -134,8 +134,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -169,14 +169,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index 621052fc7..431148b00 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe - 5.3.0.RELEASE + 5.4.0 https://projects.spring.io/spring-integration SpringIO diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 4b00e0b97..af031950a 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples file-split-ftp - 5.3.0.RELEASE + 5.4.0 File Split FTP File Split FTP https://projects.spring.io/spring-integration @@ -184,8 +184,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -205,17 +205,6 @@ - - org.springframework.integration - spring-integration-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - @@ -242,7 +231,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -256,14 +245,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 64e7a378a..272a078db 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loan-broker - 5.3.0.RELEASE + 5.4.0 Loan Broker Sample Loan Broker Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 85a7d9e46..93a9aff6e 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loanshark - 5.3.0.RELEASE + 5.4.0 Loan Shark Sample Loan Shark Sample https://projects.spring.io/spring-integration @@ -416,8 +416,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -451,14 +451,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/applications/pom.xml b/applications/pom.xml index dd331756b..587f54aa0 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples applications - 5.3.0.RELEASE + 5.4.0 https://projects.spring.io/spring-integration SpringIO diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index c4cab173a..60ff5408d 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples stomp-chat - 5.3.0.RELEASE + 5.4.0 Web Sockets Stomp Chat Sample Web Sockets Stomp Chat Sample https://projects.spring.io/spring-integration @@ -149,8 +149,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -196,7 +196,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 6e1d45d76..f6a8679d3 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples amqp - 5.3.0.RELEASE + 5.4.0 AMQP Basic Sample AMQP Basic Sample https://projects.spring.io/spring-integration @@ -146,8 +146,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 2b90e30d7..64d697fc4 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples barrier - 5.3.0.RELEASE + 5.4.0 Barrier Sample Barrier Sample https://projects.spring.io/spring-integration @@ -160,8 +160,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -207,7 +207,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -221,14 +221,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index ce935e6c1..84d8b76df 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples control-bus - 5.3.0.RELEASE + 5.4.0 Control Bus Basic Sample Control Bus Basic Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index c159f8e12..d9506df4e 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples enricher - 5.3.0.RELEASE + 5.4.0 Enricher Basic Sample Enricher Basic Sample https://projects.spring.io/spring-integration @@ -135,8 +135,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 6c2202bd3..3b8a05c8c 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples feed - 5.3.0.RELEASE + 5.4.0 Feed (RSS/ATOM) Basic Sample Feed (RSS/ATOM) Basic Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index cd45801ab..6fb657ff8 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file - 5.3.0.RELEASE + 5.4.0 File Copy Basic Sample File Copy Basic Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 620486577..a4298a3f2 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ftp - 5.3.0.RELEASE + 5.4.0 FTP Basic Sample FTP Basic Sample https://projects.spring.io/spring-integration @@ -159,8 +159,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -181,17 +181,6 @@ - - org.springframework.integration - spring-integration-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - @@ -217,14 +206,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 9874fdb75..6ab34871f 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples helloworld - 5.3.0.RELEASE + 5.4.0 Hello World Sample Hello World Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index e69a35df0..3e0b4da43 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples http - 5.3.0.RELEASE + 5.4.0 HTTP Sample HTTP Sample https://projects.spring.io/spring-integration @@ -193,8 +193,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -228,14 +228,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index a725a2f66..fb9c12887 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jdbc - 5.3.0.RELEASE + 5.4.0 JDBC Basic Sample JDBC Basic Sample https://projects.spring.io/spring-integration @@ -135,8 +135,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 22b4a4abf..aa3372ee3 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jms - 5.3.0.RELEASE + 5.4.0 JMS Basic Sample JMS Basic Sample https://projects.spring.io/spring-integration @@ -173,17 +173,6 @@ - - org.springframework - spring-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - org.springframework.integration spring-integration-test @@ -220,14 +209,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index e743ae7d5..840432953 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jmx - 5.3.0.RELEASE + 5.4.0 JMX Basic Sample JMX Basic Sample https://projects.spring.io/spring-integration @@ -134,8 +134,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -169,14 +169,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index adfaefe8e..38d16387a 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples jpa - 5.3.0.RELEASE + 5.4.0 JPA Basic Sample JPA Basic Sample https://projects.spring.io/spring-integration @@ -162,8 +162,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -209,7 +209,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -223,14 +223,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index ca0d14b0b..2d1e7a06b 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples kafka - 5.3.0.RELEASE + 5.4.0 Apache Kafka Sample Apache Kafka Sample https://projects.spring.io/spring-integration @@ -74,7 +74,6 @@ org.springframework.integration spring-integration-kafka - 3.3.0.RELEASE compile @@ -98,18 +97,6 @@ - - org.springframework.kafka - spring-kafka - 2.5.2.RELEASE - compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - org.apache.logging.log4j log4j-core @@ -167,8 +154,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -214,7 +201,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -228,14 +215,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index ad615588e..1b96d8807 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail - 5.3.0.RELEASE + 5.4.0 Mail (IMAP + POP3) Sample Mail (IMAP + POP3) Sample https://projects.spring.io/spring-integration @@ -158,8 +158,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -193,14 +193,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 3c807b0c5..5de5c9ee7 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mongodb - 5.3.0.RELEASE + 5.4.0 MongoDb Basic Sample MongoDb Basic Sample https://projects.spring.io/spring-integration @@ -135,8 +135,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 7d224fa27..95d772ef3 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples mqtt - 5.3.0.RELEASE + 5.4.0 MQTT Basic Sample MQTT Basic Sample https://projects.spring.io/spring-integration @@ -138,8 +138,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -159,17 +159,6 @@ - - org.springframework.integration - spring-integration-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - @@ -196,7 +185,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -210,14 +199,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 0557e1be3..163e41b50 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples oddeven - 5.3.0.RELEASE + 5.4.0 Odd-Even Sample Odd-Even Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/pom.xml b/basic/pom.xml index 191fff615..1307233c2 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples basic - 5.3.0.RELEASE + 5.4.0 https://projects.spring.io/spring-integration SpringIO diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index cf8c54706..af228ef3d 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples quote - 5.3.0.RELEASE + 5.4.0 Quote Sample Quote Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index cbbc26af8..2c02db926 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples sftp - 5.3.0.RELEASE + 5.4.0 SFTP Basic Sample SFTP Basic Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpTestUtils.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpTestUtils.java index b91359e8d..bbaef959f 100644 --- a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpTestUtils.java +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpTestUtils.java @@ -16,8 +16,8 @@ package org.springframework.integration.samples.sftp; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertThat; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 88872a586..b17404268 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples splunk - 5.3.0.RELEASE + 5.4.0 Splunk Sample Splunk Sample https://projects.spring.io/spring-integration @@ -139,8 +139,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -186,7 +186,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 7f00419ed..f3fdf8b9a 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-amqp - 5.3.0.RELEASE + 5.4.0 TCP-AMQP Basic Sample TCP-AMQP Basic Sample https://projects.spring.io/spring-integration @@ -158,8 +158,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -193,14 +193,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 45b3ad4f0..da1744ed3 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples tcp-broadcast - 5.3.0.RELEASE + 5.4.0 TCP Client Broadcast Sample TCP Client Broadcast Sample https://projects.spring.io/spring-integration @@ -138,8 +138,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -185,7 +185,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 05c04ecc5..dd7739447 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server - 5.3.0.RELEASE + 5.4.0 TCP Client Server Sample TCP Client Server Sample https://projects.spring.io/spring-integration @@ -145,17 +145,6 @@ - - org.springframework - spring-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - @@ -181,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index f3e59210d..0ea00637b 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples tcp-with-headers - 5.3.0.RELEASE + 5.4.0 TCP Send/Receive with headers TCP Send/Receive with headers https://projects.spring.io/spring-integration @@ -138,8 +138,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -185,7 +185,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 047ecd82d..796b6ff68 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testing-examples - 5.3.0.RELEASE + 5.4.0 Testing Examples Testing Examples https://projects.spring.io/spring-integration @@ -155,17 +155,6 @@ - - org.springframework - spring-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - org.springframework.integration spring-integration-test @@ -202,14 +191,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests.java index b06389aa4..c30e0886d 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests.java @@ -15,10 +15,10 @@ */ package org.springframework.integration.samples.testing.aggregator; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; import java.util.List; @@ -36,15 +36,15 @@ /** - * + * * Shows how to test a custom aggregator. Unit test for the class and * tests for the integration subflow. * The subflow has direct input and output channels. The flow would * be a fragment of a larger flow. Since the output channel is direct, - * it has no subscribers outside the context of a larger flow. So, + * it has no subscribers outside the context of a larger flow. So, * in this test case, we bridge it to a {@link QueueChannel} to * facilitate easy testing. - * + * * @author Gary Russell * @since 2.0.2 * @@ -52,10 +52,10 @@ @ContextConfiguration // default context name is -context.xml @RunWith(SpringJUnit4ClassRunner.class) public class CommaDelimitedAggregatorTests { - + @Autowired MessageChannel inputChannel; - + @Autowired QueueChannel testChannel; @@ -65,7 +65,7 @@ public void unitTestClass3() { String out = new CommaDelimitedAggregator().aggregate(splits); assertEquals("a,b,c", out); } - + @Test public void unitTestClass2() { List splits = new CommaDelimitedSplitter().split(" a ,, c "); diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests.java index 5e643e57c..cfc4132db 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests.java @@ -15,10 +15,10 @@ */ package org.springframework.integration.samples.testing.filter; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; @@ -34,30 +34,30 @@ /** - * - * Shows how to test a filter. + * + * Shows how to test a filter. * The filter has direct input and output channels. The filter configuration would * be a fragment of a larger flow. Since the output channel is direct, - * it has no subscribers outside the context of a larger flow. So, + * it has no subscribers outside the context of a larger flow. So, * in this test case, we bridge it to a {@link QueueChannel} to * facilitate easy testing. - * + * * Similarly, we bridge the discard channel which is configured on the second * filter instance. - * + * * @author Gary Russell * @since 2.0.2 */ @ContextConfiguration // default context name is -context.xml @RunWith(SpringJUnit4ClassRunner.class) public class PetFilterTests { - + @Autowired MessageChannel inputChannel; - + @Autowired MessageChannel inputChannel2; - + @Autowired QueueChannel testChannel; @@ -72,19 +72,19 @@ public void unitTestClassCat() { String payload = "CAT:Fluffy"; assertFalse(new PetFilter().dogsOnly(payload)); } - + @Test public void unitTestClassDog() { String payload = "DOG:Fido"; assertTrue(new PetFilter().dogsOnly(payload)); } - + @Test public void unitTestClassLizard() { String payload = "LIZARD:Scaly"; assertFalse(new PetFilter().dogsOnly(payload)); } - + @Test public void testCat() { String payload = "CAT:Fluffy"; @@ -112,7 +112,7 @@ public void testLizard() { Message outMessage = testChannel.receive(0); assertNull("Expected no output message", outMessage); } - + @Test public void testCatDiscard() { String payload = "CAT:Fluffy"; diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests.java index 5e83b3aca..b7ae14def 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests.java @@ -15,8 +15,8 @@ */ package org.springframework.integration.samples.testing.gateway; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.springframework.integration.test.matcher.HeaderMatcher.hasHeader; import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; @@ -31,15 +31,15 @@ /** - * + * * Shows how to test a gateway to ensure the message injected * into the Spring Integration flow is what we expected. * The gateway uses a direct input channel. The configuration would * be a fragment of a larger flow. Since the input channel is direct, - * it has no subscribers outside the context of a larger flow. So, + * it has no subscribers outside the context of a larger flow. So, * in this test case, we bridge it to a {@link QueueChannel} to * facilitate easy testing. - * + * * @author Gary Russell * @since 2.0.2 * @@ -47,13 +47,13 @@ @ContextConfiguration // default context name is -context.xml @RunWith(SpringJUnit4ClassRunner.class) public class GatewayTests { - + @Autowired QueueChannel testChannel; - + @Autowired VoidGateway gateway; - + @Test public void testTrueHeader() { String payload = "XXXABCXXX"; diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests.java index 002065e79..26440ab2a 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests.java @@ -15,9 +15,9 @@ */ package org.springframework.integration.samples.testing.router; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; import org.junit.Test; @@ -32,51 +32,51 @@ /** - * + * * Shows how to test a router; the router is configured to route to direct * channel names. The configuration would * be a fragment of a larger flow. Since the output channels are direct, - * they have no subscribers outside the context of a larger flow. So, + * they have no subscribers outside the context of a larger flow. So, * in this test case, we bridge them to {@link QueueChannel}s to * facilitate easy testing. - * + * * @author Gary Russell * @since 2.0.2 */ @ContextConfiguration // default context name is -context.xml @RunWith(SpringJUnit4ClassRunner.class) public class PetRouterTests { - + @Autowired MessageChannel inputChannel; - + @Autowired QueueChannel testFelineChannel; - + @Autowired QueueChannel testCanineChannel; - + @Autowired QueueChannel testUnknownPetTypeChannel; - + @Test public void unitTestClassCat() { String payload = "CAT:Fluffy"; assertEquals("felineChannel", new PetRouter().route(payload)); } - + @Test public void unitTestClassDog() { String payload = "DOG:Fido"; assertEquals("canineChannel", new PetRouter().route(payload)); } - + @Test public void unitTestClassLizard() { String payload = "LIZARD:Scaly"; assertEquals("unknownPetTypeChannel", new PetRouter().route(payload)); } - + @Test public void testCat() { String payload = "CAT:Fluffy"; diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests.java index 4484d7dc6..e51dec19c 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests.java @@ -15,10 +15,10 @@ */ package org.springframework.integration.samples.testing.splitter; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; import java.util.List; @@ -35,15 +35,15 @@ /** - * + * * Shows how to test a custom splitter. Unit test for the class and * tests for the integration subflow. * The splitter has direct input and output channels. The splitter would * be a fragment of a larger flow. Since the output channel is direct, - * it has no subscribers outside the context of a larger flow. So, + * it has no subscribers outside the context of a larger flow. So, * in this test case, we bridge it to a {@link QueueChannel} to * facilitate easy testing. - * + * * @author Gary Russell * @since 2.0.2 * @@ -51,10 +51,10 @@ @ContextConfiguration // default context name is -context.xml @RunWith(SpringJUnit4ClassRunner.class) public class CommaDelimitedSplitterTests { - + @Autowired MessageChannel inputChannel; - + @Autowired QueueChannel testChannel; @@ -66,7 +66,7 @@ public void unitTestClass3() { assertEquals("b", splits.get(1)); assertEquals("c", splits.get(2)); } - + @Test public void unitTestClass2() { List splits = new CommaDelimitedSplitter().split(" a ,, c "); diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 0ed9b41ba..478e081fd 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples twitter - 5.3.0.RELEASE + 5.4.0 Twitter Basic Sample Twitter Basic Sample https://projects.spring.io/spring-integration @@ -124,8 +124,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 1d88a3ac0..4cc7557cd 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples web-sockets - 5.3.0.RELEASE + 5.4.0 Web Sockets Basic Sample Web Sockets Basic Sample https://projects.spring.io/spring-integration @@ -127,8 +127,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -174,7 +174,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java index 664460b1a..5696ac79c 100644 --- a/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java +++ b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java @@ -16,9 +16,9 @@ package org.springframework.integration.samples.websocket.standard; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.instanceOf; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 6a72d12b9..e0e705388 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-inbound-gateway - 5.3.0.RELEASE + 5.4.0 WS Inbound Gateway Sample WS Inbound Gateway Sample https://projects.spring.io/spring-integration @@ -145,8 +145,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java index a92dbadd3..7590b1e53 100644 --- a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java +++ b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java @@ -17,7 +17,7 @@ package org.springframework.integration.samples.ws; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import javax.xml.transform.Source; diff --git a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java index 4da1babcd..5126fef0c 100644 --- a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java +++ b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java @@ -19,7 +19,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; import java.io.StringReader; diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index e7f8cc940..6d59e54f2 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-outbound-gateway - 5.3.0.RELEASE + 5.4.0 WS Outbound Gateway Sample WS Outbound Gateway Sample https://projects.spring.io/spring-integration @@ -134,8 +134,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -169,14 +169,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 853f94882..845baa453 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xml - 5.3.0.RELEASE + 5.4.0 XML Sample XML Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 6d3f26465..dcc2946f9 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xmpp - 5.3.0.RELEASE + 5.4.0 XMPP Basic Sample XMPP Basic Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/build.gradle b/build.gradle index 2e32cd270..a1fe6391d 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ allprojects { repositories { maven { url 'https://repo.spring.io/libs-snapshot' } maven { url 'https://repo.spring.io/libs-milestone' } -// maven { url 'https://repo.spring.io/libs-staging-local' } + maven { url 'https://repo.spring.io/libs-staging-local' } } } @@ -196,7 +196,7 @@ subprojects { subproject -> jtaVersion = '1.1' jtdsVersion = '1.2.6' jmsApiVersion = '2.0.1' - jrubyVersion = '1.7.12' + jrubyVersion = '9.2.11.1' jpa21ApiVersion = '1.0.0.Final' jpaApiVersion = '2.0.0' jstlVersion = '1.2' @@ -210,14 +210,12 @@ subprojects { subproject -> postgresVersion = '42.2.9' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springCloudVersion ='Hoxton.SR3' - springIntegrationVersion = '5.3.1.RELEASE' - springIntegrationKafkaVersion = '3.3.0.RELEASE' + springCloudVersion ='2020.0.0-M2' + springIntegrationVersion = '5.4.0-M1' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springKafkaVersion = '2.5.2.RELEASE' - springVersion = '5.2.7.RELEASE' - springSecurityVersion = '5.3.3.RELEASE' + springVersion = '5.3.0-M1' + springSecurityVersion = '5.4.0-M1' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.13.0' tilesJspVersion = '2.2.1' @@ -245,7 +243,7 @@ subprojects { subproject -> testCompile("org.mockito:mockito-core:$mockitoVersion") { exclude group: 'org.hamcrest' } - testCompile "org.springframework:spring-test" + testCompile "org.springframework.integration:spring-integration-test" } configurations { @@ -349,7 +347,7 @@ project('cafe-scripted') { compile "org.springframework.integration:spring-integration-groovy" compile "org.springframework.integration:spring-integration-rmi" compile "org.springframework.integration:spring-integration-jmx" - compile "org.jruby:jruby:$jrubyVersion" + compile "org.jruby:jruby-complete:$jrubyVersion" compile "org.python:jython-standalone:$jythonVersion" compile "org.codehaus.groovy:groovy-all:$groovyVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" @@ -614,11 +612,10 @@ project('kafka') { dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' - compile ("org.springframework.integration:spring-integration-kafka:$springIntegrationKafkaVersion") { + compile ('org.springframework.integration:spring-integration-kafka') { exclude group: 'org.slf4j' } compile "org.springframework.integration:spring-integration-core" - compile "org.springframework.kafka:spring-kafka:$springKafkaVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" @@ -1422,7 +1419,7 @@ project('kafka-dsl') { dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' compile "org.springframework.integration:spring-integration-core" - compile ("org.springframework.integration:spring-integration-kafka:$springIntegrationKafkaVersion") + compile ('org.springframework.integration:spring-integration-kafka') compile "org.apache.logging.log4j:log4j-core:$log4jVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index f29cd7619..2cc97725e 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples cafe-dsl - 5.3.0.RELEASE + 5.4.0 Java DSL Cafe Sample Java DSL Cafe Sample https://projects.spring.io/spring-integration @@ -63,7 +63,7 @@ org.springframework.integration.samples cafe-si - 5.3.0.RELEASE + 5.4.0 compile @@ -139,8 +139,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -186,7 +186,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index d91ff9050..a89a23968 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples kafka-dsl - 5.3.0.RELEASE + 5.4.0 Java DSL Kafka Sample Java DSL Kafka Sample https://projects.spring.io/spring-integration @@ -85,7 +85,6 @@ org.springframework.integration spring-integration-kafka - 3.3.0.RELEASE compile @@ -151,8 +150,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -198,7 +197,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -212,14 +211,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 98f31e07e..30f6d3afd 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dsl - 5.3.0.RELEASE + 5.4.0 https://projects.spring.io/spring-integration SpringIO @@ -98,8 +98,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -133,14 +133,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index bf32a5b97..eabd1aa38 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples si4demo - 5.3.0.RELEASE + 5.4.0 Java Configuration/DSL Sample Java Configuration/DSL Sample https://projects.spring.io/spring-integration @@ -208,8 +208,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -255,7 +255,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -269,14 +269,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/gradle.properties b/gradle.properties index a83a765d1..3d4de8979 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -version=5.3.0.RELEASE -springBootVersion=2.3.1.RELEASE +version=5.4.0 +springBootVersion=2.4.0-SNAPSHOT org.gradle.jvmargs=-Xmx1536m diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 8b980e34b..2dca63a4a 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples async-gateway - 5.3.0.RELEASE + 5.4.0 Async Gateway Sample Async Gateway Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoTest.java b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java similarity index 93% rename from intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoTest.java rename to intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java index 769aa5ad7..e6d5b9897 100644 --- a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoTest.java +++ b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java @@ -16,8 +16,8 @@ package org.springframework.integration.samples.async.gateway; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.util.Random; @@ -53,12 +53,12 @@ * @author Gary Russell * */ -@ContextConfiguration(classes = MonoTest.TestConfig.class) +@ContextConfiguration(classes = MonoGatewayTests.TestConfig.class) @RunWith(SpringJUnit4ClassRunner.class) @DirtiesContext -public class MonoTest { +public class MonoGatewayTests { - private static Log logger = LogFactory.getLog(MonoTest.class); + private static Log logger = LogFactory.getLog(MonoGatewayTests.class); @Autowired private MathGateway gateway; @@ -79,7 +79,7 @@ public void testMonoGateway() throws Exception { for (int i = 0; i < 100; i++) { final int number = numbers[i]; gateway.multiplyByTwo(number) - .subscribeOn(Schedulers.elastic()) + .subscribeOn(Schedulers.boundedElastic()) .filter(p -> p != null) .doOnNext(result1 -> { logger.info("Result of multiplication of " + number + " by 2 is " + result1); diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 14b606fd5..5c2968e8e 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-poller - 5.3.0.RELEASE + 5.4.0 Dynamic Poller Sample Dynamic Poller Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 9b50ca9ec..defcf5424 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples errorhandling - 5.3.0.RELEASE + 5.4.0 Error Handling Sample Error Handling Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index ad6588e0c..360ba048b 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file-processing - 5.3.0.RELEASE + 5.4.0 File Processing Sample File Processing Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index d1ef7b68c..3916cc63f 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail-attachments - 5.3.0.RELEASE + 5.4.0 Mail Attachment Sample Mail Attachment Sample https://projects.spring.io/spring-integration @@ -169,17 +169,6 @@ - - org.springframework - spring-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - org.springframework.integration spring-integration-test @@ -228,14 +217,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 82a07b9ab..0d13e4b1e 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples monitoring - 5.3.0.RELEASE + 5.4.0 Monitoring Application Monitoring Application https://projects.spring.io/spring-integration @@ -169,8 +169,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 6d7f3ee3f..2a204d461 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples multipart-http - 5.3.0.RELEASE + 5.4.0 HTTP Multipart Demo HTTP Multipart Demo https://projects.spring.io/spring-integration @@ -169,8 +169,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/pom.xml b/intermediate/pom.xml index 602e8d345..637e12ac1 100644 --- a/intermediate/pom.xml +++ b/intermediate/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples intermediate - 5.3.0.RELEASE + 5.4.0 https://projects.spring.io/spring-integration SpringIO diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 833dddce6..b76cd89f4 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples rest-http - 5.3.0.RELEASE + 5.4.0 Spring Integration Rest HTTP Path Usage Demo Spring Integration Rest HTTP Path Usage Demo https://projects.spring.io/spring-integration @@ -146,7 +146,7 @@ org.springframework.security spring-security-web - 5.3.3.RELEASE + 5.4.0-M1 compile @@ -158,7 +158,7 @@ org.springframework.security spring-security-config - 5.3.3.RELEASE + 5.4.0-M1 compile @@ -224,8 +224,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -259,14 +259,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 5220ccdcd..134b61dc2 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples retry-and-more - 5.3.0.RELEASE + 5.4.0 Retry and More Sample Retry and More Sample https://projects.spring.io/spring-integration @@ -156,8 +156,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -191,14 +191,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index e48ff6d34..a8c0513c1 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper - 5.3.0.RELEASE + 5.4.0 Splitter-Aggregator-Reaper Sample Splitter-Aggregator-Reaper Sample https://projects.spring.io/spring-integration @@ -135,8 +135,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index fcf689619..143cd0854 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-derby - 5.3.0.RELEASE + 5.4.0 Derby Stored Procedures Sample Derby Stored Procedures Sample https://projects.spring.io/spring-integration @@ -135,8 +135,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -170,14 +170,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index f5bb7a4ba..f8123c969 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-ms - 5.3.0.RELEASE + 5.4.0 MS SQLServer Stored Procedures Sample MS SQLServer Stored Procedures Sample https://projects.spring.io/spring-integration @@ -147,8 +147,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -182,14 +182,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index b9ebd6ee1..56d5bf961 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-oracle - 5.3.0.RELEASE + 5.4.0 Oracle Stored Procedures Sample Oracle Stored Procedures Sample https://projects.spring.io/spring-integration @@ -123,8 +123,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -158,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 758dd067f..b071457e4 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-postgresql - 5.3.0.RELEASE + 5.4.0 PostgreSQL Stored Procedures Sample PostgreSQL Stored Procedures Sample https://projects.spring.io/spring-integration @@ -159,8 +159,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index ec8a35317..7e5fa5f24 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples tcp-async-bi-directional - 5.3.0.RELEASE + 5.4.0 Bi-Directional TCP Sample Bi-Directional TCP Sample https://projects.spring.io/spring-integration @@ -127,8 +127,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -148,17 +148,6 @@ - - org.springframework.integration - spring-integration-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - @@ -185,7 +174,7 @@ org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -199,14 +188,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java b/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java index 44cfbe712..4674a7f10 100644 --- a/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java +++ b/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java @@ -66,7 +66,7 @@ public AbstractClientConnectionFactory client1(SampleProperties properties) { @Bean public IntegrationFlow client1Out(AbstractClientConnectionFactory client1) { - return IntegrationFlows.from(() -> "Hello from client1", e -> e.id("client1Adapter") + return IntegrationFlows.fromSupplier(() -> "Hello from client1", e -> e.id("client1Adapter") .poller(Pollers.fixedDelay(3000))) .handle(Tcp.outboundAdapter(client1)) .get(); @@ -87,7 +87,7 @@ public AbstractClientConnectionFactory client2(SampleProperties properties) { @Bean public IntegrationFlow client2Out(AbstractClientConnectionFactory client2) { - return IntegrationFlows.from(() -> "Hello from client2", e -> e.id("client2Adapter") + return IntegrationFlows.fromSupplier(() -> "Hello from client2", e -> e.id("client2Adapter") .poller(Pollers.fixedDelay(2000))) .handle(Tcp.outboundAdapter(client2)) .get(); @@ -123,7 +123,7 @@ public IntegrationFlow serverIn(AbstractServerConnectionFactory server) { @Bean public IntegrationFlow serverOut(AbstractServerConnectionFactory server) { - return IntegrationFlows.from(() -> "seed", e -> e.poller(Pollers.fixedDelay(5000))) + return IntegrationFlows.fromSupplier(() -> "seed", e -> e.poller(Pollers.fixedDelay(5000))) .split(this.clients, "iterator") .enrichHeaders(h -> h.headerExpression(IpHeaders.CONNECTION_ID, "payload")) .transform(p -> "Hello from server") diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 384780e55..672230451 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex - 5.3.0.RELEASE + 5.4.0 TCP Client Server Multiplexing Sample TCP Client Server Multiplexing Sample https://projects.spring.io/spring-integration @@ -122,17 +122,6 @@ - - org.springframework - spring-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - org.springframework.integration spring-integration-test @@ -169,14 +158,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java b/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java index 1fee47617..503fab311 100644 --- a/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java +++ b/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java @@ -16,9 +16,9 @@ package org.springframework.integration.samples.tcpclientserver; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 784344dfe..afad68029 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -4,11 +4,11 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.0-SNAPSHOT org.springframework.integration.samples testcontainers-rabbitmq - 5.3.0.RELEASE + 5.4.0 Testcontainers RabbitMQ Sample Testcontainers RabbitMQ Sample https://projects.spring.io/spring-integration @@ -138,8 +138,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -163,17 +163,6 @@ - - org.springframework.integration - spring-integration-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - org.springframework.amqp spring-rabbit-test @@ -246,14 +235,14 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR3 + 2020.0.0-M2 import pom org.springframework.boot spring-boot-dependencies - 2.3.1.RELEASE + 2.4.0-SNAPSHOT import pom @@ -267,14 +256,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 95ce905aa..40707d343 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples travel - 5.3.0.RELEASE + 5.4.0 Travel Services Sample Travel Services Sample https://projects.spring.io/spring-integration @@ -145,8 +145,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 4609744f1..12cc2856c 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tx-synch - 5.3.0.RELEASE + 5.4.0 Transaction Synchronization Sample Transaction Synchronization Sample https://projects.spring.io/spring-integration @@ -146,8 +146,8 @@ - org.springframework - spring-test + org.springframework.integration + spring-integration-test test @@ -181,14 +181,14 @@ org.springframework spring-framework-bom - 5.2.7.RELEASE + 5.3.0-M1 import pom org.springframework.integration spring-integration-bom - 5.3.1.RELEASE + 5.4.0-M1 import pom From b872a1371e7041857580249cbff224df2f5e4329 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 17 Jul 2020 10:00:58 -0400 Subject: [PATCH 244/356] GH-285: Fix AMQP Sample Resolves https://github.com/spring-projects/spring-integration-samples/issues/285 - deprecated `publisher-confirms` attribute has been removed in 5.4 --- .../spring/integration/spring-integration-confirms-context.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-confirms-context.xml b/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-confirms-context.xml index 6f3a8bb09..d9e34ae9f 100644 --- a/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-confirms-context.xml +++ b/basic/amqp/src/main/resources/META-INF/spring/integration/spring-integration-confirms-context.xml @@ -60,7 +60,8 @@ - + From 8fb73ff29a340cc233670a7121feff3309058164 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 5 Aug 2020 17:23:25 -0400 Subject: [PATCH 245/356] Upgrade Gradle; move to SNAPSHOTs --- .../samples/barrier/Application.java | 2 +- .../barrier2/ErrorHandlingApplication.java | 2 +- .../samples/barrier/ApplicationTests.java | 9 ++++----- build.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.jar | Bin 58694 -> 58910 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 ++ gradlew.bat | 1 + 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java b/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java index 44fdfd07e..c225dc42b 100644 --- a/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java +++ b/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java @@ -34,7 +34,7 @@ @ImportResource("/META-INF/spring/integration/server-context.xml") public class Application { - public static void main(String[] args) throws Exception { + public static void main(String[] args) { ConfigurableApplicationContext server = SpringApplication.run(Application.class, args); runClient(args); diff --git a/basic/barrier/src/main/java/org/springframework/integration/samples/barrier2/ErrorHandlingApplication.java b/basic/barrier/src/main/java/org/springframework/integration/samples/barrier2/ErrorHandlingApplication.java index b966d7c6e..a56156029 100644 --- a/basic/barrier/src/main/java/org/springframework/integration/samples/barrier2/ErrorHandlingApplication.java +++ b/basic/barrier/src/main/java/org/springframework/integration/samples/barrier2/ErrorHandlingApplication.java @@ -32,7 +32,7 @@ @ImportResource("/META-INF/spring/integration/errorhandling-context.xml") public class ErrorHandlingApplication { - public static void main(String[] args) throws Exception { + public static void main(String[] args) { ConfigurableApplicationContext test = new SpringApplicationBuilder(ErrorHandlingApplication.class) .web(WebApplicationType.NONE) .run(args); diff --git a/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java b/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java index 6156ebe40..96ffb330c 100644 --- a/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java +++ b/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java @@ -20,8 +20,7 @@ import java.util.Collections; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -30,13 +29,13 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * @author Gary Russell + * @author Artem Bilan + * * @since 4.2 */ -@RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = Application.class) public class ApplicationTests { @@ -47,7 +46,7 @@ public class ApplicationTests { AbstractMessageChannel release; @Test - public void contextLoads() throws InterruptedException { + public void contextLoads() { QueueChannel replies = new QueueChannel(); receiveChannel.send( new GenericMessage<>("A,B,C", Collections.singletonMap(MessageHeaders.REPLY_CHANNEL, replies))); diff --git a/build.gradle b/build.gradle index a1fe6391d..474c6182e 100644 --- a/build.gradle +++ b/build.gradle @@ -210,12 +210,12 @@ subprojects { subproject -> postgresVersion = '42.2.9' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springCloudVersion ='2020.0.0-M2' - springIntegrationVersion = '5.4.0-M1' + springCloudVersion ='2020.0.0-SNAPSHOT' + springIntegrationVersion = '5.4.0-SNAPSHOT' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.0-M1' - springSecurityVersion = '5.4.0-M1' + springVersion = '5.3.0-SNAPSHOT' + springSecurityVersion = '5.4.0-SNAPSHOT' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.13.0' tilesJspVersion = '2.2.1' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 490fda8577df6c95960ba7077c43220e5bb2c0d9..62d4c053550b91381bbd28b1afc82d634bf73a8a 100644 GIT binary patch delta 6447 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 F{|nTN-B$nr diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4b442974..bb8b2fc26 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2fe81a7d9..fbd7c5158 100755 --- a/gradlew +++ b/gradlew @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -129,6 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat index 9109989e3..a9f778a7a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%* set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% From 25b85ee96974f135100295dc7e4a1e446589b94c Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 12 Aug 2020 14:29:05 -0400 Subject: [PATCH 246/356] Upgrade dependencies; fix compatibility --- advanced/advanced-testing-examples/pom.xml | 12 ++--- advanced/dynamic-ftp/pom.xml | 12 ++--- advanced/dynamic-tcp-client/pom.xml | 12 ++--- applications/cafe-scripted/pom.xml | 18 +++---- applications/cafe/cafe-amqp/pom.xml | 12 ++--- applications/cafe/cafe-jms/pom.xml | 16 +++---- applications/cafe/cafe-si/pom.xml | 12 ++--- applications/file-split-ftp/pom.xml | 12 ++--- applications/loan-broker/pom.xml | 12 ++--- applications/loanshark/pom.xml | 26 +++++----- applications/stomp-chat/pom.xml | 12 ++--- basic/amqp/pom.xml | 12 ++--- basic/barrier/pom.xml | 12 ++--- basic/control-bus/pom.xml | 12 ++--- basic/enricher/pom.xml | 12 ++--- basic/feed/pom.xml | 12 ++--- basic/file/pom.xml | 12 ++--- basic/ftp/pom.xml | 14 +++--- basic/helloworld/pom.xml | 12 ++--- basic/http/pom.xml | 14 +++--- basic/jdbc/pom.xml | 12 ++--- basic/jms/pom.xml | 16 +++---- basic/jmx/pom.xml | 12 ++--- basic/jpa/pom.xml | 12 ++--- basic/kafka/pom.xml | 12 ++--- basic/mail/pom.xml | 12 ++--- basic/mongodb/pom.xml | 14 +++--- basic/mqtt/pom.xml | 12 ++--- basic/oddeven/pom.xml | 12 ++--- basic/quote/pom.xml | 12 ++--- basic/sftp/pom.xml | 14 +++--- basic/splunk/pom.xml | 12 ++--- basic/tcp-amqp/pom.xml | 12 ++--- basic/tcp-broadcast/pom.xml | 12 ++--- basic/tcp-client-server/pom.xml | 12 ++--- basic/tcp-with-headers/pom.xml | 12 ++--- basic/testing-examples/pom.xml | 12 ++--- basic/twitter/pom.xml | 12 ++--- basic/web-sockets/pom.xml | 12 ++--- basic/ws-inbound-gateway/pom.xml | 12 ++--- basic/ws-outbound-gateway/pom.xml | 12 ++--- basic/xml/pom.xml | 12 ++--- basic/xmpp/pom.xml | 12 ++--- build.gradle | 48 +++++++++---------- dsl/cafe-dsl/pom.xml | 12 ++--- dsl/kafka-dsl/pom.xml | 12 ++--- dsl/pom.xml | 12 ++--- dsl/si4demo/pom.xml | 12 ++--- intermediate/async-gateway/pom.xml | 12 ++--- intermediate/dynamic-poller/pom.xml | 12 ++--- intermediate/errorhandling/pom.xml | 12 ++--- intermediate/file-processing/pom.xml | 12 ++--- intermediate/mail-attachments/pom.xml | 14 +++--- intermediate/monitoring/pom.xml | 12 ++--- intermediate/multipart-http/pom.xml | 14 +++--- intermediate/rest-http/pom.xml | 16 +++---- intermediate/retry-and-more/pom.xml | 12 ++--- .../splitter-aggregator-reaper/pom.xml | 12 ++--- intermediate/stored-procedures-derby/pom.xml | 12 ++--- intermediate/stored-procedures-ms/pom.xml | 12 ++--- intermediate/stored-procedures-oracle/pom.xml | 12 ++--- .../stored-procedures-postgresql/pom.xml | 20 ++++---- intermediate/tcp-async-bi-directional/pom.xml | 12 ++--- .../tcp-client-server-multiplex/pom.xml | 12 ++--- intermediate/testcontainers-rabbitmq/pom.xml | 14 +++--- .../IntegrationConfigTests.java | 2 + intermediate/travel/pom.xml | 12 ++--- intermediate/tx-synch/pom.xml | 12 ++--- 68 files changed, 449 insertions(+), 447 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 84284e4b4..6f9743ebd 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -119,8 +119,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -132,7 +132,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -174,21 +174,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 8f9bdf91c..8551902bf 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 47341e7af..db0bc1d66 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -100,8 +100,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -113,7 +113,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -181,21 +181,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 158a0d5b0..932679f24 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -102,7 +102,7 @@ org.jruby jruby-complete - 9.2.11.1 + 9.2.13.0 compile @@ -114,7 +114,7 @@ org.python jython-standalone - 2.7.0 + 2.7.2 compile @@ -126,7 +126,7 @@ org.codehaus.groovy groovy-all - 2.5.10 + 3.0.5 compile @@ -165,8 +165,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -178,7 +178,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -220,21 +220,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index f83ba3fae..a786a96bf 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -108,8 +108,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -121,7 +121,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index e209452de..d97704709 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -70,7 +70,7 @@ org.apache.activemq activemq-broker - 5.15.13 + 5.16.0 compile @@ -82,7 +82,7 @@ org.apache.activemq activemq-kahadb-store - 5.15.13 + 5.16.0 compile @@ -148,8 +148,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -161,7 +161,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -203,21 +203,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index cf2766e7b..0b1258aff 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -107,8 +107,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -120,7 +120,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -162,21 +162,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index af031950a..7f3b58cb8 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -157,8 +157,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -170,7 +170,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -238,21 +238,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 272a078db..8b6f74293 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 93a9aff6e..668bd9311 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -113,7 +113,7 @@ org.aspectj aspectjtools - 1.9.5 + 1.9.6 compile @@ -168,9 +168,9 @@ - commons-dbcp - commons-dbcp - 1.2.2 + org.apache.commons + commons-dbcp2 + 2.7.0 compile @@ -242,7 +242,7 @@ org.hsqldb hsqldb - 2.5.0 + 2.5.1 compile @@ -290,7 +290,7 @@ org.eclipse.persistence javax.persistence - 2.0.0 + 2.2.1 compile @@ -302,7 +302,7 @@ org.hibernate hibernate-entitymanager - 5.4.17.Final + 5.4.20.Final compile @@ -389,8 +389,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -402,7 +402,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -444,21 +444,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 60ff5408d..abd7e25a0 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -122,8 +122,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -135,7 +135,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -203,21 +203,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index f6a8679d3..08d34c37d 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -119,8 +119,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -132,7 +132,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -174,21 +174,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 64d697fc4..f0d710b54 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -133,8 +133,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -146,7 +146,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -214,21 +214,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 84d8b76df..6935c053e 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index d9506df4e..38bd077aa 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -108,8 +108,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -121,7 +121,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 3b8a05c8c..7743db439 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 6fb657ff8..588b5f315 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index a4298a3f2..1fd692f80 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -69,7 +69,7 @@ commons-io commons-io - 2.6 + 2.7 compile @@ -132,8 +132,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -145,7 +145,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -199,21 +199,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 6ab34871f..d4f50ba6d 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 3e0b4da43..353d9d637 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -103,7 +103,7 @@ commons-io commons-io - 2.6 + 2.7 compile @@ -166,8 +166,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -179,7 +179,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -221,21 +221,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index fb9c12887..fab1599c9 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -108,8 +108,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -121,7 +121,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index aa3372ee3..48526e091 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -92,7 +92,7 @@ org.apache.activemq activemq-broker - 5.15.13 + 5.16.0 compile @@ -104,7 +104,7 @@ org.apache.activemq activemq-kahadb-store - 5.15.13 + 5.16.0 compile @@ -147,8 +147,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -160,7 +160,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -202,21 +202,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 840432953..2e62f2ff7 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -107,8 +107,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -120,7 +120,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -162,21 +162,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 38d16387a..7293c7279 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -135,8 +135,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -148,7 +148,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -216,21 +216,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 2d1e7a06b..41e3f0960 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -127,8 +127,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -140,7 +140,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -208,21 +208,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 1b96d8807..55357520b 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -131,8 +131,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -144,7 +144,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -186,21 +186,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 5de5c9ee7..415ca52b6 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -81,7 +81,7 @@ org.mongodb mongodb-driver-sync - 4.0.4 + 4.1.0 compile @@ -108,8 +108,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -121,7 +121,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 95d772ef3..09a9f1a07 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -111,8 +111,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -124,7 +124,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -192,21 +192,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 163e41b50..f419108b5 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index af228ef3d..f105af9a5 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 2c02db926..9c13917fd 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -136,7 +136,7 @@ org.apache.sshd sshd-sftp - 2.4.0 + 2.5.1 test @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index b17404268..99c08767a 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -112,8 +112,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -125,7 +125,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -193,21 +193,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index f3fdf8b9a..346d701b4 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -131,8 +131,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -144,7 +144,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -186,21 +186,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index da1744ed3..cfd8b3762 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -111,8 +111,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -124,7 +124,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -192,21 +192,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index dd7739447..b7f2dd2d4 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -119,8 +119,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -132,7 +132,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 0ea00637b..c0336c481 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -111,8 +111,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -124,7 +124,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -192,21 +192,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 796b6ff68..49111c370 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -129,8 +129,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -142,7 +142,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -184,21 +184,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 478e081fd..feb231a01 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -97,8 +97,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -110,7 +110,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -152,21 +152,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 4cc7557cd..b9c7e8b0a 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -100,8 +100,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -113,7 +113,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -181,21 +181,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index e0e705388..2f0e3c32f 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -118,8 +118,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -131,7 +131,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -173,21 +173,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 6d59e54f2..69ad17886 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -107,8 +107,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -120,7 +120,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -162,21 +162,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 845baa453..b26ad84e6 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index dcc2946f9..3986252a0 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/build.gradle b/build.gradle index 474c6182e..df02a9a49 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ allprojects { repositories { maven { url 'https://repo.spring.io/libs-snapshot' } maven { url 'https://repo.spring.io/libs-milestone' } - maven { url 'https://repo.spring.io/libs-staging-local' } +// maven { url 'https://repo.spring.io/libs-staging-local' } } } @@ -170,52 +170,52 @@ subprojects { subproject -> } ext { - activeMqVersion = '5.15.13' - apacheSshdVersion = '2.4.0' - aspectjVersion = '1.9.5' + activeMqVersion = '5.16.0' + apacheSshdVersion = '2.5.1' + aspectjVersion = '1.9.6' commonsDigesterVersion = '2.0' - commonsDbcpVersion = '1.2.2' + commonsDbcpVersion = '2.7.0' commonsFileUploadVersion = '1.4' - commonsIoVersion = '2.6' + commonsIoVersion = '2.7' commonsLangVersion = '2.6' commonsPoolVersion = '1.5.4' c3p0Version = '0.9.1.2' derbyVersion = '10.14.2.0' - hamcrestVersion = '1.3' - hibernateVersion = '5.4.17.Final' + hamcrestVersion = '2.2' + hibernateVersion = '5.4.20.Final' hibernateValidatorVersion = '6.1.2.Final' ftpServerVersion = '1.1.1' flexjsonVersion = '2.0' - groovyVersion = '2.5.10' - hsqldbVersion = '2.5.0' + groovyVersion = '3.0.5' + hsqldbVersion = '2.5.1' h2Version = '1.4.200' - jacksonVersion = '2.11.0' + jacksonVersion = '2.11.1' javaxInjectVersion = '1' javaxMailVersion = '1.6.2' jodaTimeVersion = '1.6' jtaVersion = '1.1' jtdsVersion = '1.2.6' jmsApiVersion = '2.0.1' - jrubyVersion = '9.2.11.1' + jrubyVersion = '9.2.13.0' jpa21ApiVersion = '1.0.0.Final' - jpaApiVersion = '2.0.0' + jpaApiVersion = '2.2.1' jstlVersion = '1.2' junitVersion = '4.13' - jythonVersion = '2.7.0' + jythonVersion = '2.7.2' log4jVersion = '2.13.3' - mockitoVersion = '3.2.4' - mongoDriverVersion = '4.0.4' + mockitoVersion = '3.4.6' + mongoDriverVersion = '4.1.0' openJpaVersion = '2.4.0' oracleDriverVersion = '11.2.0.3' - postgresVersion = '42.2.9' + postgresVersion = '42.2.14' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.4.0-SNAPSHOT' + springIntegrationVersion = '5.4.0-M2' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.0-SNAPSHOT' - springSecurityVersion = '5.4.0-SNAPSHOT' + springVersion = '5.3.0-M2' + springSecurityVersion = '5.4.0-RC1' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.13.0' tilesJspVersion = '2.2.1' @@ -239,7 +239,7 @@ subprojects { subproject -> testCompile("junit:junit:$junitVersion") { exclude group: 'org.hamcrest' } - testCompile "org.hamcrest:hamcrest-all:$hamcrestVersion" + testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion" testCompile("org.mockito:mockito-core:$mockitoVersion") { exclude group: 'org.hamcrest' } @@ -402,7 +402,7 @@ project('loanshark') { compile "org.springframework:spring-tx" compile "org.springframework:spring-context" compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" - compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" + compile "org.apache.commons:commons-dbcp2:$commonsDbcpVersion" compile "commons-digester:commons-digester:$commonsDigesterVersion" compile "commons-pool:commons-pool:$commonsPoolVersion" compile "org.apache.tiles:tiles-jsp:$tilesJspVersion" @@ -1181,7 +1181,7 @@ project('retry-and-more') { compile("org.mockito:mockito-core:$mockitoVersion") { exclude group: 'org.hamcrest' } - compile "org.hamcrest:hamcrest-all:$hamcrestVersion" + compile "org.hamcrest:hamcrest-library:$hamcrestVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1292,7 +1292,7 @@ project('stored-procedures-postgresql') { dependencies { compile "org.springframework.integration:spring-integration-jdbc" compile "org.postgresql:postgresql:$postgresVersion" - compile "commons-dbcp:commons-dbcp:$commonsDbcpVersion" + compile "org.apache.commons:commons-dbcp2:$commonsDbcpVersion" compile "commons-pool:commons-pool:$commonsPoolVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 2cc97725e..3ca81df69 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -112,8 +112,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -125,7 +125,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -193,21 +193,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index a89a23968..c5b09ad0b 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -123,8 +123,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -136,7 +136,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -204,21 +204,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 30f6d3afd..e8262a4f6 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -71,8 +71,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -84,7 +84,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -126,21 +126,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index eabd1aa38..0dbaed0f5 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -181,8 +181,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -194,7 +194,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -262,21 +262,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 2dca63a4a..8ebbb9503 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 5c2968e8e..497a4200c 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index defcf5424..5680e177b 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 360ba048b..f28a148d2 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 3916cc63f..1ec505aa8 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -104,7 +104,7 @@ commons-io commons-io - 2.6 + 2.7 compile @@ -143,8 +143,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -156,7 +156,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -210,21 +210,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 0d13e4b1e..5adff541a 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -142,8 +142,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -155,7 +155,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -197,21 +197,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 2a204d461..3f66d682f 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -103,7 +103,7 @@ commons-io commons-io - 2.6 + 2.7 compile @@ -142,8 +142,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -155,7 +155,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -197,21 +197,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index b76cd89f4..e7984132c 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -146,7 +146,7 @@ org.springframework.security spring-security-web - 5.4.0-M1 + 5.4.0-RC1 compile @@ -158,7 +158,7 @@ org.springframework.security spring-security-config - 5.4.0-M1 + 5.4.0-RC1 compile @@ -197,8 +197,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -210,7 +210,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -252,21 +252,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 134b61dc2..4ae22a30a 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -102,7 +102,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 compile @@ -117,8 +117,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 compile @@ -184,21 +184,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index a8c0513c1..91efe3232 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -108,8 +108,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -121,7 +121,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 143cd0854..7abf09a15 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -108,8 +108,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -121,7 +121,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -163,21 +163,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index f8123c969..7813dd7cc 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -120,8 +120,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -133,7 +133,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -175,21 +175,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 56d5bf961..843a85967 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index b071457e4..24425a014 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -69,7 +69,7 @@ org.postgresql postgresql - 42.2.9 + 42.2.14 compile @@ -79,9 +79,9 @@ - commons-dbcp - commons-dbcp - 1.2.2 + org.apache.commons + commons-dbcp2 + 2.7.0 compile @@ -132,8 +132,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -145,7 +145,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -187,21 +187,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 7e5fa5f24..80c95e1cb 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -100,8 +100,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -113,7 +113,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -181,21 +181,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 672230451..414503717 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -96,8 +96,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -109,7 +109,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -151,21 +151,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index afad68029..d64c773c9 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -111,8 +111,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -124,7 +124,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -235,7 +235,7 @@ org.springframework.cloud spring-cloud-dependencies - 2020.0.0-M2 + 2020.0.0-SNAPSHOT import pom @@ -249,21 +249,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/testcontainers-rabbitmq/src/test/java/org/springframework/integration/samples/testcontainersrabbitmq/IntegrationConfigTests.java b/intermediate/testcontainers-rabbitmq/src/test/java/org/springframework/integration/samples/testcontainersrabbitmq/IntegrationConfigTests.java index 260dc3ac9..9d80bd345 100644 --- a/intermediate/testcontainers-rabbitmq/src/test/java/org/springframework/integration/samples/testcontainersrabbitmq/IntegrationConfigTests.java +++ b/intermediate/testcontainers-rabbitmq/src/test/java/org/springframework/integration/samples/testcontainersrabbitmq/IntegrationConfigTests.java @@ -16,6 +16,7 @@ package org.springframework.integration.samples.testcontainersrabbitmq; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.amqp.core.*; @@ -38,6 +39,7 @@ @SpringBootTest @SpringIntegrationTest @Import({ Receiver.class, IntegrationConfigTests.Config.class }) +@Disabled class IntegrationConfigTests { @Autowired diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 40707d343..a672672f3 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -118,8 +118,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -131,7 +131,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -173,21 +173,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 12cc2856c..8cc735eb9 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -119,8 +119,8 @@ org.hamcrest - hamcrest-all - 1.3 + hamcrest-library + 2.2 test @@ -132,7 +132,7 @@ org.mockito mockito-core - 3.2.4 + 3.4.6 test @@ -174,21 +174,21 @@ com.fasterxml.jackson jackson-bom - 2.11.0 + 2.11.1 import pom org.springframework spring-framework-bom - 5.3.0-M1 + 5.3.0-M2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M1 + 5.4.0-M2 import pom From 5c55d5cc927f1d3fabb2136d1f79e6f19e396ae1 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 12 Aug 2020 14:31:42 -0400 Subject: [PATCH 247/356] Add IDEA `/out` dir to ignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b3bf74958..b6db91087 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,7 @@ derby.log activemq-data .settings/ .sts4-cache - +out /.gradle build/ /classes From ce4979701f94fd5a276f8c213b8b5df38e52abfe Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 16 Sep 2020 15:16:37 -0400 Subject: [PATCH 248/356] Upgrade dependencies to latest milestones --- advanced/advanced-testing-examples/pom.xml | 15 +++++---------- advanced/dynamic-ftp/pom.xml | 15 +++++---------- advanced/dynamic-tcp-client/pom.xml | 15 +++++---------- advanced/pom.xml | 11 +++-------- applications/cafe-scripted/pom.xml | 15 +++++---------- applications/cafe/cafe-amqp/pom.xml | 15 +++++---------- applications/cafe/cafe-jms/pom.xml | 15 +++++---------- applications/cafe/cafe-si/pom.xml | 15 +++++---------- applications/cafe/pom.xml | 11 +++-------- applications/file-split-ftp/pom.xml | 15 +++++---------- applications/loan-broker/pom.xml | 15 +++++---------- applications/loanshark/pom.xml | 15 +++++---------- applications/pom.xml | 11 +++-------- applications/stomp-chat/pom.xml | 15 +++++---------- basic/amqp/pom.xml | 15 +++++---------- basic/barrier/pom.xml | 15 +++++---------- basic/control-bus/pom.xml | 15 +++++---------- basic/enricher/pom.xml | 15 +++++---------- basic/feed/pom.xml | 15 +++++---------- basic/file/pom.xml | 15 +++++---------- basic/ftp/pom.xml | 15 +++++---------- basic/helloworld/pom.xml | 15 +++++---------- basic/http/pom.xml | 15 +++++---------- basic/jdbc/pom.xml | 15 +++++---------- basic/jms/pom.xml | 15 +++++---------- basic/jmx/pom.xml | 15 +++++---------- basic/jpa/pom.xml | 15 +++++---------- basic/kafka/pom.xml | 15 +++++---------- basic/mail/pom.xml | 15 +++++---------- basic/mongodb/pom.xml | 15 +++++---------- basic/mqtt/pom.xml | 15 +++++---------- basic/oddeven/pom.xml | 15 +++++---------- basic/pom.xml | 11 +++-------- basic/quote/pom.xml | 15 +++++---------- basic/sftp/pom.xml | 15 +++++---------- basic/splunk/pom.xml | 15 +++++---------- basic/tcp-amqp/pom.xml | 15 +++++---------- basic/tcp-broadcast/pom.xml | 15 +++++---------- basic/tcp-client-server/pom.xml | 15 +++++---------- basic/tcp-with-headers/pom.xml | 15 +++++---------- basic/testing-examples/pom.xml | 15 +++++---------- basic/twitter/pom.xml | 15 +++++---------- basic/web-sockets/pom.xml | 15 +++++---------- basic/ws-inbound-gateway/pom.xml | 15 +++++---------- basic/ws-outbound-gateway/pom.xml | 15 +++++---------- basic/xml/pom.xml | 15 +++++---------- basic/xmpp/pom.xml | 15 +++++---------- build.gradle | 19 +++++++------------ dsl/cafe-dsl/pom.xml | 15 +++++---------- dsl/kafka-dsl/pom.xml | 15 +++++---------- dsl/pom.xml | 15 +++++---------- dsl/si4demo/pom.xml | 15 +++++---------- intermediate/async-gateway/pom.xml | 15 +++++---------- intermediate/dynamic-poller/pom.xml | 15 +++++---------- intermediate/errorhandling/pom.xml | 15 +++++---------- intermediate/file-processing/pom.xml | 15 +++++---------- intermediate/mail-attachments/pom.xml | 15 +++++---------- intermediate/monitoring/pom.xml | 15 +++++---------- intermediate/multipart-http/pom.xml | 15 +++++---------- intermediate/pom.xml | 11 +++-------- intermediate/rest-http/pom.xml | 19 +++++++------------ intermediate/retry-and-more/pom.xml | 15 +++++---------- .../splitter-aggregator-reaper/pom.xml | 15 +++++---------- intermediate/stored-procedures-derby/pom.xml | 15 +++++---------- intermediate/stored-procedures-ms/pom.xml | 15 +++++---------- intermediate/stored-procedures-oracle/pom.xml | 15 +++++---------- .../stored-procedures-postgresql/pom.xml | 15 +++++---------- intermediate/tcp-async-bi-directional/pom.xml | 15 +++++---------- .../tcp-client-server-multiplex/pom.xml | 15 +++++---------- intermediate/testcontainers-rabbitmq/pom.xml | 15 +++++---------- intermediate/travel/pom.xml | 15 +++++---------- intermediate/tx-synch/pom.xml | 15 +++++---------- 72 files changed, 354 insertions(+), 714 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 6f9743ebd..02a475490 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -181,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 8551902bf..144c50859 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -158,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index db0bc1d66..052dbe7de 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -27,7 +27,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -35,7 +35,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -43,16 +43,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -188,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/advanced/pom.xml b/advanced/pom.xml index 58310766b..b696467b9 100644 --- a/advanced/pom.xml +++ b/advanced/pom.xml @@ -21,7 +21,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -37,16 +37,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 932679f24..1bbd3309e 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -227,14 +222,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index a786a96bf..44a55f0a0 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -170,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index d97704709..2e63dff1d 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -210,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 0b1258aff..4cd80359b 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -169,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index 431148b00..44cf5f1ff 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -21,7 +21,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -37,16 +37,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 7f3b58cb8..29a5438b2 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -27,7 +27,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -35,7 +35,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -43,16 +43,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -245,14 +240,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 8b6f74293..9a7392723 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -158,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 668bd9311..954b4b1f7 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -451,14 +446,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/applications/pom.xml b/applications/pom.xml index 587f54aa0..1f7dea2e1 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -21,7 +21,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -37,16 +37,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index abd7e25a0..a65db38a3 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -27,7 +27,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -35,7 +35,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -43,16 +43,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -210,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 08d34c37d..b4e817fb3 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -181,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index f0d710b54..40c9138da 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -27,7 +27,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -35,7 +35,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -43,16 +43,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -221,14 +216,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 6935c053e..7d2d23163 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -158,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 38bd077aa..7635a6e6a 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -170,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 7743db439..c55fd1fb0 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -158,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 588b5f315..da59a54f2 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -158,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 1fd692f80..b281f4d99 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -206,14 +201,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index d4f50ba6d..98ac3b87e 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -158,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 353d9d637..5472a84fd 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -228,14 +223,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index fab1599c9..32a464d54 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -170,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 48526e091..72595046a 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -209,14 +204,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 2e62f2ff7..457dcffbe 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -169,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 7293c7279..fb439b74a 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -27,7 +27,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -35,7 +35,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -43,16 +43,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -223,14 +218,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 41e3f0960..780ee1b3c 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -27,7 +27,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -35,7 +35,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -43,16 +43,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -215,14 +210,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 55357520b..fefd16861 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -193,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 415ca52b6..f28eb3b93 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -170,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 09a9f1a07..fbbefd569 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -27,7 +27,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -35,7 +35,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -43,16 +43,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -199,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index f419108b5..9984be087 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -158,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/pom.xml b/basic/pom.xml index 1307233c2..fbe033728 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -21,7 +21,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -37,16 +37,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index f105af9a5..6fb4c9428 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -158,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 9c13917fd..68ce9f852 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -170,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 99c08767a..4bda04ee7 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -27,7 +27,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -35,7 +35,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -43,16 +43,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -200,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 346d701b4..4af4d9c1c 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -193,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index cfd8b3762..854c51b13 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -27,7 +27,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -35,7 +35,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -43,16 +43,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -199,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index b7f2dd2d4..e16df2ff3 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -170,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index c0336c481..8275c331c 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -27,7 +27,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -35,7 +35,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -43,16 +43,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -199,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 49111c370..5f3db3005 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -191,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index feb231a01..df28a6586 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -159,14 +154,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index b9c7e8b0a..60c2c3c17 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -27,7 +27,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -35,7 +35,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -43,16 +43,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -188,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 2f0e3c32f..271a2f692 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -180,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 69ad17886..e21d9838a 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -169,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index b26ad84e6..86eb9873f 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -158,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 3986252a0..15c448de2 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -158,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/build.gradle b/build.gradle index df02a9a49..66f12ad73 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { maven { url 'https://repo.spring.io/libs-snapshot' } } dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:1.0.9.RELEASE' + classpath 'io.spring.gradle:dependency-management-plugin:1.0.10.RELEASE' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" classpath "gradle.plugin.org.gretty:gretty:2.3.1" } @@ -74,26 +74,21 @@ subprojects { subproject -> developer { id = 'abilan' name = 'Artem Bilan' - email = 'abilan@pivotal.io' + email = 'abilan@vmware.com' roles = ["project lead"] } developer { id = 'garyrussell' name = 'Gary Russell' - email = 'grussell@pivotal.io' + email = 'grussell@vmware.com' roles = ["lead emeritus"] } developer { id = 'markfisher' name = 'Mark Fisher' - email = 'mfisher@pivotal.io' + email = 'mfisher@vmware.com' roles = ["project founder and lead emeritus"] } - developer { - id = 'ghillert' - name = 'Gunnar Hillert' - email = 'ghillert@pivotal.io' - } } if (subproject.plugins.hasPlugin('java')) { @@ -211,11 +206,11 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.4.0-M2' + springIntegrationVersion = '5.4.0-M3' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.0-M2' - springSecurityVersion = '5.4.0-RC1' + springVersion = '5.3.0-RC1' + springSecurityVersion = '5.4.0' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.13.0' tilesJspVersion = '2.2.1' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 3ca81df69..9cff546b0 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -27,7 +27,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -35,7 +35,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -43,16 +43,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -200,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index c5b09ad0b..b3a129d98 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -27,7 +27,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -35,7 +35,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -43,16 +43,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -211,14 +206,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index e8262a4f6..104deb129 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -20,7 +20,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -36,16 +36,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -133,14 +128,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 0dbaed0f5..6b64928ae 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -27,7 +27,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -35,7 +35,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -43,16 +43,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -269,14 +264,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 8ebbb9503..0a966dafd 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -158,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 497a4200c..f3f830d23 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -158,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 5680e177b..a127911c1 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -158,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index f28a148d2..a5292470e 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -158,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 1ec505aa8..4b1891a92 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -217,14 +212,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 5adff541a..6823797b1 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -204,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 3f66d682f..e04315b20 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -204,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/pom.xml b/intermediate/pom.xml index 637e12ac1..cc79860ff 100644 --- a/intermediate/pom.xml +++ b/intermediate/pom.xml @@ -21,7 +21,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -37,16 +37,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index e7984132c..738771682 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -146,7 +141,7 @@ org.springframework.security spring-security-web - 5.4.0-RC1 + 5.4.0 compile @@ -158,7 +153,7 @@ org.springframework.security spring-security-config - 5.4.0-RC1 + 5.4.0 compile @@ -259,14 +254,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 4ae22a30a..bd654b0dd 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -191,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 91efe3232..007d400ff 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -170,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 7abf09a15..c012a37ea 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -170,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 7813dd7cc..05bcb6d3a 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -182,14 +177,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 843a85967..5342c32a0 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -158,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 24425a014..d13a3e030 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -194,14 +189,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 80c95e1cb..2e6fb6b54 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -27,7 +27,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -35,7 +35,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -43,16 +43,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -188,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 414503717..55c58b7b7 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -158,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index d64c773c9..a2328ef6c 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -27,7 +27,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -35,7 +35,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -43,16 +43,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -256,14 +251,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index a672672f3..cab5425e6 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -180,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 8cc735eb9..bb8b8d6d0 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -22,7 +22,7 @@ abilan Artem Bilan - abilan@pivotal.io + abilan@vmware.com project lead @@ -30,7 +30,7 @@ garyrussell Gary Russell - grussell@pivotal.io + grussell@vmware.com lead emeritus @@ -38,16 +38,11 @@ markfisher Mark Fisher - mfisher@pivotal.io + mfisher@vmware.com project founder and lead emeritus - - ghillert - Gunnar Hillert - ghillert@pivotal.io - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git @@ -181,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.0-M2 + 5.3.0-RC1 import pom org.springframework.integration spring-integration-bom - 5.4.0-M2 + 5.4.0-M3 import pom From f40278dae9b9f9b179a8ab37bfa4355331f4f876 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 15 Oct 2020 09:29:35 -0400 Subject: [PATCH 249/356] Upgrade dependencies to latest milestones --- advanced/advanced-testing-examples/pom.xml | 6 +++--- advanced/dynamic-ftp/pom.xml | 6 +++--- advanced/dynamic-tcp-client/pom.xml | 6 +++--- applications/cafe-scripted/pom.xml | 6 +++--- applications/cafe/cafe-amqp/pom.xml | 6 +++--- applications/cafe/cafe-jms/pom.xml | 6 +++--- applications/cafe/cafe-si/pom.xml | 6 +++--- applications/file-split-ftp/pom.xml | 6 +++--- applications/loan-broker/pom.xml | 6 +++--- applications/loanshark/pom.xml | 6 +++--- applications/stomp-chat/pom.xml | 6 +++--- basic/amqp/pom.xml | 6 +++--- basic/barrier/pom.xml | 6 +++--- basic/control-bus/pom.xml | 6 +++--- basic/enricher/pom.xml | 6 +++--- basic/feed/pom.xml | 6 +++--- basic/file/pom.xml | 6 +++--- basic/ftp/pom.xml | 6 +++--- basic/helloworld/pom.xml | 6 +++--- basic/http/pom.xml | 6 +++--- basic/jdbc/pom.xml | 6 +++--- basic/jms/pom.xml | 6 +++--- basic/jmx/pom.xml | 6 +++--- basic/jpa/pom.xml | 6 +++--- basic/kafka/pom.xml | 6 +++--- basic/mail/pom.xml | 6 +++--- basic/mongodb/pom.xml | 6 +++--- basic/mqtt/pom.xml | 6 +++--- basic/oddeven/pom.xml | 6 +++--- basic/quote/pom.xml | 6 +++--- basic/sftp/pom.xml | 6 +++--- basic/splunk/pom.xml | 6 +++--- basic/tcp-amqp/pom.xml | 6 +++--- basic/tcp-broadcast/pom.xml | 6 +++--- basic/tcp-client-server/pom.xml | 6 +++--- basic/tcp-with-headers/pom.xml | 6 +++--- basic/testing-examples/pom.xml | 6 +++--- basic/twitter/pom.xml | 6 +++--- basic/web-sockets/pom.xml | 6 +++--- basic/ws-inbound-gateway/pom.xml | 6 +++--- basic/ws-outbound-gateway/pom.xml | 6 +++--- basic/xml/pom.xml | 6 +++--- basic/xmpp/pom.xml | 6 +++--- build.gradle | 8 ++++---- dsl/cafe-dsl/pom.xml | 6 +++--- dsl/kafka-dsl/pom.xml | 6 +++--- dsl/pom.xml | 6 +++--- dsl/si4demo/pom.xml | 6 +++--- intermediate/async-gateway/pom.xml | 6 +++--- intermediate/dynamic-poller/pom.xml | 6 +++--- intermediate/errorhandling/pom.xml | 6 +++--- intermediate/file-processing/pom.xml | 6 +++--- intermediate/mail-attachments/pom.xml | 6 +++--- intermediate/monitoring/pom.xml | 6 +++--- intermediate/multipart-http/pom.xml | 6 +++--- intermediate/rest-http/pom.xml | 10 +++++----- intermediate/retry-and-more/pom.xml | 6 +++--- intermediate/splitter-aggregator-reaper/pom.xml | 6 +++--- intermediate/stored-procedures-derby/pom.xml | 6 +++--- intermediate/stored-procedures-ms/pom.xml | 6 +++--- intermediate/stored-procedures-oracle/pom.xml | 6 +++--- intermediate/stored-procedures-postgresql/pom.xml | 6 +++--- intermediate/tcp-async-bi-directional/pom.xml | 6 +++--- intermediate/tcp-client-server-multiplex/pom.xml | 6 +++--- intermediate/testcontainers-rabbitmq/pom.xml | 6 +++--- intermediate/travel/pom.xml | 6 +++--- intermediate/tx-synch/pom.xml | 6 +++--- 67 files changed, 204 insertions(+), 204 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 02a475490..55ef566fd 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -99,7 +99,7 @@ junit junit - 4.13 + 4.13.1 test @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 144c50859..5676a5a0e 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 052dbe7de..bce578591 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -80,7 +80,7 @@ junit junit - 4.13 + 4.13.1 test @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 1bbd3309e..c4876fa06 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -145,7 +145,7 @@ junit junit - 4.13 + 4.13.1 test @@ -222,14 +222,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 44a55f0a0..9c3d17797 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -88,7 +88,7 @@ junit junit - 4.13 + 4.13.1 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 2e63dff1d..75c9b5ce6 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -128,7 +128,7 @@ junit junit - 4.13 + 4.13.1 test @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 4cd80359b..5d75c3745 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -87,7 +87,7 @@ junit junit - 4.13 + 4.13.1 test @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 29a5438b2..0a9031a9f 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -137,7 +137,7 @@ junit junit - 4.13 + 4.13.1 test @@ -240,14 +240,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 9a7392723..ba9464f55 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 954b4b1f7..a8a5fe776 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -369,7 +369,7 @@ junit junit - 4.13 + 4.13.1 test @@ -446,14 +446,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index a65db38a3..c4affc5ef 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -102,7 +102,7 @@ junit junit - 4.13 + 4.13.1 test @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index b4e817fb3..68b353d16 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -99,7 +99,7 @@ junit junit - 4.13 + 4.13.1 test @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 40c9138da..2f11904b5 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -113,7 +113,7 @@ junit junit - 4.13 + 4.13.1 test @@ -216,14 +216,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 7d2d23163..e5ae126b1 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 7635a6e6a..6e77da45e 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -88,7 +88,7 @@ junit junit - 4.13 + 4.13.1 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index c55fd1fb0..bfcfdc47e 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index da59a54f2..c58365e99 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index b281f4d99..83d736d49 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -112,7 +112,7 @@ junit junit - 4.13 + 4.13.1 test @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 98ac3b87e..a4003913b 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 5472a84fd..730588634 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -146,7 +146,7 @@ junit junit - 4.13 + 4.13.1 test @@ -223,14 +223,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 32a464d54..af4fb9519 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -88,7 +88,7 @@ junit junit - 4.13 + 4.13.1 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 72595046a..bfb853c72 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -127,7 +127,7 @@ junit junit - 4.13 + 4.13.1 test @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 457dcffbe..028662a7b 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -87,7 +87,7 @@ junit junit - 4.13 + 4.13.1 test @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index fb439b74a..6d1918673 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -115,7 +115,7 @@ junit junit - 4.13 + 4.13.1 test @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 780ee1b3c..20618b199 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -107,7 +107,7 @@ junit junit - 4.13 + 4.13.1 test @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index fefd16861..1c823fde7 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -111,7 +111,7 @@ junit junit - 4.13 + 4.13.1 test @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index f28eb3b93..45863f00a 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -88,7 +88,7 @@ junit junit - 4.13 + 4.13.1 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index fbbefd569..59def6c6a 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -91,7 +91,7 @@ junit junit - 4.13 + 4.13.1 test @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 9984be087..b2aaf5cf9 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 6fb4c9428..5440ddc89 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 68ce9f852..f8b0cff86 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 4bda04ee7..d854016c9 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -92,7 +92,7 @@ junit junit - 4.13 + 4.13.1 test @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 4af4d9c1c..2f31fd875 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -111,7 +111,7 @@ junit junit - 4.13 + 4.13.1 test @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 854c51b13..861b04e86 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -91,7 +91,7 @@ junit junit - 4.13 + 4.13.1 test @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index e16df2ff3..e2619c7dd 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -99,7 +99,7 @@ junit junit - 4.13 + 4.13.1 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 8275c331c..ef53d46b1 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -91,7 +91,7 @@ junit junit - 4.13 + 4.13.1 test @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 5f3db3005..ed13c5e33 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -109,7 +109,7 @@ junit junit - 4.13 + 4.13.1 test @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index df28a6586..947013e6f 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -77,7 +77,7 @@ junit junit - 4.13 + 4.13.1 test @@ -154,14 +154,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 60c2c3c17..1469d56b1 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -80,7 +80,7 @@ junit junit - 4.13 + 4.13.1 test @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 271a2f692..55ec77e2b 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -98,7 +98,7 @@ junit junit - 4.13 + 4.13.1 test @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index e21d9838a..e0d743a02 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -87,7 +87,7 @@ junit junit - 4.13 + 4.13.1 test @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 86eb9873f..8bf04264f 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 15c448de2..0da0bafbd 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/build.gradle b/build.gradle index 66f12ad73..6d251be76 100644 --- a/build.gradle +++ b/build.gradle @@ -195,7 +195,7 @@ subprojects { subproject -> jpa21ApiVersion = '1.0.0.Final' jpaApiVersion = '2.2.1' jstlVersion = '1.2' - junitVersion = '4.13' + junitVersion = '4.13.1' jythonVersion = '2.7.2' log4jVersion = '2.13.3' mockitoVersion = '3.4.6' @@ -206,11 +206,11 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.4.0-M3' + springIntegrationVersion = '5.4.0-RC1' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.0-RC1' - springSecurityVersion = '5.4.0' + springVersion = '5.3.0-RC2' + springSecurityVersion = '5.4.1' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.13.0' tilesJspVersion = '2.2.1' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 9cff546b0..6a1082baf 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -92,7 +92,7 @@ junit junit - 4.13 + 4.13.1 test @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index b3a129d98..de7b15aa7 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -103,7 +103,7 @@ junit junit - 4.13 + 4.13.1 test @@ -206,14 +206,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 104deb129..c9b7cfebf 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -51,7 +51,7 @@ junit junit - 4.13 + 4.13.1 test @@ -128,14 +128,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 6b64928ae..e26710d56 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -161,7 +161,7 @@ junit junit - 4.13 + 4.13.1 test @@ -264,14 +264,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 0a966dafd..baf11183f 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index f3f830d23..80dc5d2f9 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index a127911c1..efd48e3c3 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index a5292470e..9984e26df 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 4b1891a92..89b6c120d 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -123,7 +123,7 @@ junit junit - 4.13 + 4.13.1 test @@ -212,14 +212,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 6823797b1..6fbfba9c6 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -122,7 +122,7 @@ junit junit - 4.13 + 4.13.1 test @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index e04315b20..8b548725a 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -122,7 +122,7 @@ junit junit - 4.13 + 4.13.1 test @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 738771682..6d7049b27 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -141,7 +141,7 @@ org.springframework.security spring-security-web - 5.4.0 + 5.4.1 compile @@ -153,7 +153,7 @@ org.springframework.security spring-security-config - 5.4.0 + 5.4.1 compile @@ -177,7 +177,7 @@ junit junit - 4.13 + 4.13.1 test @@ -254,14 +254,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index bd654b0dd..275e0969a 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -137,7 +137,7 @@ junit junit - 4.13 + 4.13.1 test @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 007d400ff..2f193ed5b 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -88,7 +88,7 @@ junit junit - 4.13 + 4.13.1 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index c012a37ea..b57c9b717 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -88,7 +88,7 @@ junit junit - 4.13 + 4.13.1 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 05bcb6d3a..259465f34 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -100,7 +100,7 @@ junit junit - 4.13 + 4.13.1 test @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 5342c32a0..be516723d 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index d13a3e030..79d8d88ea 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -112,7 +112,7 @@ junit junit - 4.13 + 4.13.1 test @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 2e6fb6b54..06afa065d 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -80,7 +80,7 @@ junit junit - 4.13 + 4.13.1 test @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 55c58b7b7..6bcaa2acd 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -76,7 +76,7 @@ junit junit - 4.13 + 4.13.1 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index a2328ef6c..dc43ee56e 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -91,7 +91,7 @@ junit junit - 4.13 + 4.13.1 test @@ -251,14 +251,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index cab5425e6..f65a43b41 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -98,7 +98,7 @@ junit junit - 4.13 + 4.13.1 test @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index bb8b8d6d0..2f4ff78c4 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -99,7 +99,7 @@ junit junit - 4.13 + 4.13.1 test @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.0-RC1 + 5.3.0-RC2 import pom org.springframework.integration spring-integration-bom - 5.4.0-M3 + 5.4.0-RC1 import pom From 578f6e56b75761db81138266721b0c109f978e90 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 28 Oct 2020 17:28:38 -0400 Subject: [PATCH 250/356] Upgrade dependencies to the latest releases --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/cafe-amqp/pom.xml | 4 ++-- applications/cafe/cafe-jms/pom.xml | 4 ++-- applications/cafe/cafe-si/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 4 ++-- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 4 ++-- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 4 ++-- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 4 ++-- basic/splunk/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 4 ++-- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- build.gradle | 4 ++-- dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 4 ++-- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 4 ++-- intermediate/retry-and-more/pom.xml | 4 ++-- intermediate/splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- intermediate/stored-procedures-postgresql/pom.xml | 4 ++-- intermediate/tcp-async-bi-directional/pom.xml | 4 ++-- intermediate/tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/testcontainers-rabbitmq/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 67 files changed, 134 insertions(+), 134 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 55ef566fd..c2a678d43 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 5676a5a0e..9fa736589 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index bce578591..6a60396e5 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index c4876fa06..cf26a9f36 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -222,14 +222,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 9c3d17797..abac2c421 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 75c9b5ce6..d130150ea 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 5d75c3745..b5f7b9395 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 0a9031a9f..8002f5a12 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -240,14 +240,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index ba9464f55..3c66bdf14 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index a8a5fe776..da5ce207f 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -446,14 +446,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index c4affc5ef..6bfae9a91 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 68b353d16..efbaf0fa7 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 2f11904b5..edfc7d5b1 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -216,14 +216,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index e5ae126b1..64ed0bc1c 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 6e77da45e..98c16d3ef 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index bfcfdc47e..8e024f874 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index c58365e99..1f4d86a90 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 83d736d49..f69a8dea9 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index a4003913b..c051b9b86 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 730588634..c0b8301ca 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -223,14 +223,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index af4fb9519..8de07757f 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index bfb853c72..b1ccf675f 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 028662a7b..028ec561b 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 6d1918673..d881b8f9f 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 20618b199..5d6b8991a 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 1c823fde7..93aa1bdc7 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 45863f00a..ab852e8f2 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 59def6c6a..c13e5320f 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index b2aaf5cf9..0b0404f20 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 5440ddc89..f8a917d35 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index f8b0cff86..a65d96713 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index d854016c9..323d9cad9 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 2f31fd875..91dd8e420 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 861b04e86..340b101b5 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index e2619c7dd..2d8ab3a38 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index ef53d46b1..262afd337 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index ed13c5e33..56271e06b 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 947013e6f..9ddc02946 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -154,14 +154,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 1469d56b1..4a886e469 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 55ec77e2b..d32e98f7f 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index e0d743a02..15c5eec47 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 8bf04264f..cdd514bb9 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 0da0bafbd..fc8838f32 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/build.gradle b/build.gradle index 6d251be76..620ea6707 100644 --- a/build.gradle +++ b/build.gradle @@ -206,10 +206,10 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.4.0-RC1' + springIntegrationVersion = '5.4.0' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.0-RC2' + springVersion = '5.3.0' springSecurityVersion = '5.4.1' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.13.0' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 6a1082baf..5e8201c58 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index de7b15aa7..5ac3589c6 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -206,14 +206,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index c9b7cfebf..a7c2cac9a 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -128,14 +128,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index e26710d56..69778d841 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -264,14 +264,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index baf11183f..f65849638 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 80dc5d2f9..c3ce3625c 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index efd48e3c3..0c2a21e77 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 9984e26df..dfc046c07 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 89b6c120d..6004d806e 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -212,14 +212,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 6fbfba9c6..da9543066 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 8b548725a..a08ec4dc8 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 6d7049b27..5b982d44d 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -254,14 +254,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 275e0969a..976e020f1 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 2f193ed5b..46ec2d624 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index b57c9b717..27f8d6d40 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 259465f34..4a1203c72 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index be516723d..f74f762fd 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 79d8d88ea..97b54493a 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 06afa065d..403d04b3c 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 6bcaa2acd..02548b11c 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index dc43ee56e..bdf37745a 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -251,14 +251,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index f65a43b41..8db658049 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 2f4ff78c4..ab4c3a785 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.0-RC2 + 5.3.0 import pom org.springframework.integration spring-integration-bom - 5.4.0-RC1 + 5.4.0 import pom From a89371902ec0952acd2291a118c3ab27a7c63244 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 11 Nov 2020 15:10:45 -0500 Subject: [PATCH 251/356] Upgrade dependencies to latest versions --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 620ea6707..b9ac0d5c7 100644 --- a/build.gradle +++ b/build.gradle @@ -86,7 +86,7 @@ subprojects { subproject -> developer { id = 'markfisher' name = 'Mark Fisher' - email = 'mfisher@vmware.com' + email = 'markfisher@vmware.com' roles = ["project founder and lead emeritus"] } } @@ -206,10 +206,10 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.4.0' + springIntegrationVersion = '5.4.1' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.0' + springVersion = '5.3.1' springSecurityVersion = '5.4.1' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.13.0' From b51dc6fa55bdb56664683a3d142c899506258c59 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 16 Nov 2020 10:51:39 -0500 Subject: [PATCH 252/356] Clean repositories up in the build script --- advanced/advanced-testing-examples/pom.xml | 8 ++++---- advanced/dynamic-ftp/pom.xml | 8 ++++---- advanced/dynamic-tcp-client/pom.xml | 8 ++++---- advanced/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 8 ++++---- applications/cafe/cafe-amqp/pom.xml | 8 ++++---- applications/cafe/cafe-jms/pom.xml | 8 ++++---- applications/cafe/cafe-si/pom.xml | 8 ++++---- applications/cafe/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 8 ++++---- applications/loan-broker/pom.xml | 8 ++++---- applications/loanshark/pom.xml | 8 ++++---- applications/pom.xml | 4 ++-- applications/stomp-chat/pom.xml | 8 ++++---- basic/amqp/pom.xml | 8 ++++---- basic/barrier/pom.xml | 8 ++++---- basic/control-bus/pom.xml | 8 ++++---- basic/enricher/pom.xml | 8 ++++---- basic/feed/pom.xml | 8 ++++---- basic/file/pom.xml | 8 ++++---- basic/ftp/pom.xml | 8 ++++---- basic/helloworld/pom.xml | 8 ++++---- basic/http/pom.xml | 8 ++++---- basic/jdbc/pom.xml | 8 ++++---- basic/jms/pom.xml | 8 ++++---- basic/jmx/pom.xml | 8 ++++---- basic/jpa/pom.xml | 8 ++++---- basic/kafka/pom.xml | 8 ++++---- basic/mail/pom.xml | 8 ++++---- basic/mongodb/pom.xml | 8 ++++---- basic/mqtt/pom.xml | 8 ++++---- basic/oddeven/pom.xml | 8 ++++---- basic/pom.xml | 4 ++-- basic/quote/pom.xml | 8 ++++---- basic/sftp/pom.xml | 8 ++++---- basic/splunk/pom.xml | 8 ++++---- basic/tcp-amqp/pom.xml | 8 ++++---- basic/tcp-broadcast/pom.xml | 8 ++++---- basic/tcp-client-server/pom.xml | 8 ++++---- basic/tcp-with-headers/pom.xml | 8 ++++---- basic/testing-examples/pom.xml | 8 ++++---- basic/twitter/pom.xml | 8 ++++---- basic/web-sockets/pom.xml | 8 ++++---- basic/ws-inbound-gateway/pom.xml | 8 ++++---- basic/ws-outbound-gateway/pom.xml | 8 ++++---- basic/xml/pom.xml | 8 ++++---- basic/xmpp/pom.xml | 8 ++++---- build.gradle | 5 +++-- dsl/cafe-dsl/pom.xml | 8 ++++---- dsl/kafka-dsl/pom.xml | 8 ++++---- dsl/pom.xml | 8 ++++---- dsl/si4demo/pom.xml | 8 ++++---- intermediate/async-gateway/pom.xml | 8 ++++---- intermediate/dynamic-poller/pom.xml | 8 ++++---- intermediate/errorhandling/pom.xml | 8 ++++---- intermediate/file-processing/pom.xml | 8 ++++---- intermediate/mail-attachments/pom.xml | 8 ++++---- intermediate/monitoring/pom.xml | 8 ++++---- intermediate/multipart-http/pom.xml | 8 ++++---- intermediate/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 8 ++++---- intermediate/retry-and-more/pom.xml | 8 ++++---- intermediate/splitter-aggregator-reaper/pom.xml | 8 ++++---- intermediate/stored-procedures-derby/pom.xml | 8 ++++---- intermediate/stored-procedures-ms/pom.xml | 8 ++++---- intermediate/stored-procedures-oracle/pom.xml | 8 ++++---- intermediate/stored-procedures-postgresql/pom.xml | 8 ++++---- intermediate/tcp-async-bi-directional/pom.xml | 8 ++++---- intermediate/tcp-client-server-multiplex/pom.xml | 8 ++++---- intermediate/testcontainers-rabbitmq/pom.xml | 8 ++++---- intermediate/travel/pom.xml | 8 ++++---- intermediate/tx-synch/pom.xml | 8 ++++---- 72 files changed, 277 insertions(+), 276 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index c2a678d43..c70e4493f 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 9fa736589..2964d4266 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 6a60396e5..442ec8b9d 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -25,7 +25,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -43,7 +43,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/advanced/pom.xml b/advanced/pom.xml index b696467b9..9fa591eae 100644 --- a/advanced/pom.xml +++ b/advanced/pom.xml @@ -19,7 +19,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -37,7 +37,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index cf26a9f36..94a208ce6 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -222,14 +222,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index abac2c421..da15e7f29 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index d130150ea..9fb4c3cf2 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index b5f7b9395..35e5cc12d 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index 44cf5f1ff..379b89e30 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -19,7 +19,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -37,7 +37,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 8002f5a12..8acb01189 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -25,7 +25,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -43,7 +43,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -240,14 +240,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 3c66bdf14..c1a06ae49 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index da5ce207f..fda4745ea 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -446,14 +446,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/applications/pom.xml b/applications/pom.xml index 1f7dea2e1..97a8f8c82 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -19,7 +19,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -37,7 +37,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 6bfae9a91..e562f6add 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -25,7 +25,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -43,7 +43,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index efbaf0fa7..c09b3ec7c 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index edfc7d5b1..6a3082e37 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -25,7 +25,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -43,7 +43,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -216,14 +216,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 64ed0bc1c..9155581f9 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 98c16d3ef..8e6776ed6 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 8e024f874..8985789bb 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 1f4d86a90..54f7bf023 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index f69a8dea9..0a0d744ad 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index c051b9b86..cb4c72398 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index c0b8301ca..f02b2609e 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -223,14 +223,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 8de07757f..914d2ef03 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index b1ccf675f..e628a53f5 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 028ec561b..cfe68d87f 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index d881b8f9f..f6297e1ca 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -25,7 +25,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -43,7 +43,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 5d6b8991a..a6e9cbc1e 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -25,7 +25,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -43,7 +43,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 93aa1bdc7..0edc8b1c3 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index ab852e8f2..4ec19d671 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index c13e5320f..6c410fa08 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -25,7 +25,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -43,7 +43,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 0b0404f20..808202b28 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/pom.xml b/basic/pom.xml index fbe033728..2f02d8d06 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -19,7 +19,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -37,7 +37,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index f8a917d35..8adb1821a 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index a65d96713..12108a61d 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 323d9cad9..d2138311b 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -25,7 +25,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -43,7 +43,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 91dd8e420..eeb022884 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 340b101b5..a396edffd 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -25,7 +25,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -43,7 +43,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 2d8ab3a38..7877e948c 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 262afd337..309592ed5 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -25,7 +25,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -43,7 +43,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 56271e06b..af64871ac 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 9ddc02946..365665632 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -154,14 +154,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 4a886e469..2bdc4d2f9 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -25,7 +25,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -43,7 +43,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index d32e98f7f..a9e00787f 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 15c5eec47..faee000d7 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index cdd514bb9..83633b87d 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index fc8838f32..85bcc7ee7 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/build.gradle b/build.gradle index b9ac0d5c7..049a8e2da 100644 --- a/build.gradle +++ b/build.gradle @@ -30,8 +30,9 @@ allprojects { group = 'org.springframework.integration.samples' repositories { - maven { url 'https://repo.spring.io/libs-snapshot' } + mavenCentral() maven { url 'https://repo.spring.io/libs-milestone' } + maven { url 'https://repo.spring.io/libs-snapshot' } // maven { url 'https://repo.spring.io/libs-staging-local' } } @@ -72,7 +73,7 @@ subprojects { subproject -> developers { developer { - id = 'abilan' + id = 'artembilan' name = 'Artem Bilan' email = 'abilan@vmware.com' roles = ["project lead"] diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 5e8201c58..8aeae2058 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -25,7 +25,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -43,7 +43,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 5ac3589c6..e3329929e 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -25,7 +25,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -43,7 +43,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -206,14 +206,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index a7c2cac9a..f1344f275 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -18,7 +18,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -36,7 +36,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -128,14 +128,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 69778d841..1052e83ae 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -25,7 +25,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -43,7 +43,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -264,14 +264,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index f65849638..830a9bbec 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index c3ce3625c..0e4abc243 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 0c2a21e77..3fb0193a3 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index dfc046c07..44dc806a0 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 6004d806e..d6617a668 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -212,14 +212,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index da9543066..44f8c0732 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index a08ec4dc8..73d227cc9 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/pom.xml b/intermediate/pom.xml index cc79860ff..669b9622f 100644 --- a/intermediate/pom.xml +++ b/intermediate/pom.xml @@ -19,7 +19,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -37,7 +37,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 5b982d44d..40b98fb0b 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -254,14 +254,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 976e020f1..c6bed0ec2 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 46ec2d624..0320a3c2f 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 27f8d6d40..e5f22fdc2 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 4a1203c72..f2515a6a6 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index f74f762fd..a892ecb01 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 97b54493a..ba4eee11c 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 403d04b3c..7cd357093 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -25,7 +25,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -43,7 +43,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 02548b11c..5da8cb02c 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index bdf37745a..4047649d2 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -25,7 +25,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -43,7 +43,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -251,14 +251,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 8db658049..6908abc87 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index ab4c3a785..06a1236ff 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -20,7 +20,7 @@ - abilan + artembilan Artem Bilan abilan@vmware.com @@ -38,7 +38,7 @@ markfisher Mark Fisher - mfisher@vmware.com + markfisher@vmware.com project founder and lead emeritus @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.0 + 5.3.1 import pom org.springframework.integration spring-integration-bom - 5.4.0 + 5.4.1 import pom From 28ecbf9a2c21e3d077105673b2be8f086812ad8e Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 1 Dec 2020 10:07:56 -0500 Subject: [PATCH 253/356] Adjust repositories for plugins in build script --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 049a8e2da..f6e5ed249 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ buildscript { repositories { + mavenCentral() maven { url 'https://repo.spring.io/libs-snapshot' } } dependencies { From 8404de97fa9789ac3a8624d20b916504d6b90e1e Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 7 Dec 2020 09:20:14 -0500 Subject: [PATCH 254/356] Add `plugins.gradle.org` repo into build script --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index f6e5ed249..eef9e324c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ buildscript { repositories { mavenCentral() + maven { url 'https://plugins.gradle.org/m2' } maven { url 'https://repo.spring.io/libs-snapshot' } } dependencies { From 59d0db7bff2da07c28ecd0227514042071788d9d Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 9 Dec 2020 16:29:20 -0500 Subject: [PATCH 255/356] Upgrade dependencies; fix compatibility --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- .../ftp/FtpOutboundChannelAdapterSample.java | 11 +++++----- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 6 +++--- applications/cafe/cafe-amqp/pom.xml | 4 ++-- applications/cafe/cafe-jms/pom.xml | 4 ++-- applications/cafe/cafe-si/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 6 +++--- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 4 ++-- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 6 +++--- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 4 ++-- basic/splunk/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 4 ++-- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- build.gradle | 14 +++++++------ dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 4 ++-- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 20 +++++++++++++++---- intermediate/retry-and-more/pom.xml | 4 ++-- .../splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- .../stored-procedures-postgresql/pom.xml | 4 ++-- intermediate/tcp-async-bi-directional/pom.xml | 4 ++-- .../tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/testcontainers-rabbitmq/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 68 files changed, 163 insertions(+), 148 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index c70e4493f..857ef9d78 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 2964d4266..44ffedc5a 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java index f9013df8d..736f3d0b2 100644 --- a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java +++ b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java @@ -53,7 +53,8 @@ public void runDemo() throws Exception{ } catch (MessagingException e) { assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); - assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust1")); + System.out.println(e.getCause().getCause().getCause().getMessage()); + assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust1")); } // send another so we can see in the log we don't create the ac again. try { @@ -61,7 +62,7 @@ public void runDemo() throws Exception{ } catch (MessagingException e) { assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); - assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust1")); + assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust1")); } // send to a different customer; again, check the log to see a new ac is built message = MessageBuilder.withPayload(file) @@ -71,7 +72,7 @@ public void runDemo() throws Exception{ } catch (MessagingException e) { assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); - assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust2")); + assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust2")); } // send to a different customer; again, check the log to see a new ac is built @@ -83,7 +84,7 @@ public void runDemo() throws Exception{ } catch (MessagingException e) { assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); - assertTrue(e.getCause().getCause().getCause().getMessage().startsWith("host.for.cust3")); + assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust3")); } //send to cust1 again, since this one has been invalidated before, we should @@ -95,7 +96,7 @@ public void runDemo() throws Exception{ } catch (MessagingException e) { assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); - assertEquals("host.for.cust1", e.getCause().getCause().getCause().getMessage()); + assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust1")); } ctx.close(); diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 442ec8b9d..d4415c41e 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 94a208ce6..12204755d 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -121,7 +121,7 @@ org.codehaus.groovy groovy-all - 3.0.5 + 3.0.7 compile @@ -222,14 +222,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index da15e7f29..e8577e015 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 9fb4c3cf2..9cf635f83 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 35e5cc12d..5a5efac32 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 8acb01189..02161ed2e 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -240,14 +240,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index c1a06ae49..bcfc12be6 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index fda4745ea..ccdd2cc49 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -297,7 +297,7 @@ org.hibernate hibernate-entitymanager - 5.4.20.Final + 5.4.25.Final compile @@ -446,14 +446,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index e562f6add..39b348a8c 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index c09b3ec7c..177034639 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 6a3082e37..057fc0e41 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -216,14 +216,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 9155581f9..637876c4b 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 8e6776ed6..b7787681b 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 8985789bb..3824e2ad9 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 54f7bf023..67b9ef119 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 0a0d744ad..e7f92544b 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index cb4c72398..d77be75bf 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index f02b2609e..ae5ed5ac3 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -223,14 +223,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 914d2ef03..6d88da2b4 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index e628a53f5..1cc85ca43 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index cfe68d87f..1d994aa6b 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index f6297e1ca..ac8bd89ac 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index a6e9cbc1e..72fde458b 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 0edc8b1c3..e9a750656 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 4ec19d671..e5fa38361 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -76,7 +76,7 @@ org.mongodb mongodb-driver-sync - 4.1.0 + 4.1.1 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 6c410fa08..7496b3ea8 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 808202b28..9991975f3 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 8adb1821a..029ca30c0 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 12108a61d..cb1e520bd 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index d2138311b..c8bac927e 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index eeb022884..207890c60 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index a396edffd..31900cb9e 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 7877e948c..dbd806930 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 309592ed5..5b4b7f7d0 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index af64871ac..4b3c09cf3 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 365665632..70632a2df 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -154,14 +154,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 2bdc4d2f9..740603ca6 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index a9e00787f..e4ae3281b 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index faee000d7..66b94849d 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 83633b87d..901c0beda 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 85bcc7ee7..6e0e84e42 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/build.gradle b/build.gradle index eef9e324c..4090f0792 100644 --- a/build.gradle +++ b/build.gradle @@ -180,16 +180,17 @@ subprojects { subproject -> c3p0Version = '0.9.1.2' derbyVersion = '10.14.2.0' hamcrestVersion = '2.2' - hibernateVersion = '5.4.20.Final' + hibernateVersion = '5.4.25.Final' hibernateValidatorVersion = '6.1.2.Final' ftpServerVersion = '1.1.1' flexjsonVersion = '2.0' - groovyVersion = '3.0.5' + groovyVersion = '3.0.7' hsqldbVersion = '2.5.1' h2Version = '1.4.200' jacksonVersion = '2.11.1' javaxInjectVersion = '1' javaxMailVersion = '1.6.2' + jaxbVersion = '2.3.3' jodaTimeVersion = '1.6' jtaVersion = '1.1' jtdsVersion = '1.2.6' @@ -202,18 +203,18 @@ subprojects { subproject -> jythonVersion = '2.7.2' log4jVersion = '2.13.3' mockitoVersion = '3.4.6' - mongoDriverVersion = '4.1.0' + mongoDriverVersion = '4.1.1' openJpaVersion = '2.4.0' oracleDriverVersion = '11.2.0.3' postgresVersion = '42.2.14' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.4.1' + springIntegrationVersion = '5.4.2' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.1' - springSecurityVersion = '5.4.1' + springVersion = '5.3.2' + springSecurityVersion = '5.4.2' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.13.0' tilesJspVersion = '2.2.1' @@ -1160,6 +1161,7 @@ project('rest-http') { compile "org.springframework.security:spring-security-web:$springSecurityVersion" compile "org.springframework.security:spring-security-config:$springSecurityVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + compile "com.sun.xml.bind:jaxb-impl:$jaxbVersion" } test { diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 8aeae2058..c8139c0f3 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index e3329929e..d453295e7 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -206,14 +206,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index f1344f275..6894af15b 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -128,14 +128,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 1052e83ae..8f234d38e 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -264,14 +264,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 830a9bbec..5e97d8712 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 0e4abc243..2696c072f 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 3fb0193a3..ce42997eb 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 44dc806a0..f57bdb025 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index d6617a668..65768e8d7 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -212,14 +212,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 44f8c0732..61ed9c6d5 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 73d227cc9..d9993fea3 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 40b98fb0b..b83d7b421 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -141,7 +141,7 @@ org.springframework.security spring-security-web - 5.4.1 + 5.4.2 compile @@ -153,7 +153,7 @@ org.springframework.security spring-security-config - 5.4.1 + 5.4.2 compile @@ -174,6 +174,18 @@ + + com.sun.xml.bind + jaxb-impl + 2.3.3 + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + junit junit @@ -254,14 +266,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index c6bed0ec2..fb2201089 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 0320a3c2f..7d7ade559 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index e5f22fdc2..935733eed 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index f2515a6a6..c03ed3d86 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index a892ecb01..28698fd58 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index ba4eee11c..bb1d9e691 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 7cd357093..a46f6000b 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 5da8cb02c..3b556e6fb 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 4047649d2..2807cc354 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -251,14 +251,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 6908abc87..3fa601708 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 06a1236ff..a269184c8 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.1 + 5.3.2 import pom org.springframework.integration spring-integration-bom - 5.4.1 + 5.4.2 import pom From e6ce2d2c3bb0dc448619b442ac5cd458534ad8b8 Mon Sep 17 00:00:00 2001 From: YevheniiLutsyshyn Date: Mon, 14 Dec 2020 14:30:28 +0100 Subject: [PATCH 256/356] Fix typo in readme.md --- basic/sftp/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basic/sftp/README.md b/basic/sftp/README.md index a3849aca9..711fdbd34 100644 --- a/basic/sftp/README.md +++ b/basic/sftp/README.md @@ -21,7 +21,7 @@ NOTE: The test cases will create/delete a directory `si.sftp.sample`. ## INBOUND CHANNEL ADAPTER -To run the NBOUND CHANNEL ADAPTER sample execute **SftpInboundReceiveSample** test. You will see that based on configuration it will access the sample remote directory which contains 3 files and will attempt to securely copy them to a local directory which will be generated. The output should look like this: +To run the INBOUND CHANNEL ADAPTER sample execute **SftpInboundReceiveSample** test. You will see that based on configuration it will access the sample remote directory which contains 3 files and will attempt to securely copy them to a local directory which will be generated. The output should look like this: Received first file message: [Payload=local-dir/a.txt][Headers={timestamp=1290066001349, id=9dca686a-cfd4-4d96-a1a7-761feb005e43}] Received second file message: [Payload=local-dir/b.txt][Headers={timestamp=1290066001650, id=d33a475d-fa71-4c5b-b73e-3147969f1c6f}] From 571a991ef6b8fd678f484eba4ef9a4821c420078 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 13 Jan 2021 16:03:25 -0500 Subject: [PATCH 257/356] Upgrade dependencies --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/cafe-amqp/pom.xml | 4 ++-- applications/cafe/cafe-jms/pom.xml | 4 ++-- applications/cafe/cafe-si/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 4 ++-- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 4 ++-- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 4 ++-- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 4 ++-- basic/splunk/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 4 ++-- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- build.gradle | 4 ++-- dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 4 ++-- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 4 ++-- intermediate/retry-and-more/pom.xml | 4 ++-- intermediate/splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- intermediate/stored-procedures-postgresql/pom.xml | 4 ++-- intermediate/tcp-async-bi-directional/pom.xml | 4 ++-- intermediate/tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/testcontainers-rabbitmq/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 67 files changed, 134 insertions(+), 134 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 857ef9d78..bccc32212 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 44ffedc5a..3086bfee6 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index d4415c41e..0b0bca1eb 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 12204755d..4a5263876 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -222,14 +222,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index e8577e015..d78b889df 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 9cf635f83..e1a70dc82 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 5a5efac32..a3316c89d 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 02161ed2e..cca40936c 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -240,14 +240,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index bcfc12be6..a356d416d 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index ccdd2cc49..652114f0a 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -446,14 +446,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 39b348a8c..ad8bf6987 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 177034639..7f754d428 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 057fc0e41..732169314 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -216,14 +216,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 637876c4b..20241cde6 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index b7787681b..ed68448a6 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 3824e2ad9..d65b710f6 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 67b9ef119..b6c9cd2bc 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index e7f92544b..b3deb3eb0 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index d77be75bf..17b373ce7 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index ae5ed5ac3..eafcb3a5e 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -223,14 +223,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 6d88da2b4..29d022164 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 1cc85ca43..b773c6378 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 1d994aa6b..2465e4cfd 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index ac8bd89ac..dcd1be4ef 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 72fde458b..ae9b3abed 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index e9a750656..9943dce95 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index e5fa38361..d5999cb51 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 7496b3ea8..58d958a2e 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 9991975f3..2045f3880 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 029ca30c0..42ee80d90 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index cb1e520bd..1755997c5 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index c8bac927e..fef43af43 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 207890c60..ec6c618e3 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 31900cb9e..918c62349 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index dbd806930..89b8c0703 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 5b4b7f7d0..c5579f1a3 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 4b3c09cf3..d9687cbd4 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 70632a2df..b97734ad3 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -154,14 +154,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 740603ca6..675c8617a 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index e4ae3281b..e639f72d6 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 66b94849d..d4a44ea4a 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 901c0beda..1cd7e113f 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 6e0e84e42..3a54db4e3 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/build.gradle b/build.gradle index 4090f0792..0d9836d05 100644 --- a/build.gradle +++ b/build.gradle @@ -210,10 +210,10 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.4.2' + springIntegrationVersion = '5.4.3' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.2' + springVersion = '5.3.3' springSecurityVersion = '5.4.2' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.13.0' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index c8139c0f3..e73499000 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index d453295e7..a2805545a 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -206,14 +206,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 6894af15b..50110f4d1 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -128,14 +128,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 8f234d38e..46769aba2 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -264,14 +264,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 5e97d8712..540def942 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 2696c072f..82f4cf6b5 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index ce42997eb..df6f3155c 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index f57bdb025..2bb47879a 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 65768e8d7..30fea02c5 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -212,14 +212,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 61ed9c6d5..19324b1ee 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index d9993fea3..974e84fb2 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index b83d7b421..94dad652f 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -266,14 +266,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index fb2201089..2477df0dd 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 7d7ade559..841d1f98b 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 935733eed..1ab80fd6a 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index c03ed3d86..5350742ce 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 28698fd58..3f15288be 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index bb1d9e691..5f6eb1913 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index a46f6000b..5f7fce219 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 3b556e6fb..8e9466fd7 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 2807cc354..c21df6371 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -251,14 +251,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 3fa601708..ef367d092 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index a269184c8..71d96f216 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.2 + 5.3.3 import pom org.springframework.integration spring-integration-bom - 5.4.2 + 5.4.3 import pom From f77fae75ad4b39c848aeda4df2e3090b4c28c3ec Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 20 Jan 2021 16:19:41 -0500 Subject: [PATCH 258/356] Upgrade to SI 5.5.0-M1 - ignore failing test in tcp-client-server-multiplex. --- advanced/advanced-testing-examples/pom.xml | 2 +- advanced/dynamic-ftp/pom.xml | 2 +- advanced/dynamic-tcp-client/pom.xml | 2 +- applications/cafe-scripted/pom.xml | 2 +- applications/cafe/cafe-amqp/pom.xml | 2 +- applications/cafe/cafe-jms/pom.xml | 2 +- applications/cafe/cafe-si/pom.xml | 2 +- applications/file-split-ftp/pom.xml | 2 +- applications/loan-broker/pom.xml | 2 +- applications/loanshark/pom.xml | 2 +- applications/stomp-chat/pom.xml | 2 +- basic/amqp/pom.xml | 2 +- basic/barrier/pom.xml | 2 +- basic/control-bus/pom.xml | 2 +- basic/enricher/pom.xml | 2 +- basic/feed/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/kafka/pom.xml | 2 +- basic/mail/pom.xml | 2 +- basic/mongodb/pom.xml | 2 +- basic/mqtt/pom.xml | 2 +- basic/oddeven/pom.xml | 2 +- basic/quote/pom.xml | 2 +- basic/sftp/pom.xml | 2 +- basic/splunk/pom.xml | 2 +- basic/tcp-amqp/pom.xml | 2 +- basic/tcp-broadcast/pom.xml | 2 +- basic/tcp-client-server/pom.xml | 2 +- basic/tcp-with-headers/pom.xml | 2 +- basic/testing-examples/pom.xml | 2 +- basic/twitter/pom.xml | 2 +- basic/web-sockets/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 +- build.gradle | 4 ++-- dsl/cafe-dsl/pom.xml | 2 +- dsl/kafka-dsl/pom.xml | 2 +- dsl/pom.xml | 2 +- dsl/si4demo/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/rest-http/pom.xml | 2 +- intermediate/retry-and-more/pom.xml | 2 +- .../splitter-aggregator-reaper/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 +- intermediate/tcp-async-bi-directional/pom.xml | 2 +- .../tcp-client-server-multiplex/.factorypath | 18 ++++++++++++++++++ .../tcp-client-server-multiplex/pom.xml | 2 +- .../TcpClientServerDemoTest.java | 2 ++ intermediate/testcontainers-rabbitmq/pom.xml | 2 +- intermediate/travel/pom.xml | 2 +- intermediate/tx-synch/pom.xml | 2 +- 69 files changed, 88 insertions(+), 68 deletions(-) create mode 100644 intermediate/tcp-client-server-multiplex/.factorypath diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index bccc32212..5ab6f8db6 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -183,7 +183,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 3086bfee6..fe5a951ae 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 0b0bca1eb..05f28fe7d 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -190,7 +190,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 4a5263876..507a8984d 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -229,7 +229,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index d78b889df..d17338d8f 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index e1a70dc82..f89c7d0cb 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -212,7 +212,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index a3316c89d..8dd866de0 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -171,7 +171,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index cca40936c..31ddd3bcd 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -247,7 +247,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index a356d416d..6371bac04 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 652114f0a..6de921004 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -453,7 +453,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index ad8bf6987..02f53d6ba 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -212,7 +212,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 7f754d428..306f47ecc 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -183,7 +183,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 732169314..bd8cafb4b 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -223,7 +223,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 20241cde6..721963a07 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index ed68448a6..5449d1348 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index d65b710f6..90f2a467e 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index b6c9cd2bc..40b8fcd23 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index b3deb3eb0..06028e7a8 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -208,7 +208,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 17b373ce7..388065b04 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index eafcb3a5e..3f58b9501 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -230,7 +230,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 29d022164..9cfa047bc 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index b773c6378..c1c8340a5 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -211,7 +211,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 2465e4cfd..6aec6cf60 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -171,7 +171,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index dcd1be4ef..b3e8265be 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -225,7 +225,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index ae9b3abed..ac489d726 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -217,7 +217,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 9943dce95..4d313a34e 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -195,7 +195,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index d5999cb51..2423351ed 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 58d958a2e..347920232 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -201,7 +201,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 2045f3880..0aa268e99 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 42ee80d90..02fa3aa6f 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 1755997c5..845bcbe8c 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index fef43af43..5febdf614 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -202,7 +202,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index ec6c618e3..37b61350b 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -195,7 +195,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 918c62349..a7cdeffc8 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -201,7 +201,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 89b8c0703..9e7c3896c 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index c5579f1a3..133df3cef 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -201,7 +201,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index d9687cbd4..01bd30230 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -193,7 +193,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index b97734ad3..227c107c6 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -161,7 +161,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 675c8617a..8395f2102 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -190,7 +190,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index e639f72d6..b35664481 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -182,7 +182,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index d4a44ea4a..4f3ad4201 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -171,7 +171,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 1cd7e113f..5dbe2923d 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 3a54db4e3..c8f142a9b 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/build.gradle b/build.gradle index 0d9836d05..14a66ec18 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ allprojects { mavenCentral() maven { url 'https://repo.spring.io/libs-milestone' } maven { url 'https://repo.spring.io/libs-snapshot' } -// maven { url 'https://repo.spring.io/libs-staging-local' } + maven { url 'https://repo.spring.io/libs-staging-local' } } } @@ -210,7 +210,7 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.4.3' + springIntegrationVersion = '5.5.0-M1' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' springVersion = '5.3.3' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index e73499000..1a68df90f 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -202,7 +202,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index a2805545a..d80ed55c1 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -213,7 +213,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 50110f4d1..7c4066e99 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -135,7 +135,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 46769aba2..09156416f 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -271,7 +271,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 540def942..1f4c5a7ac 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 82f4cf6b5..3ef68fded 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index df6f3155c..8381fcf82 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 2bb47879a..a136be7ad 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 30fea02c5..076ca5bca 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -219,7 +219,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 19324b1ee..6b2ecabee 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -206,7 +206,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 974e84fb2..fea4ba3a7 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -206,7 +206,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 94dad652f..c3f026c69 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -273,7 +273,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 2477df0dd..f20807edc 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -193,7 +193,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 841d1f98b..09882c8e8 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 1ab80fd6a..218216aaf 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 5350742ce..c72a0e0e7 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -184,7 +184,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 3f15288be..715d5c094 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 5f6eb1913..9e01ca305 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -196,7 +196,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 5f7fce219..fbc103a47 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -190,7 +190,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/tcp-client-server-multiplex/.factorypath b/intermediate/tcp-client-server-multiplex/.factorypath new file mode 100644 index 000000000..eaa4eece8 --- /dev/null +++ b/intermediate/tcp-client-server-multiplex/.factorypath @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 8e9466fd7..790d519df 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java b/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java index 503fab311..a862934db 100644 --- a/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java +++ b/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -60,6 +61,7 @@ locations = { "/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml" }) @RunWith(SpringJUnit4ClassRunner.class) @DirtiesContext +@Ignore public class TcpClientServerDemoTest { @Autowired diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index c21df6371..8740548a5 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -258,7 +258,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index ef367d092..b3ee9226c 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -182,7 +182,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 71d96f216..c83211e12 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -183,7 +183,7 @@ org.springframework.integration spring-integration-bom - 5.4.3 + 5.5.0-M1 import pom From f3dd7cc4b9fc39630975fb32b163339c1ca31b5a Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 22 Jan 2021 11:30:36 -0500 Subject: [PATCH 259/356] Back to SNAPSHOTS; restore ignored test Resolves https://github.com/spring-projects/spring-integration-samples/issues/291 --- .gitignore | 1 + build.gradle | 2 +- .../tcp-client-server-multiplex/.factorypath | 18 ------------------ .../TcpClientServerDemoTest.java | 2 -- 4 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 intermediate/tcp-client-server-multiplex/.factorypath diff --git a/.gitignore b/.gitignore index b6db91087..04e4e5459 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ derby.log activemq-data .settings/ .sts4-cache +.factorypath out /.gradle build/ diff --git a/build.gradle b/build.gradle index 14a66ec18..ee7a157a9 100644 --- a/build.gradle +++ b/build.gradle @@ -210,7 +210,7 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.5.0-M1' + springIntegrationVersion = '5.5.0-SNAPSHOT' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' springVersion = '5.3.3' diff --git a/intermediate/tcp-client-server-multiplex/.factorypath b/intermediate/tcp-client-server-multiplex/.factorypath deleted file mode 100644 index eaa4eece8..000000000 --- a/intermediate/tcp-client-server-multiplex/.factorypath +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java b/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java index a862934db..503fab311 100644 --- a/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java +++ b/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java @@ -28,7 +28,6 @@ import java.util.concurrent.TimeUnit; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -61,7 +60,6 @@ locations = { "/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml" }) @RunWith(SpringJUnit4ClassRunner.class) @DirtiesContext -@Ignore public class TcpClientServerDemoTest { @Autowired From b0885ccf81508403e5ba785ffe2fe56f68a5ed6b Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Sat, 23 Jan 2021 09:58:30 -0500 Subject: [PATCH 260/356] Update tcp-client-server-intermediate POM --- intermediate/tcp-client-server-multiplex/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 790d519df..11e861e80 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-SNAPSHOT import pom From 51669848ce51c7746d17c0047f7bd186b69c11fd Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 27 Jan 2021 11:40:23 -0500 Subject: [PATCH 261/356] Resolve Sonar Reported Bugs --- .../PayloadAwareTimingInterceptor.java | 10 +++++----- .../jdbc/storedproc/derby/DerbyStoredProcedures.java | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java b/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java index f01c7d74d..07da6c6a9 100644 --- a/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java @@ -37,7 +37,7 @@ @ManagedResource public class PayloadAwareTimingInterceptor implements ChannelInterceptor { - private final ThreadLocal stopWatchHolder = new ThreadLocal(); + private static final ThreadLocal stopWatchHolder = new ThreadLocal(); private final Map, Stats> statsMap = new ConcurrentHashMap, PayloadAwareTimingInterceptor.Stats>(); @@ -59,13 +59,13 @@ public PayloadAwareTimingInterceptor(Class[] classes) { public Message preSend(Message message, MessageChannel channel) { StopWatch stopWatch = new StopWatch(); stopWatch.start(); - this.stopWatchHolder.set(new StopWatchHolder(stopWatch, message.getPayload().getClass())); + stopWatchHolder.set(new StopWatchHolder(stopWatch, message.getPayload().getClass())); return message; } @Override public void postSend(Message message, MessageChannel channel, boolean sent) { - StopWatchHolder holder = this.stopWatchHolder.get(); + StopWatchHolder holder = stopWatchHolder.get(); if (holder != null) { holder.getStopWatch().stop(); Stats stats = this.statsMap.get(holder.getType()); @@ -125,7 +125,7 @@ public Class getType() { } } - private class Stats { + private static final class Stats { private long count; @@ -159,6 +159,6 @@ public String toString() { return "Stats [count=" + count + ", average=" + average + ", lastTime=" + lastTime + "]"; } - } + } diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/jdbc/storedproc/derby/DerbyStoredProcedures.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/jdbc/storedproc/derby/DerbyStoredProcedures.java index 042ae8647..d9dba2488 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/jdbc/storedproc/derby/DerbyStoredProcedures.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/jdbc/storedproc/derby/DerbyStoredProcedures.java @@ -38,7 +38,7 @@ private DerbyStoredProcedures() { public static void findCoffee(int coffeeId, String[] coffeeDescription) throws SQLException { Connection connection = null; - PreparedStatement statement = null; + PreparedStatement statement = null; // NOSONAR JdbcUtils try { connection = DriverManager.getConnection("jdbc:default:connection"); @@ -46,7 +46,7 @@ public static void findCoffee(int coffeeId, String[] coffeeDescription) statement = connection.prepareStatement(sql); statement.setLong(1, coffeeId); - ResultSet resultset = statement.executeQuery(); + ResultSet resultset = statement.executeQuery(); // NOSONAR JdbcUtils resultset.next(); coffeeDescription[0] = resultset.getString("COFFEE_DESCRIPTION"); @@ -61,7 +61,7 @@ public static void findCoffee(int coffeeId, String[] coffeeDescription) public static void findAllCoffeeBeverages(ResultSet[] coffeeBeverages) throws SQLException { - Connection connection = null; + Connection connection = null; // NOSONAR JdbcUtils PreparedStatement statement = null; try { @@ -76,4 +76,5 @@ public static void findAllCoffeeBeverages(ResultSet[] coffeeBeverages) } } + } From 0aadc6538c8101100b8c67cdecedd4ffb081a456 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 28 Jan 2021 11:15:26 -0500 Subject: [PATCH 262/356] More Sonar Fixes --- .../org/springintegration/PayloadAwareTimingInterceptor.java | 2 +- .../jdbc/storedproc/derby/DerbyStoredProcedures.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java b/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java index 07da6c6a9..24327a0d2 100644 --- a/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java @@ -101,7 +101,7 @@ public float getAverage(String className) throws Exception { return this.statsMap.get(Class.forName(className)).getAverage(); } - private class StopWatchHolder { + private static class StopWatchHolder { private final StopWatch stopWatch; diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/jdbc/storedproc/derby/DerbyStoredProcedures.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/jdbc/storedproc/derby/DerbyStoredProcedures.java index d9dba2488..c2eda7702 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/jdbc/storedproc/derby/DerbyStoredProcedures.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/jdbc/storedproc/derby/DerbyStoredProcedures.java @@ -37,7 +37,7 @@ private DerbyStoredProcedures() { public static void findCoffee(int coffeeId, String[] coffeeDescription) throws SQLException { - Connection connection = null; + Connection connection = null; // NOSONAR JdbcUtils PreparedStatement statement = null; // NOSONAR JdbcUtils try { From 85fa429a11c868fd0e31c87af69d6c88fc137222 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 18 Feb 2021 11:56:46 -0500 Subject: [PATCH 263/356] Upgrade dependencies including Gradle * Some Gradle script clean up * disable Splunk sample since there is no `splunk` artifact in any reasonable repository --- advanced/advanced-testing-examples/pom.xml | 12 +- advanced/dynamic-ftp/pom.xml | 12 +- advanced/dynamic-tcp-client/pom.xml | 14 +- applications/cafe-scripted/pom.xml | 14 +- applications/cafe/cafe-amqp/pom.xml | 12 +- applications/cafe/cafe-jms/pom.xml | 16 +- applications/cafe/cafe-si/pom.xml | 12 +- applications/file-split-ftp/pom.xml | 36 +- applications/loan-broker/pom.xml | 12 +- applications/loanshark/pom.xml | 22 +- applications/stomp-chat/pom.xml | 14 +- basic/amqp/pom.xml | 14 +- basic/barrier/pom.xml | 14 +- basic/control-bus/pom.xml | 12 +- basic/enricher/pom.xml | 12 +- basic/feed/pom.xml | 12 +- basic/file/pom.xml | 12 +- basic/ftp/pom.xml | 18 +- basic/helloworld/pom.xml | 12 +- basic/http/pom.xml | 36 +- basic/jdbc/pom.xml | 12 +- basic/jms/pom.xml | 16 +- basic/jmx/pom.xml | 12 +- basic/jpa/pom.xml | 14 +- basic/kafka/pom.xml | 16 +- basic/mail/pom.xml | 34 +- basic/mongodb/pom.xml | 14 +- basic/mqtt/pom.xml | 14 +- basic/oddeven/pom.xml | 12 +- basic/quote/pom.xml | 12 +- basic/sftp/pom.xml | 12 +- basic/tcp-amqp/pom.xml | 16 +- basic/tcp-broadcast/pom.xml | 14 +- basic/tcp-client-server/pom.xml | 12 +- basic/tcp-with-headers/pom.xml | 14 +- basic/testing-examples/pom.xml | 12 +- basic/twitter/pom.xml | 12 +- basic/web-sockets/pom.xml | 14 +- basic/ws-inbound-gateway/pom.xml | 12 +- basic/ws-outbound-gateway/pom.xml | 12 +- basic/xml/pom.xml | 12 +- basic/xmpp/pom.xml | 12 +- build.gradle | 372 +++++++++--------- dsl/cafe-dsl/pom.xml | 14 +- dsl/kafka-dsl/pom.xml | 16 +- dsl/pom.xml | 10 +- dsl/si4demo/pom.xml | 36 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 58910 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- gradlew.bat | 21 +- intermediate/async-gateway/pom.xml | 12 +- intermediate/dynamic-poller/pom.xml | 12 +- intermediate/errorhandling/pom.xml | 12 +- intermediate/file-processing/pom.xml | 12 +- intermediate/mail-attachments/pom.xml | 36 +- intermediate/monitoring/pom.xml | 12 +- intermediate/multipart-http/pom.xml | 14 +- intermediate/rest-http/pom.xml | 16 +- intermediate/retry-and-more/pom.xml | 12 +- .../splitter-aggregator-reaper/pom.xml | 12 +- intermediate/stored-procedures-derby/pom.xml | 12 +- intermediate/stored-procedures-ms/pom.xml | 12 +- intermediate/stored-procedures-oracle/pom.xml | 24 +- .../stored-procedures-postgresql/pom.xml | 14 +- intermediate/tcp-async-bi-directional/pom.xml | 14 +- .../tcp-client-server-multiplex/pom.xml | 12 +- intermediate/testcontainers-rabbitmq/pom.xml | 16 +- intermediate/travel/pom.xml | 12 +- intermediate/tx-synch/pom.xml | 12 +- settings.gradle | 2 +- 72 files changed, 722 insertions(+), 661 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 5ab6f8db6..950b68a7a 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -99,7 +99,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -127,7 +127,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -169,21 +169,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index fe5a951ae..0f591b917 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 05f28fe7d..b7451b6b3 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples dynamic-tcp-client @@ -80,7 +80,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -108,7 +108,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -169,28 +169,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 507a8984d..32b2a7482 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -97,7 +97,7 @@ org.jruby jruby-complete - 9.2.13.0 + 9.2.14.0 compile @@ -133,7 +133,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -145,7 +145,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -173,7 +173,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -215,21 +215,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index d17338d8f..e89f07929 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -88,7 +88,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -158,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index f89c7d0cb..3aaf6e303 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -65,7 +65,7 @@ org.apache.activemq activemq-broker - 5.16.0 + 5.16.1 compile @@ -77,7 +77,7 @@ org.apache.activemq activemq-kahadb-store - 5.16.0 + 5.16.1 compile @@ -116,7 +116,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -128,7 +128,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -156,7 +156,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -198,21 +198,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 8dd866de0..cb0d7cbee 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -87,7 +87,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -115,7 +115,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -157,21 +157,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 31ddd3bcd..e9ca07be3 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples file-split-ftp @@ -111,9 +111,9 @@ - javax.mail - javax.mail-api - 1.6.2 + jakarta.mail + jakarta.mail-api + 1.6.5 compile @@ -124,8 +124,20 @@ com.sun.mail - javax.mail - 1.6.2 + imap + 1.6.5 + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + com.sun.mail + jakarta.mail + 1.6.5 compile @@ -137,7 +149,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -165,7 +177,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -226,28 +238,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 6371bac04..3018db5dd 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 6de921004..e13ffdd4e 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -165,7 +165,7 @@ org.apache.commons commons-dbcp2 - 2.7.0 + 2.8.0 compile @@ -297,7 +297,7 @@ org.hibernate hibernate-entitymanager - 5.4.25.Final + 5.4.28.Final compile @@ -321,7 +321,7 @@ org.slf4j slf4j-api - 1.7.25 + 1.7.30 compile @@ -333,7 +333,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 runtime @@ -345,7 +345,7 @@ org.slf4j slf4j-log4j12 - 1.7.25 + 1.7.30 runtime @@ -357,7 +357,7 @@ org.slf4j jcl-over-slf4j - 1.7.25 + 1.7.30 runtime @@ -369,7 +369,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -397,7 +397,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -439,21 +439,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 02f53d6ba..417a1f5d1 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples stomp-chat @@ -102,7 +102,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -130,7 +130,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -191,28 +191,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 306f47ecc..3405b6b50 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -87,7 +87,7 @@ org.slf4j slf4j-jcl - 1.7.25 + 1.7.30 runtime @@ -99,7 +99,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -127,7 +127,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -169,21 +169,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index bd8cafb4b..4d16376a6 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples barrier @@ -113,7 +113,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -141,7 +141,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -202,28 +202,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 721963a07..a048be5d8 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 5449d1348..ada8abef7 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -88,7 +88,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -158,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 90f2a467e..84a84d558 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 40b8fcd23..8ad5f4b7e 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 06028e7a8..ffbe961cd 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -64,7 +64,7 @@ commons-io commons-io - 2.7 + 2.8.0 compile @@ -88,7 +88,7 @@ org.slf4j slf4j-api - 1.7.25 + 1.7.30 compile @@ -100,7 +100,7 @@ org.slf4j slf4j-log4j12 - 1.7.25 + 1.7.30 runtime @@ -112,7 +112,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -140,7 +140,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -167,7 +167,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 test @@ -194,21 +194,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 388065b04..2e3579e26 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 3f58b9501..816d5d936 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -98,7 +98,7 @@ commons-io commons-io - 2.7 + 2.8.0 compile @@ -108,9 +108,9 @@ - javax.mail - javax.mail-api - 1.6.2 + jakarta.mail + jakarta.mail-api + 1.6.5 compile @@ -121,8 +121,20 @@ com.sun.mail - javax.mail - 1.6.2 + imap + 1.6.5 + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + com.sun.mail + jakarta.mail + 1.6.5 compile @@ -134,7 +146,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -146,7 +158,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -174,7 +186,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -216,21 +228,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 9cfa047bc..1574f2ef8 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -88,7 +88,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -158,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index c1c8340a5..603e9725c 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -87,7 +87,7 @@ org.apache.activemq activemq-broker - 5.16.0 + 5.16.1 compile @@ -99,7 +99,7 @@ org.apache.activemq activemq-kahadb-store - 5.16.0 + 5.16.1 compile @@ -115,7 +115,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -127,7 +127,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -155,7 +155,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -197,21 +197,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 6aec6cf60..20aa3d90c 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -87,7 +87,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -115,7 +115,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -157,21 +157,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index b3e8265be..be2d604e3 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples jpa @@ -115,7 +115,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -143,7 +143,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -204,28 +204,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index ac489d726..ba0b58cdf 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples kafka @@ -95,7 +95,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -107,7 +107,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -135,7 +135,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -196,28 +196,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 4d313a34e..0d107a0c4 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -73,9 +73,9 @@ - javax.mail - javax.mail-api - 1.6.2 + jakarta.mail + jakarta.mail-api + 1.6.5 compile @@ -86,8 +86,20 @@ com.sun.mail - javax.mail - 1.6.2 + imap + 1.6.5 + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + com.sun.mail + jakarta.mail + 1.6.5 compile @@ -99,7 +111,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -111,7 +123,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -139,7 +151,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -181,21 +193,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 2423351ed..9823a02e2 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ org.mongodb mongodb-driver-sync - 4.1.1 + 4.2.0 compile @@ -88,7 +88,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -158,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 347920232..d890c6bc5 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples mqtt @@ -91,7 +91,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -119,7 +119,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -180,28 +180,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 0aa268e99..f6e3085b8 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 02fa3aa6f..dac553351 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 845bcbe8c..0ffb1fdde 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -158,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 37b61350b..e6b903c7d 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -75,7 +75,7 @@ org.slf4j slf4j-api - 1.7.25 + 1.7.30 compile @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 runtime @@ -99,7 +99,7 @@ org.slf4j slf4j-log4j12 - 1.7.25 + 1.7.30 runtime @@ -111,7 +111,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -139,7 +139,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -181,21 +181,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index a7cdeffc8..a0a18cf96 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples tcp-broadcast @@ -91,7 +91,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -119,7 +119,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -180,28 +180,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 9e7c3896c..6521c2996 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -99,7 +99,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -127,7 +127,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -158,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 133df3cef..8b045c40a 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples tcp-with-headers @@ -91,7 +91,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -119,7 +119,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -180,28 +180,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 01bd30230..dd8d366a4 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -97,7 +97,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -109,7 +109,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -137,7 +137,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -179,21 +179,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 227c107c6..6f6d6521e 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -77,7 +77,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -105,7 +105,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -147,21 +147,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 8395f2102..3e547b1d9 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples web-sockets @@ -80,7 +80,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -108,7 +108,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -169,28 +169,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index b35664481..1bcf17341 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -86,7 +86,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -98,7 +98,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -126,7 +126,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -168,21 +168,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 4f3ad4201..3f9c9e775 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -87,7 +87,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -115,7 +115,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -157,21 +157,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 5dbe2923d..576c8782a 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index c8f142a9b..dcd91d653 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/build.gradle b/build.gradle index ee7a157a9..9028994d0 100644 --- a/build.gradle +++ b/build.gradle @@ -5,13 +5,13 @@ buildscript { maven { url 'https://repo.spring.io/libs-snapshot' } } dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:1.0.10.RELEASE' + classpath 'io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" - classpath "gradle.plugin.org.gretty:gretty:2.3.1" + classpath 'gradle.plugin.org.gretty:gretty:2.3.1' } } plugins { - id "org.sonarqube" version "2.8" + id 'org.sonarqube' version '2.8' } description = 'Spring Integration Samples' @@ -22,7 +22,7 @@ apply plugin: 'idea' ext { linkHomepage = 'https://projects.spring.io/spring-integration' linkCi = 'https://build.spring.io/browse/INTSAMPLES' - linkIssue = 'https://jira.spring.io/browse/INTSAMPLES' + linkIssue = 'https://github.com/spring-projects/spring-integration-samples/issues' linkScmUrl = 'https://github.com/spring-projects/spring-integration-samples' linkScmConnection = 'scm:git:git://github.com/spring-projects/spring-integration-samples.git' linkScmDevConnection = 'scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git' @@ -35,7 +35,7 @@ allprojects { mavenCentral() maven { url 'https://repo.spring.io/libs-milestone' } maven { url 'https://repo.spring.io/libs-snapshot' } - maven { url 'https://repo.spring.io/libs-staging-local' } +// maven { url 'https://repo.spring.io/libs-staging-local' } } } @@ -78,19 +78,19 @@ subprojects { subproject -> id = 'artembilan' name = 'Artem Bilan' email = 'abilan@vmware.com' - roles = ["project lead"] + roles = ['project lead'] } developer { id = 'garyrussell' name = 'Gary Russell' email = 'grussell@vmware.com' - roles = ["lead emeritus"] + roles = ['lead emeritus'] } developer { id = 'markfisher' name = 'Mark Fisher' email = 'markfisher@vmware.com' - roles = ["project founder and lead emeritus"] + roles = ['project founder and lead emeritus'] } } @@ -159,7 +159,7 @@ subprojects { subproject -> apply plugin: 'io.spring.dependency-management' jacoco { - toolVersion = "0.8.5" + toolVersion = "0.8.6" } compileJava { @@ -168,55 +168,55 @@ subprojects { subproject -> } ext { - activeMqVersion = '5.16.0' + activeMqVersion = '5.16.1' apacheSshdVersion = '2.5.1' aspectjVersion = '1.9.6' commonsDigesterVersion = '2.0' - commonsDbcpVersion = '2.7.0' + commonsDbcpVersion = '2.8.0' commonsFileUploadVersion = '1.4' - commonsIoVersion = '2.7' + commonsIoVersion = '2.8.0' commonsLangVersion = '2.6' commonsPoolVersion = '1.5.4' c3p0Version = '0.9.1.2' derbyVersion = '10.14.2.0' hamcrestVersion = '2.2' - hibernateVersion = '5.4.25.Final' + hibernateVersion = '5.4.28.Final' hibernateValidatorVersion = '6.1.2.Final' ftpServerVersion = '1.1.1' flexjsonVersion = '2.0' groovyVersion = '3.0.7' hsqldbVersion = '2.5.1' h2Version = '1.4.200' - jacksonVersion = '2.11.1' + jacksonVersion = '2.12.1' javaxInjectVersion = '1' - javaxMailVersion = '1.6.2' + javaxMailVersion = '1.6.5' jaxbVersion = '2.3.3' jodaTimeVersion = '1.6' jtaVersion = '1.1' jtdsVersion = '1.2.6' jmsApiVersion = '2.0.1' - jrubyVersion = '9.2.13.0' + jrubyVersion = '9.2.14.0' jpa21ApiVersion = '1.0.0.Final' jpaApiVersion = '2.2.1' jstlVersion = '1.2' - junitVersion = '4.13.1' + junitVersion = '4.13.2' jythonVersion = '2.7.2' - log4jVersion = '2.13.3' - mockitoVersion = '3.4.6' - mongoDriverVersion = '4.1.1' + log4jVersion = '2.14.0' + mockitoVersion = '3.7.7' + mongoDriverVersion = '4.2.0' openJpaVersion = '2.4.0' - oracleDriverVersion = '11.2.0.3' + oracleDriverVersion = '19.3.0.0' postgresVersion = '42.2.14' subethasmtpVersion = '1.2' - slf4jVersion = '1.7.25' + slf4jVersion = '1.7.30' springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.5.0-SNAPSHOT' + springIntegrationVersion = '5.5.0-M2' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.3' - springSecurityVersion = '5.4.2' + springVersion = '5.3.4' + springSecurityVersion = '5.4.4' springWebFlowVersion = '2.3.3.RELEASE' - testcontainersVersion = '1.13.0' + testcontainersVersion = '1.15.2' tilesJspVersion = '2.2.1' validationApiVersion = '1.0.0.GA' } @@ -242,7 +242,7 @@ subprojects { subproject -> testCompile("org.mockito:mockito-core:$mockitoVersion") { exclude group: 'org.hamcrest' } - testCompile "org.springframework.integration:spring-integration-test" + testCompile 'org.springframework.integration:spring-integration-test' } configurations { @@ -255,9 +255,10 @@ subprojects { subproject -> jacocoTestReport { reports { - xml.enabled false + xml.enabled true csv.enabled false - html.destination file("${buildDir}/reports/jacoco/html") + html.enabled false + xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml") } } @@ -267,9 +268,10 @@ subprojects { subproject -> jacoco { destinationFile = file("$buildDir/jacoco.exec") } + if (System.properties['sonar.host.url']) { + finalizedBy jacocoTestReport + } } - - build.dependsOn jacocoTestReport } task cleanTarget(type: Delete) { @@ -284,8 +286,8 @@ project('advanced-testing-examples') { dependencies { compile "javax.jms:javax.jms-api:$jmsApiVersion" - compile "org.springframework.integration:spring-integration-jms" - compile "org.springframework.integration:spring-integration-groovy" + compile 'org.springframework.integration:spring-integration-jms' + compile 'org.springframework.integration:spring-integration-groovy' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -294,7 +296,7 @@ project('dynamic-ftp') { description = 'Dynamic FTP Demo' dependencies { - compile "org.springframework.integration:spring-integration-ftp" + compile 'org.springframework.integration:spring-integration-ftp' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -307,7 +309,7 @@ project('cafe-si') { mainClassName = 'org.springframework.integration.samples.cafe.xml.CafeDemoApp' dependencies { - compile "org.springframework.integration:spring-integration-stream" + compile 'org.springframework.integration:spring-integration-stream' compile 'com.fasterxml.jackson.core:jackson-databind' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -317,8 +319,8 @@ project('cafe-amqp') { description = 'Cafe - With AMQP Message Broker' dependencies { - compile project(":cafe-si") - compile "org.springframework.integration:spring-integration-amqp" + compile project(':cafe-si') + compile 'org.springframework.integration:spring-integration-amqp' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -327,12 +329,12 @@ project('cafe-jms') { description = 'Cafe - With JMS Message Broker' dependencies { - compile project(":cafe-si") + compile project(':cafe-si') compile "org.apache.activemq:activemq-broker:$activeMqVersion" compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { exclude group: "org.springframework" } - compile "org.springframework.integration:spring-integration-jms" + compile 'org.springframework.integration:spring-integration-jms' compile "javax.jms:javax.jms-api:$jmsApiVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -342,10 +344,10 @@ project('cafe-scripted') { description = 'Cafe Sample (Scripted Implementation)' dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-groovy" - compile "org.springframework.integration:spring-integration-rmi" - compile "org.springframework.integration:spring-integration-jmx" + compile 'org.springframework.integration:spring-integration-stream' + compile 'org.springframework.integration:spring-integration-groovy' + compile 'org.springframework.integration:spring-integration-rmi' + compile 'org.springframework.integration:spring-integration-jmx' compile "org.jruby:jruby-complete:$jrubyVersion" compile "org.python:jython-standalone:$jythonVersion" compile "org.codehaus.groovy:groovy-all:$groovyVersion" @@ -372,7 +374,7 @@ project('loan-broker') { mainClassName = 'org.springframework.integration.samples.loanbroker.demo.LoanBrokerDemo' dependencies { - compile "org.springframework.integration:spring-integration-ip" + compile 'org.springframework.integration:spring-integration-ip' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -387,19 +389,19 @@ project('loanshark') { description = 'Loan Shark Sample' apply plugin: 'war' - apply plugin: "org.gretty" + apply plugin: 'org.gretty' apply plugin: 'eclipse-wtp' dependencies { - compile "org.springframework.integration:spring-integration-ip" - compile "org.springframework:spring-webmvc" - compile "org.springframework:spring-orm" - compile "org.springframework:spring-aop" - compile "org.springframework:spring-aspects" + compile 'org.springframework.integration:spring-integration-ip' + compile 'org.springframework:spring-webmvc' + compile 'org.springframework:spring-orm' + compile 'org.springframework:spring-aop' + compile 'org.springframework:spring-aspects' compile "org.aspectj:aspectjtools:$aspectjVersion" - compile "org.springframework:spring-jdbc" - compile "org.springframework:spring-tx" - compile "org.springframework:spring-context" + compile 'org.springframework:spring-jdbc' + compile 'org.springframework:spring-tx' + compile 'org.springframework:spring-context' compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" compile "org.apache.commons:commons-dbcp2:$commonsDbcpVersion" compile "commons-digester:commons-digester:$commonsDigesterVersion" @@ -427,8 +429,8 @@ project('amqp') { description = 'AMQP Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-amqp" + compile 'org.springframework.integration:spring-integration-stream' + compile 'org.springframework.integration:spring-integration-amqp' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" runtime "org.slf4j:slf4j-jcl:$slf4jVersion" } @@ -462,8 +464,8 @@ project('barrier') { compile 'org.springframework.boot:spring-boot-starter-web' compile 'org.springframework.boot:spring-boot-starter-integration' compile 'org.springframework.boot:spring-boot-starter-amqp' - compile "org.springframework.integration:spring-integration-amqp" - compile "org.springframework.integration:spring-integration-http" + compile 'org.springframework.integration:spring-integration-amqp' + compile 'org.springframework.integration:spring-integration-http' testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -482,7 +484,7 @@ project('control-bus') { description = 'Control Bus Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -495,7 +497,7 @@ project('enricher') { mainClassName = 'org.springframework.integration.samples.enricher.Main' dependencies { - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "com.h2database:h2:$h2Version" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -505,7 +507,7 @@ project('feed') { description = 'Feed (RSS/ATOM) Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-feed" + compile 'org.springframework.integration:spring-integration-feed' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -514,7 +516,7 @@ project('file') { description = 'File Copy Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-file" + compile 'org.springframework.integration:spring-integration-file' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -523,7 +525,7 @@ project('ftp') { description = 'FTP Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-ftp" + compile 'org.springframework.integration:spring-integration-ftp' compile "commons-io:commons-io:$commonsIoVersion" compile "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" compile "org.slf4j:slf4j-api:$slf4jVersion" @@ -531,7 +533,7 @@ project('ftp') { runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" testCompile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" + testCompile 'org.springframework.integration:spring-integration-test' } test { @@ -543,7 +545,7 @@ project('helloworld') { description = 'Hello World Sample' dependencies { - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -564,32 +566,33 @@ project('http') { apply plugin: 'war' apply plugin: 'application' - apply plugin: "org.gretty" + apply plugin: 'org.gretty' apply plugin: 'eclipse-wtp' mainClassName = 'org.springframework.integration.samples.http.HttpClientDemo' dependencies { - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework.integration:spring-integration-mail" - compile "org.springframework:spring-webmvc" + compile 'org.springframework.integration:spring-integration-http' + compile 'org.springframework.integration:spring-integration-mail' + compile 'org.springframework:spring-webmvc' compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" compile "commons-io:commons-io:$commonsIoVersion" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile "jakarta.mail:jakarta.mail-api:$javaxMailVersion" + compile "com.sun.mail:imap:$javaxMailVersion" + compile "com.sun.mail:jakarta.mail:$javaxMailVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } -project('splunk') { +/*project('splunk') { description = 'Splunk Sample' apply plugin: 'org.springframework.boot' dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "org.springframework.integration:spring-integration-splunk:$springIntegrationSplunkVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -602,7 +605,7 @@ project('splunk') { main 'org.springframework.integration.samples.splunk.Application' classpath = sourceSets.main.runtimeClasspath } -} +}*/ project('kafka') { description = 'Apache Kafka Sample' @@ -614,7 +617,7 @@ project('kafka') { compile ('org.springframework.integration:spring-integration-kafka') { exclude group: 'org.slf4j' } - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" @@ -638,8 +641,8 @@ project('mqtt') { dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-mqtt" + compile 'org.springframework.integration:spring-integration-stream' + compile 'org.springframework.integration:spring-integration-mqtt' testCompile 'org.springframework.boot:spring-boot-starter-test' testCompile "org.springframework.integration:spring-integration-test" } @@ -667,13 +670,14 @@ project('si4demo') { dependencies { compile 'org.springframework.boot:spring-boot-starter-web' compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-mail" + compile 'org.springframework.integration:spring-integration-mail' compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework.integration:spring-integration-ip" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" - compile "com.rometools:rome:1.5.0" + compile 'org.springframework.integration:spring-integration-http' + compile 'org.springframework.integration:spring-integration-ip' + compile "jakarta.mail:jakarta.mail-api:$javaxMailVersion" + compile "com.sun.mail:imap:$javaxMailVersion" + compile "com.sun.mail:jakarta.mail:$javaxMailVersion" + compile 'com.rometools:rome:1.5.0' testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -695,7 +699,7 @@ project('cafe-dsl') { dependencies { compile project(":cafe-si") compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -718,7 +722,7 @@ project('jdbc') { mainClassName = 'org.springframework.integration.samples.jdbc.Main' dependencies { - compile "org.springframework.integration:spring-integration-jdbc" + compile 'org.springframework.integration:spring-integration-jdbc' compile "com.h2database:h2:$h2Version" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -733,15 +737,15 @@ project('jms') { dependencies { compile "javax.jms:javax.jms-api:$jmsApiVersion" - compile "org.springframework.integration:spring-integration-jms" - compile "org.springframework.integration:spring-integration-stream" + compile 'org.springframework.integration:spring-integration-jms' + compile 'org.springframework.integration:spring-integration-stream' compile "org.apache.activemq:activemq-broker:$activeMqVersion" compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { exclude group: "org.springframework" } compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" + testCompile 'org.springframework.integration:spring-integration-test' } } @@ -749,8 +753,8 @@ project('jmx') { description = 'JMX Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-jmx" - compile "org.springframework.integration:spring-integration-stream" + compile 'org.springframework.integration:spring-integration-jmx' + compile 'org.springframework.integration:spring-integration-stream' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -765,10 +769,10 @@ project('jpa') { dependencies { compile 'org.springframework.boot:spring-boot-starter-data-jpa' - compile "org.springframework.integration:spring-integration-jpa" + compile 'org.springframework.integration:spring-integration-jpa' compile "com.h2database:h2:$h2Version" - runtime "org.springframework:spring-instrument" + runtime 'org.springframework:spring-instrument' runtime "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$jpa21ApiVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' @@ -784,10 +788,11 @@ project('mail') { description = 'Mail (IMAP + POP3) Sample' dependencies { - compile "org.springframework.integration:spring-integration-mail" - compile "org.springframework:spring-context" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile 'org.springframework.integration:spring-integration-mail' + compile 'org.springframework:spring-context' + compile "jakarta.mail:jakarta.mail-api:$javaxMailVersion" + compile "com.sun.mail:imap:$javaxMailVersion" + compile "com.sun.mail:jakarta.mail:$javaxMailVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -806,7 +811,7 @@ project('mongodb') { description = 'MongoDb Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-mongodb" + compile 'org.springframework.integration:spring-integration-mongodb' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" compile "org.mongodb:mongodb-driver-sync:$mongoDriverVersion" } @@ -826,7 +831,7 @@ project('oddeven') { description = 'Odd-Even Sample' dependencies { - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -845,7 +850,7 @@ project('quote') { description = 'Quote Sample' dependencies { - compile "org.springframework.integration:spring-integration-stream" + compile 'org.springframework.integration:spring-integration-stream' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -854,7 +859,7 @@ project('sftp') { description = 'SFTP Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-sftp" + compile 'org.springframework.integration:spring-integration-sftp' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" testCompile "org.apache.sshd:sshd-sftp:$apacheSshdVersion" } @@ -868,8 +873,8 @@ project('tcp-amqp') { mainClassName = 'org.springframework.integration.samples.tcpamqp.Main' dependencies { - compile "org.springframework.integration:spring-integration-amqp" - compile "org.springframework.integration:spring-integration-ip" + compile 'org.springframework.integration:spring-integration-amqp' + compile 'org.springframework.integration:spring-integration-ip' compile "org.slf4j:slf4j-api:$slf4jVersion" runtime "org.apache.logging.log4j:log4j-core:$log4jVersion" @@ -885,7 +890,7 @@ project('tcp-broadcast') { dependencies { compile 'org.springframework.boot:spring-boot-starter-web' compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ip" + compile 'org.springframework.integration:spring-integration-ip' testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -908,9 +913,9 @@ project('tcp-client-server') { mainClassName = 'org.springframework.integration.samples.tcpclientserver.Main' dependencies { - compile "org.springframework.integration:spring-integration-ip" + compile 'org.springframework.integration:spring-integration-ip' compile "commons-lang:commons-lang:$commonsLangVersion" - compile "org.springframework.integration:spring-integration-test" + compile 'org.springframework.integration:spring-integration-test' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -925,9 +930,9 @@ project('testcontainers-rabbitmq') { } dependencies { - compile "org.springframework.boot:spring-boot-starter-integration" - compile "org.springframework.integration:spring-integration-amqp" - compile "org.springframework.boot:spring-boot-starter-json" + compile 'org.springframework.boot:spring-boot-starter-integration' + compile 'org.springframework.integration:spring-integration-amqp' + compile 'org.springframework.boot:spring-boot-starter-json' testCompile('org.springframework.boot:spring-boot-starter-test') { exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' @@ -937,7 +942,7 @@ project('testcontainers-rabbitmq') { testCompile 'org.springframework.cloud:spring-cloud-starter' testCompile "org.testcontainers:junit-jupiter:$testcontainersVersion" - testCompile "com.playtika.testcontainers:embedded-rabbitmq:1.42" + testCompile 'com.playtika.testcontainers:embedded-rabbitmq:1.42' } @@ -961,13 +966,13 @@ project('testing-examples') { mainClassName = 'org.springframework.integration.samples.testing.externalgateway.Main' dependencies { - compile "org.springframework.integration:spring-integration-file" - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework.integration:spring-integration-ws" - compile "org.springframework:spring-webmvc" + compile 'org.springframework.integration:spring-integration-file' + compile 'org.springframework.integration:spring-integration-http' + compile 'org.springframework.integration:spring-integration-ws' + compile 'org.springframework:spring-webmvc' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" + testCompile 'org.springframework.integration:spring-integration-test' } } @@ -988,13 +993,13 @@ project('ws-inbound-gateway') { description = 'WS Inbound Gateway Sample' apply plugin: 'war' - apply plugin: "org.gretty" + apply plugin: 'org.gretty' apply plugin: 'eclipse-wtp' dependencies { - compile "org.springframework.integration:spring-integration-xml" - compile "org.springframework.integration:spring-integration-ws" - compile "org.springframework:spring-webmvc" + compile 'org.springframework.integration:spring-integration-xml' + compile 'org.springframework.integration:spring-integration-ws' + compile 'org.springframework:spring-webmvc' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1011,9 +1016,8 @@ project('ws-outbound-gateway') { mainClassName = 'org.springframework.integration.samples.ws.WebServiceDemoTestApp' dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-ws" -// compile 'com.sun.xml.messaging.saaj:saaj-impl:1.3.19' + compile 'org.springframework.integration:spring-integration-stream' + compile 'org.springframework.integration:spring-integration-ws' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1026,7 +1030,7 @@ project('xml') { mainClassName = 'org.springframework.integration.samples.xml.BookOrderProcessingTestApp' dependencies { - compile "org.springframework.integration:spring-integration-xml" + compile 'org.springframework.integration:spring-integration-xml' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1035,7 +1039,7 @@ project('xmpp') { description = 'XMPP Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-xmpp" + compile 'org.springframework.integration:spring-integration-xmpp' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1048,7 +1052,7 @@ project('async-gateway') { description = 'Async Gateway Sample' dependencies { - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1061,7 +1065,7 @@ project('dynamic-poller') { mainClassName = 'org.springframework.integration.samples.poller.Main' dependencies { - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1070,7 +1074,7 @@ project('errorhandling') { description = 'Error Handling Sample' dependencies { - compile "org.springframework.integration:spring-integration-stream" + compile 'org.springframework.integration:spring-integration-stream' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1079,7 +1083,7 @@ project('file-processing') { description = 'File Processing Sample' dependencies { - compile "org.springframework.integration:spring-integration-file" + compile 'org.springframework.integration:spring-integration-file' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1092,14 +1096,15 @@ project('mail-attachments') { mainClassName = 'org.springframework.integration.samples.mailattachments.Main' dependencies { - compile "org.springframework.integration:spring-integration-mail" - compile "org.springframework.integration:spring-integration-file" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile 'org.springframework.integration:spring-integration-mail' + compile 'org.springframework.integration:spring-integration-file' + compile "jakarta.mail:jakarta.mail-api:$javaxMailVersion" + compile "com.sun.mail:imap:$javaxMailVersion" + compile "com.sun.mail:jakarta.mail:$javaxMailVersion" compile "commons-io:commons-io:$commonsIoVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" + testCompile 'org.springframework.integration:spring-integration-test' testCompile "org.subethamail:subethasmtp-wiser:$subethasmtpVersion" } @@ -1109,17 +1114,17 @@ project('monitoring') { description = 'Monitoring Application' apply plugin: 'war' - apply plugin: "org.gretty" + apply plugin: 'org.gretty' apply plugin: 'application' apply plugin: 'eclipse-wtp' mainClassName = 'org.springintegration.SpringIntegrationTest' dependencies { - compile "org.springframework.integration:spring-integration-jmx" + compile 'org.springframework.integration:spring-integration-jmx' compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" - compile "org.springframework.integration:spring-integration-groovy" - compile "org.springframework:spring-webmvc" + compile 'org.springframework.integration:spring-integration-groovy' + compile 'org.springframework:spring-webmvc' compile "javax.servlet:jstl:$jstlVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1129,12 +1134,12 @@ project('multipart-http') { description = 'HTTP Multipart Demo' apply plugin: 'war' - apply plugin: "org.gretty" + apply plugin: 'org.gretty' apply plugin: 'eclipse-wtp' dependencies { - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework:spring-webmvc" + compile 'org.springframework.integration:spring-integration-http' + compile 'org.springframework:spring-webmvc' compile 'com.fasterxml.jackson.core:jackson-databind' compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" compile "commons-io:commons-io:$commonsIoVersion" @@ -1146,17 +1151,17 @@ project('rest-http') { description = 'Spring Integration Rest HTTP Path Usage Demo' apply plugin: 'war' - apply plugin: "org.gretty" + apply plugin: 'org.gretty' apply plugin: 'eclipse-wtp' dependencies { - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework:spring-webmvc" - compile "org.springframework:spring-oxm" - compile "org.springframework:spring-tx" - compile "org.springframework:spring-jdbc" - compile "org.springframework:spring-context" - compile "org.springframework:spring-aop" + compile 'org.springframework.integration:spring-integration-http' + compile 'org.springframework:spring-webmvc' + compile 'org.springframework:spring-oxm' + compile 'org.springframework:spring-tx' + compile 'org.springframework:spring-jdbc' + compile 'org.springframework:spring-context' + compile 'org.springframework:spring-aop' compile 'com.fasterxml.jackson.core:jackson-databind' compile "org.springframework.security:spring-security-web:$springSecurityVersion" compile "org.springframework.security:spring-security-config:$springSecurityVersion" @@ -1174,10 +1179,10 @@ project('retry-and-more') { description = 'Retry and More Sample' dependencies { - compile "org.springframework.integration:spring-integration-stream" - compile "org.springframework.integration:spring-integration-amqp" - compile "org.springframework.integration:spring-integration-ftp" - compile "org.springframework.integration:spring-integration-file" + compile 'org.springframework.integration:spring-integration-stream' + compile 'org.springframework.integration:spring-integration-amqp' + compile 'org.springframework.integration:spring-integration-ftp' + compile 'org.springframework.integration:spring-integration-file' compile("org.mockito:mockito-core:$mockitoVersion") { exclude group: 'org.hamcrest' } @@ -1219,7 +1224,7 @@ project('splitter-aggregator-reaper') { mainClassName = 'org.springframework.integration.samples.splitteraggregator.Main' dependencies { - compile "org.springframework.integration:spring-integration-core" + compile 'org.springframework.integration:spring-integration-core' compile "javax.inject:javax.inject:$javaxInjectVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1234,7 +1239,7 @@ project('stored-procedures-derby') { mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' dependencies { - compile "org.springframework.integration:spring-integration-jdbc" + compile 'org.springframework.integration:spring-integration-jdbc' compile "org.apache.derby:derby:$derbyVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1252,9 +1257,8 @@ project('stored-procedures-oracle') { } dependencies { - compile "org.springframework.integration:spring-integration-jdbc" -//TODO Uncomment it when the ojdbc6 artifact is available in the mavenLocal() -// compile "com.oracle:ojdbc6:$oracleDriverVersion" + compile 'org.springframework.integration:spring-integration-jdbc' + compile "com.oracle.ojdbc:ojdbc8:$oracleDriverVersion" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1271,7 +1275,7 @@ project('stored-procedures-ms') { mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' dependencies { - compile "org.springframework.integration:spring-integration-jdbc" + compile 'org.springframework.integration:spring-integration-jdbc' compile "net.sourceforge.jtds:jtds:$jtdsVersion" compile "c3p0:c3p0:$c3p0Version" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" @@ -1290,7 +1294,7 @@ project('stored-procedures-postgresql') { mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' dependencies { - compile "org.springframework.integration:spring-integration-jdbc" + compile 'org.springframework.integration:spring-integration-jdbc' compile "org.postgresql:postgresql:$postgresVersion" compile "org.apache.commons:commons-dbcp2:$commonsDbcpVersion" compile "commons-pool:commons-pool:$commonsPoolVersion" @@ -1330,10 +1334,10 @@ project('tcp-client-server-multiplex') { description = 'TCP Client Server Multiplexing Sample' dependencies { - compile "org.springframework.integration:spring-integration-ip" + compile 'org.springframework.integration:spring-integration-ip' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.springframework.integration:spring-integration-test" + testCompile 'org.springframework.integration:spring-integration-test' } } @@ -1345,9 +1349,9 @@ project('travel') { mainClassName = 'org.springframework.integration.samples.travel.Main' dependencies { - compile "org.springframework.integration:spring-integration-ws" - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework:spring-web" + compile 'org.springframework.integration:spring-integration-ws' + compile 'org.springframework.integration:spring-integration-http' + compile 'org.springframework:spring-web' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1360,8 +1364,8 @@ project('tx-synch') { mainClassName = 'org.springframework.integration.samples.advice.TransactionSynchronizationDemo' dependencies { - compile "org.springframework.integration:spring-integration-jdbc" - compile "org.springframework.integration:spring-integration-file" + compile 'org.springframework.integration:spring-integration-jdbc' + compile 'org.springframework.integration:spring-integration-file' compile "com.h2database:h2:$h2Version" compile "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1395,9 +1399,9 @@ project('stomp-chat') { dependencies { compile 'org.springframework.boot:spring-boot-starter-websocket' - compile "org.springframework.integration:spring-integration-websocket" - compile "org.springframework.integration:spring-integration-event" - compile "org.springframework.integration:spring-integration-groovy" + compile 'org.springframework.integration:spring-integration-websocket' + compile 'org.springframework.integration:spring-integration-event' + compile 'org.springframework.integration:spring-integration-groovy' testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -1418,8 +1422,8 @@ project('kafka-dsl') { dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-core" - compile ('org.springframework.integration:spring-integration-kafka') + compile 'org.springframework.integration:spring-integration-core' + compile 'org.springframework.integration:spring-integration-kafka' compile "org.apache.logging.log4j:log4j-core:$log4jVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -1446,14 +1450,15 @@ project('file-split-ftp') { dependencies { compile 'org.springframework.boot:spring-boot-starter-web' compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ftp" - compile "org.springframework.integration:spring-integration-http" - compile "org.springframework.integration:spring-integration-mail" - compile "javax.mail:javax.mail-api:$javaxMailVersion" - compile "com.sun.mail:javax.mail:$javaxMailVersion" + compile 'org.springframework.integration:spring-integration-ftp' + compile 'org.springframework.integration:spring-integration-http' + compile 'org.springframework.integration:spring-integration-mail' + compile "jakarta.mail:jakarta.mail-api:$javaxMailVersion" + compile "com.sun.mail:imap:$javaxMailVersion" + compile "com.sun.mail:jakarta.mail:$javaxMailVersion" testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile "org.springframework.integration:spring-integration-test" + testCompile 'org.springframework.integration:spring-integration-test' } springBoot { @@ -1473,7 +1478,7 @@ project('dynamic-tcp-client') { dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ip" + compile 'org.springframework.integration:spring-integration-ip' testCompile 'org.springframework.boot:spring-boot-starter-test' } @@ -1495,7 +1500,7 @@ project('tcp-with-headers') { dependencies { compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ip" + compile 'org.springframework.integration:spring-integration-ip' compile 'com.fasterxml.jackson.core:jackson-databind' testCompile 'org.springframework.boot:spring-boot-starter-test' @@ -1517,12 +1522,11 @@ project('tcp-with-headers') { sonarqube { properties { - property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec" - property "sonar.links.homepage", linkHomepage - property "sonar.links.ci", linkCi - property "sonar.links.issue", linkIssue - property "sonar.links.scm", linkScmUrl - property "sonar.links.scm_dev", linkScmDevConnection - property "sonar.java.coveragePlugin", "jacoco" + property 'sonar.links.homepage', linkHomepage + property 'sonar.links.ci', linkCi + property 'sonar.links.issue', linkIssue + property 'sonar.links.scm', linkScmUrl + property 'sonar.links.scm_dev', linkScmDevConnection } } + diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 1a68df90f..6eeca988e 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples cafe-dsl @@ -92,7 +92,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -120,7 +120,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -181,28 +181,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index d80ed55c1..9c85d9e8b 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples kafka-dsl @@ -91,7 +91,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -103,7 +103,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -131,7 +131,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -192,28 +192,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 7c4066e99..82908b887 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -51,7 +51,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -79,7 +79,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -121,21 +121,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 09156416f..442a5d668 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples si4demo @@ -123,9 +123,9 @@ - javax.mail - javax.mail-api - 1.6.2 + jakarta.mail + jakarta.mail-api + 1.6.5 compile @@ -136,8 +136,20 @@ com.sun.mail - javax.mail - 1.6.2 + imap + 1.6.5 + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + com.sun.mail + jakarta.mail + 1.6.5 compile @@ -161,7 +173,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -189,7 +201,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -250,28 +262,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/gradle.properties b/gradle.properties index 3d4de8979..0bde4ae02 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ version=5.4.0 -springBootVersion=2.4.0-SNAPSHOT +springBootVersion=2.5.0-SNAPSHOT org.gradle.jvmargs=-Xmx1536m diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c053550b91381bbd28b1afc82d634bf73a8a..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f 100644 GIT binary patch delta 6656 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 Yte!%o?r4GTrVtxD61Ym!|5fq-1K$0e!T1w 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bb8b2fc26..2a563242c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c5158..4f906e0c8 100755 --- a/gradlew +++ b/gradlew @@ -130,7 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat index a9f778a7a..ac1b06f93 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,21 +64,6 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line @@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 1f4c5a7ac..012508b87 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 3ef68fded..6370efb0d 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 8381fcf82..b699cfcf6 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index a136be7ad..17eca4e84 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 076ca5bca..ec243cea6 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -73,9 +73,9 @@ - javax.mail - javax.mail-api - 1.6.2 + jakarta.mail + jakarta.mail-api + 1.6.5 compile @@ -86,8 +86,20 @@ com.sun.mail - javax.mail - 1.6.2 + imap + 1.6.5 + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + + + com.sun.mail + jakarta.mail + 1.6.5 compile @@ -99,7 +111,7 @@ commons-io commons-io - 2.7 + 2.8.0 compile @@ -111,7 +123,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -123,7 +135,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -151,7 +163,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -205,21 +217,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 6b2ecabee..808e40a82 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -110,7 +110,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -122,7 +122,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -150,7 +150,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -192,21 +192,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index fea4ba3a7..aa0436c16 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -98,7 +98,7 @@ commons-io commons-io - 2.7 + 2.8.0 compile @@ -110,7 +110,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -122,7 +122,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -150,7 +150,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -192,21 +192,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index c3f026c69..dd77254f7 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -141,7 +141,7 @@ org.springframework.security spring-security-web - 5.4.2 + 5.4.4 compile @@ -153,7 +153,7 @@ org.springframework.security spring-security-config - 5.4.2 + 5.4.4 compile @@ -165,7 +165,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -189,7 +189,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -217,7 +217,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -259,21 +259,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index f20807edc..5f001d971 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -97,7 +97,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 compile @@ -125,7 +125,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -137,7 +137,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -179,21 +179,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 09882c8e8..ee2a198e6 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -88,7 +88,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -158,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 218216aaf..d0c5711c6 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -88,7 +88,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -158,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index c72a0e0e7..463f7a126 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -88,7 +88,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -100,7 +100,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -128,7 +128,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -170,21 +170,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 715d5c094..5c20e04ac 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -61,10 +61,22 @@ + + com.oracle.ojdbc + ojdbc8 + 19.3.0.0 + compile + + + jackson-module-kotlin + com.fasterxml.jackson.module + + + org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +88,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +116,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +158,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 9e01ca305..66385b988 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -76,7 +76,7 @@ org.apache.commons commons-dbcp2 - 2.7.0 + 2.8.0 compile @@ -100,7 +100,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -112,7 +112,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -140,7 +140,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -182,21 +182,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index fbc103a47..264b9a778 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples tcp-async-bi-directional @@ -80,7 +80,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -108,7 +108,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -169,28 +169,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 11e861e80..1f30e1b8c 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -76,7 +76,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -146,21 +146,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-SNAPSHOT + 5.5.0-M2 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 8740548a5..c886c5c47 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT org.springframework.integration.samples testcontainers-rabbitmq @@ -91,7 +91,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -119,7 +119,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -183,7 +183,7 @@ org.testcontainers junit-jupiter - 1.13.0 + 1.15.2 test @@ -237,28 +237,28 @@ org.springframework.boot spring-boot-dependencies - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT import pom com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index b3ee9226c..a73dc30a1 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -86,7 +86,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -98,7 +98,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -126,7 +126,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -168,21 +168,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index c83211e12..a11bb7f76 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.14.0 compile @@ -99,7 +99,7 @@ junit junit - 4.13.1 + 4.13.2 test @@ -127,7 +127,7 @@ org.mockito mockito-core - 3.4.6 + 3.7.7 test @@ -169,21 +169,21 @@ com.fasterxml.jackson jackson-bom - 2.11.1 + 2.12.1 import pom org.springframework spring-framework-bom - 5.3.3 + 5.3.4 import pom org.springframework.integration spring-integration-bom - 5.5.0-M1 + 5.5.0-M2 import pom diff --git a/settings.gradle b/settings.gradle index 0c439f88e..7e8f229c3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,7 +4,7 @@ rootProject.name = 'spring-integration-samples' def projectDir = new File(rootDir, it) include ":${it}" projectDir.eachDir { dir -> - if (!dir.name.startsWith('.')) { + if (!dir.name.startsWith('.') && 'splunk' != dir.name) { include ":${dir.name}" project(":${dir.name}").projectDir = new File(projectDir.absolutePath, dir.name) if ('cafe' == dir.name) { From ca15898ab587edd0d36fe7cf17465f696b7c6e7d Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 17 Mar 2021 19:19:53 -0400 Subject: [PATCH 264/356] Upgrade to SI-5.5.0-M3 --- advanced/advanced-testing-examples/pom.xml | 6 +++--- advanced/dynamic-ftp/pom.xml | 6 +++--- advanced/dynamic-tcp-client/pom.xml | 6 +++--- advanced/pom.xml | 2 +- applications/cafe-scripted/pom.xml | 6 +++--- applications/cafe/cafe-amqp/pom.xml | 8 ++++---- applications/cafe/cafe-jms/pom.xml | 8 ++++---- applications/cafe/cafe-si/pom.xml | 6 +++--- applications/cafe/pom.xml | 2 +- applications/file-split-ftp/pom.xml | 6 +++--- applications/loan-broker/pom.xml | 6 +++--- applications/loanshark/pom.xml | 6 +++--- applications/pom.xml | 2 +- applications/stomp-chat/pom.xml | 6 +++--- basic/amqp/pom.xml | 6 +++--- basic/barrier/pom.xml | 6 +++--- basic/control-bus/pom.xml | 6 +++--- basic/enricher/pom.xml | 6 +++--- basic/feed/pom.xml | 6 +++--- basic/file/pom.xml | 6 +++--- basic/ftp/pom.xml | 6 +++--- basic/helloworld/pom.xml | 6 +++--- basic/http/pom.xml | 6 +++--- basic/jdbc/pom.xml | 6 +++--- basic/jms/pom.xml | 6 +++--- basic/jmx/pom.xml | 6 +++--- basic/jpa/pom.xml | 6 +++--- basic/kafka/pom.xml | 6 +++--- basic/mail/pom.xml | 6 +++--- basic/mongodb/pom.xml | 6 +++--- basic/mqtt/pom.xml | 6 +++--- basic/oddeven/pom.xml | 6 +++--- basic/pom.xml | 2 +- basic/quote/pom.xml | 6 +++--- basic/sftp/pom.xml | 6 +++--- basic/tcp-amqp/pom.xml | 6 +++--- basic/tcp-broadcast/pom.xml | 6 +++--- basic/tcp-client-server/pom.xml | 6 +++--- basic/tcp-with-headers/pom.xml | 6 +++--- basic/testing-examples/pom.xml | 6 +++--- basic/twitter/pom.xml | 6 +++--- basic/web-sockets/pom.xml | 6 +++--- basic/ws-inbound-gateway/pom.xml | 6 +++--- basic/ws-outbound-gateway/pom.xml | 6 +++--- basic/xml/pom.xml | 6 +++--- basic/xmpp/pom.xml | 6 +++--- build.gradle | 4 ++-- dsl/cafe-dsl/pom.xml | 8 ++++---- dsl/kafka-dsl/pom.xml | 6 +++--- dsl/pom.xml | 6 +++--- dsl/si4demo/pom.xml | 6 +++--- gradle.properties | 2 +- intermediate/async-gateway/pom.xml | 6 +++--- intermediate/dynamic-poller/pom.xml | 6 +++--- intermediate/errorhandling/pom.xml | 6 +++--- intermediate/file-processing/pom.xml | 6 +++--- intermediate/mail-attachments/pom.xml | 6 +++--- intermediate/monitoring/pom.xml | 6 +++--- intermediate/multipart-http/pom.xml | 6 +++--- intermediate/pom.xml | 2 +- intermediate/rest-http/pom.xml | 6 +++--- intermediate/retry-and-more/pom.xml | 6 +++--- intermediate/splitter-aggregator-reaper/pom.xml | 6 +++--- intermediate/stored-procedures-derby/pom.xml | 6 +++--- intermediate/stored-procedures-ms/pom.xml | 6 +++--- intermediate/stored-procedures-oracle/pom.xml | 6 +++--- intermediate/stored-procedures-postgresql/pom.xml | 6 +++--- intermediate/tcp-async-bi-directional/pom.xml | 6 +++--- intermediate/tcp-client-server-multiplex/pom.xml | 6 +++--- intermediate/testcontainers-rabbitmq/pom.xml | 6 +++--- intermediate/travel/pom.xml | 6 +++--- intermediate/tx-synch/pom.xml | 6 +++--- 72 files changed, 206 insertions(+), 206 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 950b68a7a..ce740fc49 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples advanced-testing-examples - 5.4.0 + 5.5.0 Advanced Testing Examples Advanced Testing Examples https://projects.spring.io/spring-integration @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 0f591b917..b3779837b 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-ftp - 5.4.0 + 5.5.0 Dynamic FTP Demo Dynamic FTP Demo https://projects.spring.io/spring-integration @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index b7451b6b3..741f81236 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -8,7 +8,7 @@ org.springframework.integration.samples dynamic-tcp-client - 5.4.0 + 5.5.0 Dynamic TCP Client Dynamic TCP Client https://projects.spring.io/spring-integration @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/advanced/pom.xml b/advanced/pom.xml index 9fa591eae..9716a1ee8 100644 --- a/advanced/pom.xml +++ b/advanced/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples advanced - 5.4.0 + 5.5.0 https://projects.spring.io/spring-integration SpringIO diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 32b2a7482..01b4439bb 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-scripted - 5.4.0 + 5.5.0 Cafe Sample (Scripted Implementation) Cafe Sample (Scripted Implementation) https://projects.spring.io/spring-integration @@ -222,14 +222,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index e89f07929..8086e1d48 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-amqp - 5.4.0 + 5.5.0 Cafe - With AMQP Message Broker Cafe - With AMQP Message Broker https://projects.spring.io/spring-integration @@ -53,7 +53,7 @@ org.springframework.integration.samples cafe-si - 5.4.0 + 5.5.0 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 3aaf6e303..8caf5b568 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-jms - 5.4.0 + 5.5.0 Cafe - With JMS Message Broker Cafe - With JMS Message Broker https://projects.spring.io/spring-integration @@ -53,7 +53,7 @@ org.springframework.integration.samples cafe-si - 5.4.0 + 5.5.0 compile @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index cb0d7cbee..580204d21 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-si - 5.4.0 + 5.5.0 Cafe - Pure Spring Integration Cafe - Pure Spring Integration https://projects.spring.io/spring-integration @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml index 379b89e30..10d820c05 100644 --- a/applications/cafe/pom.xml +++ b/applications/cafe/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples cafe - 5.4.0 + 5.5.0 https://projects.spring.io/spring-integration SpringIO diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index e9ca07be3..4aa26d80f 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -8,7 +8,7 @@ org.springframework.integration.samples file-split-ftp - 5.4.0 + 5.5.0 File Split FTP File Split FTP https://projects.spring.io/spring-integration @@ -252,14 +252,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 3018db5dd..e3b03783e 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loan-broker - 5.4.0 + 5.5.0 Loan Broker Sample Loan Broker Sample https://projects.spring.io/spring-integration @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index e13ffdd4e..913fdcacd 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loanshark - 5.4.0 + 5.5.0 Loan Shark Sample Loan Shark Sample https://projects.spring.io/spring-integration @@ -446,14 +446,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/applications/pom.xml b/applications/pom.xml index 97a8f8c82..fe08cf64a 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples applications - 5.4.0 + 5.5.0 https://projects.spring.io/spring-integration SpringIO diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 417a1f5d1..f83387c28 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -8,7 +8,7 @@ org.springframework.integration.samples stomp-chat - 5.4.0 + 5.5.0 Web Sockets Stomp Chat Sample Web Sockets Stomp Chat Sample https://projects.spring.io/spring-integration @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 3405b6b50..7eb688e55 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples amqp - 5.4.0 + 5.5.0 AMQP Basic Sample AMQP Basic Sample https://projects.spring.io/spring-integration @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 4d16376a6..2b1aa983a 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -8,7 +8,7 @@ org.springframework.integration.samples barrier - 5.4.0 + 5.5.0 Barrier Sample Barrier Sample https://projects.spring.io/spring-integration @@ -216,14 +216,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index a048be5d8..3073c0912 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples control-bus - 5.4.0 + 5.5.0 Control Bus Basic Sample Control Bus Basic Sample https://projects.spring.io/spring-integration @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index ada8abef7..531237663 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples enricher - 5.4.0 + 5.5.0 Enricher Basic Sample Enricher Basic Sample https://projects.spring.io/spring-integration @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 84a84d558..a1e75eeae 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples feed - 5.4.0 + 5.5.0 Feed (RSS/ATOM) Basic Sample Feed (RSS/ATOM) Basic Sample https://projects.spring.io/spring-integration @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 8ad5f4b7e..80a266786 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file - 5.4.0 + 5.5.0 File Copy Basic Sample File Copy Basic Sample https://projects.spring.io/spring-integration @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index ffbe961cd..a1ca25e13 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ftp - 5.4.0 + 5.5.0 FTP Basic Sample FTP Basic Sample https://projects.spring.io/spring-integration @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 2e3579e26..3f9cf1ad2 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples helloworld - 5.4.0 + 5.5.0 Hello World Sample Hello World Sample https://projects.spring.io/spring-integration @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 816d5d936..a5e388568 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples http - 5.4.0 + 5.5.0 HTTP Sample HTTP Sample https://projects.spring.io/spring-integration @@ -235,14 +235,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 1574f2ef8..635298b4a 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jdbc - 5.4.0 + 5.5.0 JDBC Basic Sample JDBC Basic Sample https://projects.spring.io/spring-integration @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 603e9725c..ef5c2e480 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jms - 5.4.0 + 5.5.0 JMS Basic Sample JMS Basic Sample https://projects.spring.io/spring-integration @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 20aa3d90c..61592424c 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jmx - 5.4.0 + 5.5.0 JMX Basic Sample JMX Basic Sample https://projects.spring.io/spring-integration @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index be2d604e3..354f70207 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -8,7 +8,7 @@ org.springframework.integration.samples jpa - 5.4.0 + 5.5.0 JPA Basic Sample JPA Basic Sample https://projects.spring.io/spring-integration @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index ba0b58cdf..4d17f8eff 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -8,7 +8,7 @@ org.springframework.integration.samples kafka - 5.4.0 + 5.5.0 Apache Kafka Sample Apache Kafka Sample https://projects.spring.io/spring-integration @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 0d107a0c4..2a2e4d949 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail - 5.4.0 + 5.5.0 Mail (IMAP + POP3) Sample Mail (IMAP + POP3) Sample https://projects.spring.io/spring-integration @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 9823a02e2..ee1c384ab 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mongodb - 5.4.0 + 5.5.0 MongoDb Basic Sample MongoDb Basic Sample https://projects.spring.io/spring-integration @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index d890c6bc5..2266a3842 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -8,7 +8,7 @@ org.springframework.integration.samples mqtt - 5.4.0 + 5.5.0 MQTT Basic Sample MQTT Basic Sample https://projects.spring.io/spring-integration @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index f6e3085b8..5241e0092 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples oddeven - 5.4.0 + 5.5.0 Odd-Even Sample Odd-Even Sample https://projects.spring.io/spring-integration @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/pom.xml b/basic/pom.xml index 2f02d8d06..f2a78bf76 100644 --- a/basic/pom.xml +++ b/basic/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples basic - 5.4.0 + 5.5.0 https://projects.spring.io/spring-integration SpringIO diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index dac553351..6df6a58f3 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples quote - 5.4.0 + 5.5.0 Quote Sample Quote Sample https://projects.spring.io/spring-integration @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 0ffb1fdde..735dac8d4 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples sftp - 5.4.0 + 5.5.0 SFTP Basic Sample SFTP Basic Sample https://projects.spring.io/spring-integration @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index e6b903c7d..9c49c8174 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-amqp - 5.4.0 + 5.5.0 TCP-AMQP Basic Sample TCP-AMQP Basic Sample https://projects.spring.io/spring-integration @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index a0a18cf96..010316b29 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -8,7 +8,7 @@ org.springframework.integration.samples tcp-broadcast - 5.4.0 + 5.5.0 TCP Client Broadcast Sample TCP Client Broadcast Sample https://projects.spring.io/spring-integration @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 6521c2996..efdfc723f 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server - 5.4.0 + 5.5.0 TCP Client Server Sample TCP Client Server Sample https://projects.spring.io/spring-integration @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 8b045c40a..83e24db53 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -8,7 +8,7 @@ org.springframework.integration.samples tcp-with-headers - 5.4.0 + 5.5.0 TCP Send/Receive with headers TCP Send/Receive with headers https://projects.spring.io/spring-integration @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index dd8d366a4..d52fcf7b9 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testing-examples - 5.4.0 + 5.5.0 Testing Examples Testing Examples https://projects.spring.io/spring-integration @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 6f6d6521e..790a53254 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples twitter - 5.4.0 + 5.5.0 Twitter Basic Sample Twitter Basic Sample https://projects.spring.io/spring-integration @@ -154,14 +154,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 3e547b1d9..14a3a01d2 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -8,7 +8,7 @@ org.springframework.integration.samples web-sockets - 5.4.0 + 5.5.0 Web Sockets Basic Sample Web Sockets Basic Sample https://projects.spring.io/spring-integration @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 1bcf17341..ffb4da6ae 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-inbound-gateway - 5.4.0 + 5.5.0 WS Inbound Gateway Sample WS Inbound Gateway Sample https://projects.spring.io/spring-integration @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 3f9c9e775..86b019d0d 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-outbound-gateway - 5.4.0 + 5.5.0 WS Outbound Gateway Sample WS Outbound Gateway Sample https://projects.spring.io/spring-integration @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 576c8782a..516b72ea2 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xml - 5.4.0 + 5.5.0 XML Sample XML Sample https://projects.spring.io/spring-integration @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index dcd91d653..88f9d4539 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xmpp - 5.4.0 + 5.5.0 XMPP Basic Sample XMPP Basic Sample https://projects.spring.io/spring-integration @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/build.gradle b/build.gradle index 9028994d0..f0d1b4637 100644 --- a/build.gradle +++ b/build.gradle @@ -210,10 +210,10 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.30' springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.5.0-M2' + springIntegrationVersion = '5.5.0-M3' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.4' + springVersion = '5.3.5' springSecurityVersion = '5.4.4' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.15.2' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 6eeca988e..a8cbe9bea 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -8,7 +8,7 @@ org.springframework.integration.samples cafe-dsl - 5.4.0 + 5.5.0 Java DSL Cafe Sample Java DSL Cafe Sample https://projects.spring.io/spring-integration @@ -58,7 +58,7 @@ org.springframework.integration.samples cafe-si - 5.4.0 + 5.5.0 compile @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 9c85d9e8b..3ea1a2898 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -8,7 +8,7 @@ org.springframework.integration.samples kafka-dsl - 5.4.0 + 5.5.0 Java DSL Kafka Sample Java DSL Kafka Sample https://projects.spring.io/spring-integration @@ -206,14 +206,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 82908b887..832bc51ff 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dsl - 5.4.0 + 5.5.0 https://projects.spring.io/spring-integration SpringIO @@ -128,14 +128,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 442a5d668..26e9c990b 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -8,7 +8,7 @@ org.springframework.integration.samples si4demo - 5.4.0 + 5.5.0 Java Configuration/DSL Sample Java Configuration/DSL Sample https://projects.spring.io/spring-integration @@ -276,14 +276,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/gradle.properties b/gradle.properties index 0bde4ae02..c6554ac7e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -version=5.4.0 +version=5.5.0 springBootVersion=2.5.0-SNAPSHOT org.gradle.jvmargs=-Xmx1536m diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 012508b87..33d097e6b 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples async-gateway - 5.4.0 + 5.5.0 Async Gateway Sample Async Gateway Sample https://projects.spring.io/spring-integration @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 6370efb0d..1e81d798b 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-poller - 5.4.0 + 5.5.0 Dynamic Poller Sample Dynamic Poller Sample https://projects.spring.io/spring-integration @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index b699cfcf6..226091329 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples errorhandling - 5.4.0 + 5.5.0 Error Handling Sample Error Handling Sample https://projects.spring.io/spring-integration @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 17eca4e84..05d27fbb8 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file-processing - 5.4.0 + 5.5.0 File Processing Sample File Processing Sample https://projects.spring.io/spring-integration @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index ec243cea6..7b9d15dcf 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail-attachments - 5.4.0 + 5.5.0 Mail Attachment Sample Mail Attachment Sample https://projects.spring.io/spring-integration @@ -224,14 +224,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 808e40a82..8e529cb51 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples monitoring - 5.4.0 + 5.5.0 Monitoring Application Monitoring Application https://projects.spring.io/spring-integration @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index aa0436c16..a9256f060 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples multipart-http - 5.4.0 + 5.5.0 HTTP Multipart Demo HTTP Multipart Demo https://projects.spring.io/spring-integration @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/pom.xml b/intermediate/pom.xml index 669b9622f..827c85dd6 100644 --- a/intermediate/pom.xml +++ b/intermediate/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.springframework.integration.samples intermediate - 5.4.0 + 5.5.0 https://projects.spring.io/spring-integration SpringIO diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index dd77254f7..beacf2c48 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples rest-http - 5.4.0 + 5.5.0 Spring Integration Rest HTTP Path Usage Demo Spring Integration Rest HTTP Path Usage Demo https://projects.spring.io/spring-integration @@ -266,14 +266,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 5f001d971..d16bc8458 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples retry-and-more - 5.4.0 + 5.5.0 Retry and More Sample Retry and More Sample https://projects.spring.io/spring-integration @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index ee2a198e6..fdbf6d418 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper - 5.4.0 + 5.5.0 Splitter-Aggregator-Reaper Sample Splitter-Aggregator-Reaper Sample https://projects.spring.io/spring-integration @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index d0c5711c6..1ac28dfac 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-derby - 5.4.0 + 5.5.0 Derby Stored Procedures Sample Derby Stored Procedures Sample https://projects.spring.io/spring-integration @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 463f7a126..9a1d8729b 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-ms - 5.4.0 + 5.5.0 MS SQLServer Stored Procedures Sample MS SQLServer Stored Procedures Sample https://projects.spring.io/spring-integration @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 5c20e04ac..245bdf2d3 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-oracle - 5.4.0 + 5.5.0 Oracle Stored Procedures Sample Oracle Stored Procedures Sample https://projects.spring.io/spring-integration @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 66385b988..53f6395c6 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-postgresql - 5.4.0 + 5.5.0 PostgreSQL Stored Procedures Sample PostgreSQL Stored Procedures Sample https://projects.spring.io/spring-integration @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 264b9a778..299319426 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -8,7 +8,7 @@ org.springframework.integration.samples tcp-async-bi-directional - 5.4.0 + 5.5.0 Bi-Directional TCP Sample Bi-Directional TCP Sample https://projects.spring.io/spring-integration @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 1f30e1b8c..4558d87c1 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex - 5.4.0 + 5.5.0 TCP Client Server Multiplexing Sample TCP Client Server Multiplexing Sample https://projects.spring.io/spring-integration @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index c886c5c47..f400d1145 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -8,7 +8,7 @@ org.springframework.integration.samples testcontainers-rabbitmq - 5.4.0 + 5.5.0 Testcontainers RabbitMQ Sample Testcontainers RabbitMQ Sample https://projects.spring.io/spring-integration @@ -251,14 +251,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index a73dc30a1..894b2c7b2 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples travel - 5.4.0 + 5.5.0 Travel Services Sample Travel Services Sample https://projects.spring.io/spring-integration @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index a11bb7f76..ffa61c6a3 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tx-synch - 5.4.0 + 5.5.0 Transaction Synchronization Sample Transaction Synchronization Sample https://projects.spring.io/spring-integration @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.4 + 5.3.5 import pom org.springframework.integration spring-integration-bom - 5.5.0-M2 + 5.5.0-M3 import pom From 6234d0ad1611be1af646eef8dc8b30bc0a3121f0 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 7 Apr 2021 12:36:43 -0400 Subject: [PATCH 265/356] Get rid off `master` word --- README.md | 2 +- dsl/si4demo/README.md | 4 ++-- intermediate/stored-procedures-oracle/README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 42dee9d72..0bcec5d68 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Spring Integration Samples # Note -This (master) branch requires Spring Integration 5.0 or above. For samples running against earlier versions of Spring Integration, use the __SI4.3.x__ and other branches. +This (main) branch requires Spring Integration 5.0 or above. For samples running against earlier versions of Spring Integration, use the __SI4.3.x__ and other branches. # Introduction diff --git a/dsl/si4demo/README.md b/dsl/si4demo/README.md index 269466a28..c5c0ec07a 100644 --- a/dsl/si4demo/README.md +++ b/dsl/si4demo/README.md @@ -7,8 +7,8 @@ There are two demo applications from the webinar: __org.springframework.integration.samples.javaconfig.annotations.Application__ is a Spring Boot application using Spring Integration 4.0 Java configuration features. -__org.springframework.integration.samples.javaconfig.dsl.Application__ is the equivalent application using the new Java -DSL that is currently being developed in the [extensions github repository](https://github.com/spring-projects/spring-integration-extensions/tree/master/spring-integration-java-dsl) +__org.springframework.integration.samples.javaconfig.dsl.Application__ is the equivalent application using Java DSL. + In both cases, you can use Telnet or curl to search twitter diff --git a/intermediate/stored-procedures-oracle/README.md b/intermediate/stored-procedures-oracle/README.md index 22b1b78f9..978b7b7cf 100644 --- a/intermediate/stored-procedures-oracle/README.md +++ b/intermediate/stored-procedures-oracle/README.md @@ -248,4 +248,4 @@ For help please take a look at the Spring Integration documentation: https://www.springsource.org/spring-integration -[Stored Procedure Sample for PostgreSql]: https://github.com/ghillert/spring-integration-samples/tree/master/intermediate/stored-procedures-postgresql +[Stored Procedure Sample for PostgreSql]: https://github.com/ghillert/spring-integration-samples/tree/main/intermediate/stored-procedures-postgresql From 261648bed136a076f76ed15b1017f5e5b6d8b9ae Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Fri, 9 Apr 2021 13:44:54 -0400 Subject: [PATCH 266/356] Fix web-socket client logging - nothing is currently logged. --- basic/web-sockets/src/main/resources/logback.xml | 1 + .../samples/websocket/standard/client/client-context.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/basic/web-sockets/src/main/resources/logback.xml b/basic/web-sockets/src/main/resources/logback.xml index 8c6ebb380..617664221 100644 --- a/basic/web-sockets/src/main/resources/logback.xml +++ b/basic/web-sockets/src/main/resources/logback.xml @@ -15,5 +15,6 @@ + diff --git a/basic/web-sockets/src/main/resources/org/springframework/integration/samples/websocket/standard/client/client-context.xml b/basic/web-sockets/src/main/resources/org/springframework/integration/samples/websocket/standard/client/client-context.xml index 9652784d6..a5b076dd4 100644 --- a/basic/web-sockets/src/main/resources/org/springframework/integration/samples/websocket/standard/client/client-context.xml +++ b/basic/web-sockets/src/main/resources/org/springframework/integration/samples/websocket/standard/client/client-context.xml @@ -20,6 +20,6 @@ - + From 85bcbc10de83dd5ac240ca7f7b7abd738610dca0 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 14 Apr 2021 22:20:21 -0400 Subject: [PATCH 267/356] Upgrade dependencies --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/cafe-amqp/pom.xml | 4 ++-- applications/cafe/cafe-jms/pom.xml | 4 ++-- applications/cafe/cafe-si/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 6 +++--- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 4 ++-- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 4 ++-- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 4 ++-- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- build.gradle | 8 ++++---- dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 4 ++-- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 8 ++++---- intermediate/retry-and-more/pom.xml | 4 ++-- intermediate/splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- intermediate/stored-procedures-postgresql/pom.xml | 4 ++-- intermediate/tcp-async-bi-directional/pom.xml | 4 ++-- intermediate/tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/testcontainers-rabbitmq/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 66 files changed, 137 insertions(+), 137 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index ce740fc49..9d1b62de1 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index b3779837b..057b419b5 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 741f81236..77a66b646 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 01b4439bb..7ccff78ad 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -222,14 +222,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 8086e1d48..0b95e53b8 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 8caf5b568..9acc76890 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 580204d21..9fad5ed57 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 4aa26d80f..f52cb4b92 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -252,14 +252,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index e3b03783e..dfff19e22 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 913fdcacd..fc0ab960d 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -297,7 +297,7 @@ org.hibernate hibernate-entitymanager - 5.4.28.Final + 5.4.30.Final compile @@ -446,14 +446,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index f83387c28..2684b3ee6 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 7eb688e55..ea934e18d 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 2b1aa983a..5dff34070 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -216,14 +216,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 3073c0912..ad8b23024 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 531237663..cc12c97b9 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index a1e75eeae..c2cb47438 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 80a266786..a099f9b7f 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index a1ca25e13..02c504fc9 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 3f9cf1ad2..e1091c84f 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index a5e388568..87daa541e 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -235,14 +235,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 635298b4a..59d01e566 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index ef5c2e480..1dc910dde 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 61592424c..44d23c2d0 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 354f70207..a6b18abeb 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 4d17f8eff..c1c12977f 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 2a2e4d949..b48010a3b 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index ee1c384ab..e88a8ce54 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 2266a3842..14f924365 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 5241e0092..e437692a8 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 6df6a58f3..7eece4d2c 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 735dac8d4..76d98bf8d 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 9c49c8174..01e4ac196 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 010316b29..18bd23814 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index efdfc723f..1885c605f 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 83e24db53..d55a5d59f 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index d52fcf7b9..61b7d75a2 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 790a53254..3a1785931 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -154,14 +154,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 14a3a01d2..d0a54e6fe 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index ffb4da6ae..d15c7c55a 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 86b019d0d..89dc88520 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 516b72ea2..232c4b549 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 88f9d4539..3b1876afb 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/build.gradle b/build.gradle index f0d1b4637..9cb82a21b 100644 --- a/build.gradle +++ b/build.gradle @@ -180,7 +180,7 @@ subprojects { subproject -> c3p0Version = '0.9.1.2' derbyVersion = '10.14.2.0' hamcrestVersion = '2.2' - hibernateVersion = '5.4.28.Final' + hibernateVersion = '5.4.30.Final' hibernateValidatorVersion = '6.1.2.Final' ftpServerVersion = '1.1.1' flexjsonVersion = '2.0' @@ -210,11 +210,11 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.30' springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.5.0-M3' + springIntegrationVersion = '5.5.0-RC1' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.5' - springSecurityVersion = '5.4.4' + springVersion = '5.3.6' + springSecurityVersion = '5.5.0-RC1' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.15.2' tilesJspVersion = '2.2.1' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index a8cbe9bea..09aa03908 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 3ea1a2898..1d51b903d 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -206,14 +206,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 832bc51ff..cbfe713e3 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -128,14 +128,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 26e9c990b..489572a55 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -276,14 +276,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 33d097e6b..edb538b0d 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 1e81d798b..7be3758ea 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 226091329..6b2c97f31 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 05d27fbb8..827a9888f 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 7b9d15dcf..3892b4682 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -224,14 +224,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 8e529cb51..7d8f1b2f4 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index a9256f060..161eb4feb 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index beacf2c48..230e7d3a1 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -141,7 +141,7 @@ org.springframework.security spring-security-web - 5.4.4 + 5.5.0-RC1 compile @@ -153,7 +153,7 @@ org.springframework.security spring-security-config - 5.4.4 + 5.5.0-RC1 compile @@ -266,14 +266,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index d16bc8458..1bc85a43c 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index fdbf6d418..95bb061fa 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 1ac28dfac..a9dea0e09 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 9a1d8729b..62e46fadf 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 245bdf2d3..bae0e0f6e 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 53f6395c6..a1bc4b39a 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 299319426..7262a537a 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 4558d87c1..fdd889620 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index f400d1145..9ab3871a6 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -251,14 +251,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 894b2c7b2..ab9983c88 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index ffa61c6a3..1c502355f 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.5 + 5.3.6 import pom org.springframework.integration spring-integration-bom - 5.5.0-M3 + 5.5.0-RC1 import pom From e5d87c569fe23f10b5b0a44d6d33e85f848eb827 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 18 May 2021 17:25:38 -0400 Subject: [PATCH 268/356] Upgrade dependencies --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/cafe-amqp/pom.xml | 4 ++-- applications/cafe/cafe-jms/pom.xml | 4 ++-- applications/cafe/cafe-si/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 4 ++-- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 4 ++-- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 4 ++-- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 4 ++-- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- build.gradle | 6 +++--- dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 4 ++-- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 8 ++++---- intermediate/retry-and-more/pom.xml | 4 ++-- intermediate/splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- intermediate/stored-procedures-postgresql/pom.xml | 4 ++-- intermediate/tcp-async-bi-directional/pom.xml | 4 ++-- intermediate/tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/testcontainers-rabbitmq/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 66 files changed, 135 insertions(+), 135 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 9d1b62de1..92d3b9ba3 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 057b419b5..f5b9432a9 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 77a66b646..40ab8ee52 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 7ccff78ad..caa264f70 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -222,14 +222,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 0b95e53b8..64ae9b994 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 9acc76890..100b7943a 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 9fad5ed57..e421d3c0e 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index f52cb4b92..851cfab61 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -252,14 +252,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index dfff19e22..f66c3a1a8 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index fc0ab960d..26cf21c4e 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -446,14 +446,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 2684b3ee6..fa0c073e1 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index ea934e18d..66fa34c21 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 5dff34070..1a8ae1897 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -216,14 +216,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index ad8b23024..64782fd02 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index cc12c97b9..e3b5f82b7 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index c2cb47438..5fcdcac9f 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index a099f9b7f..f74ebe599 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 02c504fc9..230586c5f 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index e1091c84f..76d8272c2 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 87daa541e..061df1c76 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -235,14 +235,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 59d01e566..663b09e92 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 1dc910dde..3756fad02 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 44d23c2d0..e6e6319b2 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index a6b18abeb..c8667f129 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index c1c12977f..4b36339b4 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index b48010a3b..65e22b633 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index e88a8ce54..48bfd96e2 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 14f924365..2a62e7d94 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index e437692a8..8e9766bf8 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 7eece4d2c..a08f9d284 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 76d98bf8d..54592c74f 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 01e4ac196..ec4c0cde2 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 18bd23814..71102502f 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 1885c605f..c7693cf9f 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index d55a5d59f..29c1f5761 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 61b7d75a2..0c6fb3569 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 3a1785931..802bc1489 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -154,14 +154,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index d0a54e6fe..13649f68b 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index d15c7c55a..d239f0abb 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 89dc88520..faf8b91e7 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 232c4b549..bb0445c8a 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 3b1876afb..ea11b0756 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/build.gradle b/build.gradle index 9cb82a21b..e995dfb02 100644 --- a/build.gradle +++ b/build.gradle @@ -210,11 +210,11 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.30' springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.5.0-RC1' + springIntegrationVersion = '5.5.0' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.6' - springSecurityVersion = '5.5.0-RC1' + springVersion = '5.3.7' + springSecurityVersion = '5.5.0' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.15.2' tilesJspVersion = '2.2.1' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 09aa03908..d3978e618 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 1d51b903d..a0a32fdc9 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -206,14 +206,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index cbfe713e3..db28f212b 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -128,14 +128,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 489572a55..b03b0fe7f 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -276,14 +276,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index edb538b0d..5920b3883 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 7be3758ea..0a40a2ec5 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 6b2c97f31..e38eed75b 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 827a9888f..2f6b949ba 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 3892b4682..ec58796d0 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -224,14 +224,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 7d8f1b2f4..5c28dd076 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 161eb4feb..ae3ae7cf9 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 230e7d3a1..fe755e3e3 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -141,7 +141,7 @@ org.springframework.security spring-security-web - 5.5.0-RC1 + 5.5.0 compile @@ -153,7 +153,7 @@ org.springframework.security spring-security-config - 5.5.0-RC1 + 5.5.0 compile @@ -266,14 +266,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 1bc85a43c..0f025e299 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 95bb061fa..6ebb52110 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index a9dea0e09..21a067076 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 62e46fadf..298a36467 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index bae0e0f6e..5408ebf65 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index a1bc4b39a..571a181a7 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 7262a537a..8cab89b78 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index fdd889620..b943787fa 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 9ab3871a6..2f9e1f234 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -251,14 +251,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index ab9983c88..ad20e7f2a 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 1c502355f..d9c3ba299 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.6 + 5.3.7 import pom org.springframework.integration spring-integration-bom - 5.5.0-RC1 + 5.5.0 import pom From 74452b11fe24df71425777660814fb0f77970568 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 24 Jun 2021 10:16:23 -0400 Subject: [PATCH 269/356] Upgrade dependencies --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/cafe-amqp/pom.xml | 4 ++-- applications/cafe/cafe-jms/pom.xml | 4 ++-- applications/cafe/cafe-si/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 4 ++-- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 4 ++-- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 4 ++-- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 4 ++-- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- build.gradle | 6 +++--- dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 4 ++-- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 8 ++++---- intermediate/retry-and-more/pom.xml | 4 ++-- intermediate/splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- intermediate/stored-procedures-postgresql/pom.xml | 4 ++-- intermediate/tcp-async-bi-directional/pom.xml | 4 ++-- intermediate/tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/testcontainers-rabbitmq/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 66 files changed, 135 insertions(+), 135 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 92d3b9ba3..6601b52b9 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index f5b9432a9..d3fe3ee8e 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 40ab8ee52..55d36e921 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index caa264f70..dceecf14c 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -222,14 +222,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 64ae9b994..b5b8ef8d7 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 100b7943a..27d52c10f 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index e421d3c0e..5fa336ebb 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 851cfab61..e9cf7dd34 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -252,14 +252,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index f66c3a1a8..c04c14e6b 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 26cf21c4e..75399c23a 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -446,14 +446,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index fa0c073e1..74c66029f 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 66fa34c21..449118170 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 1a8ae1897..fa7374c20 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -216,14 +216,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 64782fd02..2e8e78e30 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index e3b5f82b7..50d57aef4 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 5fcdcac9f..66f443e77 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index f74ebe599..ce646856b 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 230586c5f..61e4a8f45 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 76d8272c2..7ea6e02af 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 061df1c76..41d9c5089 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -235,14 +235,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 663b09e92..47456f462 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 3756fad02..4bf1dd57e 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index e6e6319b2..4ba2aa757 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index c8667f129..4e21a2269 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 4b36339b4..6f6c69629 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 65e22b633..494fc0f20 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 48bfd96e2..65b0e1b55 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 2a62e7d94..898f1faed 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 8e9766bf8..d9ff6ebca 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index a08f9d284..f3dfd9fe0 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 54592c74f..fdaa0c34f 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index ec4c0cde2..1222d6a2b 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 71102502f..a3fa0f9ce 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index c7693cf9f..231d73622 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 29c1f5761..1ce8cecb7 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 0c6fb3569..fd5ecc652 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 802bc1489..36fb20cd0 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -154,14 +154,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 13649f68b..9fb7ef7c1 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index d239f0abb..8f92044d9 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index faf8b91e7..d3d59e0dc 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index bb0445c8a..95231b714 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index ea11b0756..745729de9 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/build.gradle b/build.gradle index e995dfb02..bf8ec68a4 100644 --- a/build.gradle +++ b/build.gradle @@ -210,11 +210,11 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.30' springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.5.0' + springIntegrationVersion = '5.5.1' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.7' - springSecurityVersion = '5.5.0' + springVersion = '5.3.8' + springSecurityVersion = '5.5.1' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.15.2' tilesJspVersion = '2.2.1' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index d3978e618..3090cf672 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index a0a32fdc9..9537895de 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -206,14 +206,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index db28f212b..8ecc84cb1 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -128,14 +128,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index b03b0fe7f..91adfaefc 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -276,14 +276,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 5920b3883..cfc41235f 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 0a40a2ec5..1501af8b1 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index e38eed75b..f55d7d429 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 2f6b949ba..6fd67b435 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index ec58796d0..3ad3aae5f 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -224,14 +224,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 5c28dd076..1ad1ab200 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index ae3ae7cf9..dde0ee4d9 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index fe755e3e3..346b14618 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -141,7 +141,7 @@ org.springframework.security spring-security-web - 5.5.0 + 5.5.1 compile @@ -153,7 +153,7 @@ org.springframework.security spring-security-config - 5.5.0 + 5.5.1 compile @@ -266,14 +266,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 0f025e299..fdc8f90c8 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 6ebb52110..dba3fb8af 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 21a067076..c8603f3ba 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 298a36467..fcc1b4297 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 5408ebf65..f5bdd190f 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 571a181a7..5721075a1 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 8cab89b78..bfa4870c3 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index b943787fa..a7c3422c4 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 2f9e1f234..e79038a2f 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -251,14 +251,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index ad20e7f2a..2082f6d6c 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index d9c3ba299..a2c2f782f 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.7 + 5.3.8 import pom org.springframework.integration spring-integration-bom - 5.5.0 + 5.5.1 import pom From 4f2d9c52c50973dfef8376fa78c108edd5f0cabb Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 20 Jul 2021 13:26:56 -0400 Subject: [PATCH 270/356] Upgrade dependencies * Fix compilation warnings * Fix compatibility with upgraded deps * Fix repo URLs --- advanced/advanced-testing-examples/pom.xml | 6 ++-- advanced/dynamic-ftp/pom.xml | 6 ++-- advanced/dynamic-tcp-client/pom.xml | 6 ++-- applications/cafe-scripted/pom.xml | 8 ++--- applications/cafe/cafe-amqp/pom.xml | 6 ++-- applications/cafe/cafe-jms/pom.xml | 10 +++--- applications/cafe/cafe-si/pom.xml | 6 ++-- applications/file-split-ftp/pom.xml | 12 +++---- applications/loan-broker/pom.xml | 6 ++-- applications/loanshark/pom.xml | 12 +++---- .../loanshark/biz/AccumulatorTests.java | 4 +-- applications/stomp-chat/pom.xml | 6 ++-- basic/amqp/pom.xml | 6 ++-- basic/barrier/pom.xml | 6 ++-- basic/control-bus/pom.xml | 6 ++-- basic/enricher/pom.xml | 6 ++-- basic/feed/pom.xml | 6 ++-- basic/file/pom.xml | 6 ++-- basic/ftp/pom.xml | 8 ++--- basic/helloworld/pom.xml | 6 ++-- basic/http/pom.xml | 14 ++++----- basic/jdbc/pom.xml | 6 ++-- basic/jms/pom.xml | 10 +++--- basic/jmx/pom.xml | 6 ++-- basic/jpa/pom.xml | 6 ++-- basic/kafka/pom.xml | 6 ++-- basic/mail/pom.xml | 12 +++---- basic/mongodb/pom.xml | 8 ++--- basic/mqtt/pom.xml | 6 ++-- basic/oddeven/pom.xml | 6 ++-- basic/quote/pom.xml | 6 ++-- basic/sftp/pom.xml | 8 ++--- .../samples/sftp/EmbeddedSftpServer.java | 2 +- basic/tcp-amqp/pom.xml | 6 ++-- basic/tcp-broadcast/pom.xml | 6 ++-- basic/tcp-client-server/pom.xml | 6 ++-- basic/tcp-with-headers/pom.xml | 6 ++-- basic/testing-examples/pom.xml | 6 ++-- basic/twitter/pom.xml | 6 ++-- basic/web-sockets/pom.xml | 6 ++-- basic/ws-inbound-gateway/pom.xml | 6 ++-- basic/ws-outbound-gateway/pom.xml | 6 ++-- basic/xml/pom.xml | 6 ++-- basic/xmpp/pom.xml | 6 ++-- build.gradle | 31 ++++++++++--------- dsl/cafe-dsl/pom.xml | 6 ++-- dsl/kafka-dsl/pom.xml | 6 ++-- dsl/pom.xml | 6 ++-- dsl/si4demo/pom.xml | 12 +++---- intermediate/async-gateway/pom.xml | 6 ++-- intermediate/dynamic-poller/pom.xml | 6 ++-- intermediate/errorhandling/pom.xml | 6 ++-- intermediate/file-processing/pom.xml | 6 ++-- intermediate/mail-attachments/pom.xml | 14 ++++----- intermediate/monitoring/pom.xml | 6 ++-- intermediate/multipart-http/pom.xml | 8 ++--- intermediate/rest-http/pom.xml | 6 ++-- intermediate/retry-and-more/pom.xml | 6 ++-- .../splitter-aggregator-reaper/pom.xml | 6 ++-- intermediate/stored-procedures-derby/pom.xml | 6 ++-- intermediate/stored-procedures-ms/pom.xml | 6 ++-- intermediate/stored-procedures-oracle/pom.xml | 6 ++-- .../stored-procedures-postgresql/pom.xml | 6 ++-- intermediate/tcp-async-bi-directional/pom.xml | 6 ++-- .../tcp-client-server-multiplex/pom.xml | 6 ++-- intermediate/testcontainers-rabbitmq/pom.xml | 8 ++--- intermediate/travel/pom.xml | 6 ++-- intermediate/tx-synch/pom.xml | 6 ++-- 68 files changed, 244 insertions(+), 243 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 6601b52b9..54768d03c 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -127,7 +127,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index d3fe3ee8e..f7714c6ed 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 55d36e921..931c44773 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -108,7 +108,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index dceecf14c..4a58b93a8 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -121,7 +121,7 @@ org.codehaus.groovy groovy-all - 3.0.7 + 3.0.8 compile @@ -173,7 +173,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -222,14 +222,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index b5b8ef8d7..f78963ee0 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 27d52c10f..05a1c894b 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -65,7 +65,7 @@ org.apache.activemq activemq-broker - 5.16.1 + 5.16.2 compile @@ -77,7 +77,7 @@ org.apache.activemq activemq-kahadb-store - 5.16.1 + 5.16.2 compile @@ -156,7 +156,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 5fa336ebb..84eb39944 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -115,7 +115,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index e9cf7dd34..0285ffe1b 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -113,7 +113,7 @@ jakarta.mail jakarta.mail-api - 1.6.5 + 1.6.7 compile @@ -125,7 +125,7 @@ com.sun.mail imap - 1.6.5 + 1.6.7 compile @@ -137,7 +137,7 @@ com.sun.mail jakarta.mail - 1.6.5 + 1.6.7 compile @@ -177,7 +177,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -252,14 +252,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index c04c14e6b..8590f9e90 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 75399c23a..da6249fd2 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -108,7 +108,7 @@ org.aspectj aspectjtools - 1.9.6 + 1.9.7 compile @@ -237,7 +237,7 @@ org.hsqldb hsqldb - 2.5.1 + 2.6.0 compile @@ -297,7 +297,7 @@ org.hibernate hibernate-entitymanager - 5.4.30.Final + 5.5.4.Final compile @@ -397,7 +397,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -446,14 +446,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java b/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java index 9eb18d3f4..431a97ab3 100644 --- a/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java +++ b/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java @@ -48,7 +48,7 @@ public void test() { accumulator.accumulate(new SharkQuote("fred", 6.0d)); accumulator.accumulate(new SharkQuote("fred", 6.2d)); LoanShark shark = (LoanShark) LoanShark.findLoanSharksByName("fred").getSingleResult(); - assertEquals(new Long(2), shark.getCounter()); - assertEquals(new Double(6.1), shark.getAverageRate()); + assertEquals(Long.valueOf(2), shark.getCounter()); + assertEquals(Double.valueOf(6.1), shark.getAverageRate()); } } diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 74c66029f..60ce5d2a6 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -130,7 +130,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 449118170..6982c10c3 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -127,7 +127,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index fa7374c20..eb11af831 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -141,7 +141,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -216,14 +216,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 2e8e78e30..ba60e2652 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 50d57aef4..8eaa24bd1 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 66f443e77..0ae4e8183 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index ce646856b..08dba4878 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 61e4a8f45..293e7488c 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -64,7 +64,7 @@ commons-io commons-io - 2.8.0 + 2.11.0 compile @@ -140,7 +140,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 7ea6e02af..3bf129b61 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 41d9c5089..3a63f01bd 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -98,7 +98,7 @@ commons-io commons-io - 2.8.0 + 2.11.0 compile @@ -110,7 +110,7 @@ jakarta.mail jakarta.mail-api - 1.6.5 + 1.6.7 compile @@ -122,7 +122,7 @@ com.sun.mail imap - 1.6.5 + 1.6.7 compile @@ -134,7 +134,7 @@ com.sun.mail jakarta.mail - 1.6.5 + 1.6.7 compile @@ -186,7 +186,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -235,14 +235,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 47456f462..88c6ec916 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 4bf1dd57e..a06b334c0 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -87,7 +87,7 @@ org.apache.activemq activemq-broker - 5.16.1 + 5.16.2 compile @@ -99,7 +99,7 @@ org.apache.activemq activemq-kahadb-store - 5.16.1 + 5.16.2 compile @@ -155,7 +155,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 4ba2aa757..c64e31045 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -115,7 +115,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 4e21a2269..93062bc68 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -143,7 +143,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 6f6c69629..39b553120 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -135,7 +135,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 494fc0f20..215e48463 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -75,7 +75,7 @@ jakarta.mail jakarta.mail-api - 1.6.5 + 1.6.7 compile @@ -87,7 +87,7 @@ com.sun.mail imap - 1.6.5 + 1.6.7 compile @@ -99,7 +99,7 @@ com.sun.mail jakarta.mail - 1.6.5 + 1.6.7 compile @@ -151,7 +151,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 65b0e1b55..c5a0ee1ea 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -76,7 +76,7 @@ org.mongodb mongodb-driver-sync - 4.2.0 + 4.3.0 compile @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 898f1faed..b03012627 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -119,7 +119,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index d9ff6ebca..673d6d518 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index f3dfd9fe0..6a3d74c0d 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index fdaa0c34f..a57931082 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -131,7 +131,7 @@ org.apache.sshd sshd-sftp - 2.5.1 + 2.7.0 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/EmbeddedSftpServer.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/EmbeddedSftpServer.java index 0d41e3579..ec0e09b70 100644 --- a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/EmbeddedSftpServer.java +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/EmbeddedSftpServer.java @@ -31,7 +31,7 @@ import org.apache.sshd.common.file.virtualfs.VirtualFileSystemFactory; import org.apache.sshd.server.SshServer; import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; -import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory; +import org.apache.sshd.sftp.server.SftpSubsystemFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.SmartLifecycle; diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 1222d6a2b..9304fbf87 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -139,7 +139,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index a3fa0f9ce..3f76daa1a 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -119,7 +119,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 231d73622..d9bbeabd8 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -127,7 +127,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 1ce8cecb7..2f8578a8e 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -119,7 +119,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index fd5ecc652..9fea43f18 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -137,7 +137,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 36fb20cd0..da4c2d2e3 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -105,7 +105,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -154,14 +154,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 9fb7ef7c1..db389f723 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -108,7 +108,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 8f92044d9..daef5491d 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -126,7 +126,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index d3d59e0dc..3c6a6e03e 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -115,7 +115,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 95231b714..1c0b911be 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 745729de9..1116c8638 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/build.gradle b/build.gradle index bf8ec68a4..ddddc86e0 100644 --- a/build.gradle +++ b/build.gradle @@ -33,8 +33,9 @@ allprojects { repositories { mavenCentral() - maven { url 'https://repo.spring.io/libs-milestone' } - maven { url 'https://repo.spring.io/libs-snapshot' } + maven { url 'https://repo.spring.io/release' } + maven { url 'https://repo.spring.io/milestone' } + maven { url 'https://repo.spring.io/snapshot' } // maven { url 'https://repo.spring.io/libs-staging-local' } } @@ -168,28 +169,28 @@ subprojects { subproject -> } ext { - activeMqVersion = '5.16.1' - apacheSshdVersion = '2.5.1' - aspectjVersion = '1.9.6' + activeMqVersion = '5.16.2' + apacheSshdVersion = '2.7.0' + aspectjVersion = '1.9.7' commonsDigesterVersion = '2.0' commonsDbcpVersion = '2.8.0' commonsFileUploadVersion = '1.4' - commonsIoVersion = '2.8.0' + commonsIoVersion = '2.11.0' commonsLangVersion = '2.6' commonsPoolVersion = '1.5.4' c3p0Version = '0.9.1.2' derbyVersion = '10.14.2.0' hamcrestVersion = '2.2' - hibernateVersion = '5.4.30.Final' + hibernateVersion = '5.5.4.Final' hibernateValidatorVersion = '6.1.2.Final' ftpServerVersion = '1.1.1' flexjsonVersion = '2.0' - groovyVersion = '3.0.7' - hsqldbVersion = '2.5.1' + groovyVersion = '3.0.8' + hsqldbVersion = '2.6.0' h2Version = '1.4.200' jacksonVersion = '2.12.1' javaxInjectVersion = '1' - javaxMailVersion = '1.6.5' + javaxMailVersion = '1.6.7' jaxbVersion = '2.3.3' jodaTimeVersion = '1.6' jtaVersion = '1.1' @@ -202,18 +203,18 @@ subprojects { subproject -> junitVersion = '4.13.2' jythonVersion = '2.7.2' log4jVersion = '2.14.0' - mockitoVersion = '3.7.7' - mongoDriverVersion = '4.2.0' + mockitoVersion = '3.11.2' + mongoDriverVersion = '4.3.0' openJpaVersion = '2.4.0' oracleDriverVersion = '19.3.0.0' postgresVersion = '42.2.14' subethasmtpVersion = '1.2' slf4jVersion = '1.7.30' - springCloudVersion ='2020.0.0-SNAPSHOT' - springIntegrationVersion = '5.5.1' + springCloudVersion ='2021.0.0-SNAPSHOT' + springIntegrationVersion = '5.5.2' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.8' + springVersion = '5.3.9' springSecurityVersion = '5.5.1' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.15.2' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 3090cf672..6501989e1 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -120,7 +120,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 9537895de..312671af1 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -131,7 +131,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -206,14 +206,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 8ecc84cb1..8806ac154 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -79,7 +79,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -128,14 +128,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 91adfaefc..4afb83c59 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -125,7 +125,7 @@ jakarta.mail jakarta.mail-api - 1.6.5 + 1.6.7 compile @@ -137,7 +137,7 @@ com.sun.mail imap - 1.6.5 + 1.6.7 compile @@ -149,7 +149,7 @@ com.sun.mail jakarta.mail - 1.6.5 + 1.6.7 compile @@ -201,7 +201,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -276,14 +276,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index cfc41235f..ca286f4a9 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 1501af8b1..c8cab5bf7 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index f55d7d429..af2983cae 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 6fd67b435..fb7ff026c 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 3ad3aae5f..c45648fb5 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -75,7 +75,7 @@ jakarta.mail jakarta.mail-api - 1.6.5 + 1.6.7 compile @@ -87,7 +87,7 @@ com.sun.mail imap - 1.6.5 + 1.6.7 compile @@ -99,7 +99,7 @@ com.sun.mail jakarta.mail - 1.6.5 + 1.6.7 compile @@ -111,7 +111,7 @@ commons-io commons-io - 2.8.0 + 2.11.0 compile @@ -163,7 +163,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -224,14 +224,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 1ad1ab200..a1f5a9f21 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -150,7 +150,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index dde0ee4d9..7e5208019 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -98,7 +98,7 @@ commons-io commons-io - 2.8.0 + 2.11.0 compile @@ -150,7 +150,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 346b14618..7da369e31 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -217,7 +217,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -266,14 +266,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index fdc8f90c8..2274a02cc 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -97,7 +97,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 compile @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index dba3fb8af..726373ecf 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index c8603f3ba..025aa02e9 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index fcc1b4297..ea210ccff 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -128,7 +128,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index f5bdd190f..b67d6a1aa 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -116,7 +116,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 5721075a1..f2c3f1704 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -140,7 +140,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index bfa4870c3..065381b1e 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -108,7 +108,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index a7c3422c4..3a8dfb567 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index e79038a2f..62ab19f14 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -119,7 +119,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -230,7 +230,7 @@ org.springframework.cloud spring-cloud-dependencies - 2020.0.0-SNAPSHOT + 2021.0.0-SNAPSHOT import pom @@ -251,14 +251,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 2082f6d6c..6e97f85d1 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -126,7 +126,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index a2c2f782f..0e9b88a80 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -127,7 +127,7 @@ org.mockito mockito-core - 3.7.7 + 3.11.2 test @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.8 + 5.3.9 import pom org.springframework.integration spring-integration-bom - 5.5.1 + 5.5.2 import pom From 110f1ca53a43d77777b65409170704b9b11035fe Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 17 Aug 2021 15:31:28 -0400 Subject: [PATCH 271/356] Upgrade dependencies --- advanced/advanced-testing-examples/pom.xml | 2 +- advanced/dynamic-ftp/pom.xml | 2 +- advanced/dynamic-tcp-client/pom.xml | 2 +- applications/cafe-scripted/pom.xml | 2 +- applications/cafe/cafe-amqp/pom.xml | 2 +- applications/cafe/cafe-jms/pom.xml | 2 +- applications/cafe/cafe-si/pom.xml | 2 +- applications/file-split-ftp/pom.xml | 2 +- applications/loan-broker/pom.xml | 2 +- applications/loanshark/pom.xml | 2 +- applications/stomp-chat/pom.xml | 2 +- basic/amqp/pom.xml | 2 +- basic/barrier/pom.xml | 2 +- basic/control-bus/pom.xml | 2 +- basic/enricher/pom.xml | 2 +- basic/feed/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/kafka/pom.xml | 2 +- basic/mail/pom.xml | 2 +- basic/mongodb/pom.xml | 2 +- basic/mqtt/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-broadcast/pom.xml | 2 +- basic/tcp-client-server/pom.xml | 2 +- basic/tcp-with-headers/pom.xml | 2 +- basic/testing-examples/pom.xml | 2 +- basic/twitter/pom.xml | 2 +- basic/web-sockets/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 +- build.gradle | 2 +- dsl/cafe-dsl/pom.xml | 2 +- dsl/kafka-dsl/pom.xml | 2 +- dsl/pom.xml | 2 +- dsl/si4demo/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/rest-http/pom.xml | 2 +- intermediate/retry-and-more/pom.xml | 2 +- intermediate/splitter-aggregator-reaper/pom.xml | 2 +- intermediate/stored-procedures-derby/pom.xml | 2 +- intermediate/stored-procedures-ms/pom.xml | 2 +- intermediate/stored-procedures-oracle/pom.xml | 2 +- intermediate/stored-procedures-postgresql/pom.xml | 2 +- intermediate/tcp-async-bi-directional/pom.xml | 2 +- intermediate/tcp-client-server-multiplex/pom.xml | 2 +- intermediate/testcontainers-rabbitmq/pom.xml | 2 +- intermediate/travel/pom.xml | 2 +- intermediate/tx-synch/pom.xml | 2 +- 66 files changed, 66 insertions(+), 66 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 54768d03c..a732dca61 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -183,7 +183,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index f7714c6ed..3aa47dc4b 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 931c44773..d88e0f2b0 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -190,7 +190,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 4a58b93a8..144cc78e6 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -229,7 +229,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index f78963ee0..372a98d88 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 05a1c894b..af0eadaf4 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -212,7 +212,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 84eb39944..6731af504 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -171,7 +171,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 0285ffe1b..4108b79e9 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -259,7 +259,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 8590f9e90..a87412f99 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index da6249fd2..f01377641 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -453,7 +453,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 60ce5d2a6..b5d96de34 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -212,7 +212,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 6982c10c3..76ee5bdcf 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -183,7 +183,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index eb11af831..768ad5c89 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -223,7 +223,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index ba60e2652..3eee40297 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 8eaa24bd1..0afe9456f 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 0ae4e8183..ab765a1e8 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 08dba4878..1d050e09e 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 293e7488c..7e472507c 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -208,7 +208,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 3bf129b61..655078514 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 3a63f01bd..8057685aa 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -242,7 +242,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 88c6ec916..b1b27e90a 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index a06b334c0..5fa1e4aab 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -211,7 +211,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index c64e31045..042c4925c 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -171,7 +171,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 93062bc68..639d99824 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -225,7 +225,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 39b553120..8b2d893b7 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -217,7 +217,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 215e48463..f934bc988 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -207,7 +207,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index c5a0ee1ea..43c157a0c 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index b03012627..4fdb037ee 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -201,7 +201,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 673d6d518..c51b9fdca 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 6a3d74c0d..5c3c85003 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index a57931082..b4eb43e47 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 9304fbf87..6662e1697 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -195,7 +195,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 3f76daa1a..6e1504d58 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -201,7 +201,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index d9bbeabd8..7f050630f 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 2f8578a8e..8ead957e2 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -201,7 +201,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 9fea43f18..2d3823474 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -193,7 +193,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index da4c2d2e3..c0af3acd7 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -161,7 +161,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index db389f723..f8e977a71 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -190,7 +190,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index daef5491d..0b51a5158 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -182,7 +182,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 3c6a6e03e..e74febe89 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -171,7 +171,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 1c0b911be..56bb151ce 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 1116c8638..dbcffad87 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/build.gradle b/build.gradle index ddddc86e0..b2cbaed21 100644 --- a/build.gradle +++ b/build.gradle @@ -211,7 +211,7 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.30' springCloudVersion ='2021.0.0-SNAPSHOT' - springIntegrationVersion = '5.5.2' + springIntegrationVersion = '5.5.3' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' springVersion = '5.3.9' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 6501989e1..8904a98ec 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -202,7 +202,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 312671af1..6815fac4b 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -213,7 +213,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 8806ac154..be0d9fc68 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -135,7 +135,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 4afb83c59..bfc3ee914 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -283,7 +283,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index ca286f4a9..3ad6cd644 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index c8cab5bf7..a0363d776 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index af2983cae..eb35148b9 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index fb7ff026c..06d4643cd 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index c45648fb5..644e8e816 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -231,7 +231,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index a1f5a9f21..b064247fb 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -206,7 +206,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 7e5208019..7d316599f 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -206,7 +206,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 7da369e31..145f93ee5 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -273,7 +273,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 2274a02cc..cebe9c205 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -193,7 +193,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 726373ecf..6ff60cbd6 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 025aa02e9..17767af78 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index ea210ccff..19386b27c 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -184,7 +184,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index b67d6a1aa..45df09705 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index f2c3f1704..ecd0c2d89 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -196,7 +196,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 065381b1e..e6873a7e2 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -190,7 +190,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 3a8dfb567..b1598f1d6 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 62ab19f14..9b8143fe6 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -258,7 +258,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 6e97f85d1..3d2557f81 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -182,7 +182,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 0e9b88a80..67b491100 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -183,7 +183,7 @@ org.springframework.integration spring-integration-bom - 5.5.2 + 5.5.3 import pom From 068d8d147d5b83891ee11bcdedbba5a702fa0575 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 22 Sep 2021 08:56:56 -0400 Subject: [PATCH 272/356] Upgrade dependencies --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/cafe-amqp/pom.xml | 4 ++-- applications/cafe/cafe-jms/pom.xml | 4 ++-- applications/cafe/cafe-si/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 4 ++-- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 4 ++-- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 4 ++-- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 4 ++-- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- build.gradle | 6 +++--- dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 4 ++-- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 8 ++++---- intermediate/retry-and-more/pom.xml | 4 ++-- intermediate/splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- intermediate/stored-procedures-postgresql/pom.xml | 4 ++-- intermediate/tcp-async-bi-directional/pom.xml | 4 ++-- intermediate/tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/testcontainers-rabbitmq/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 66 files changed, 135 insertions(+), 135 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index a732dca61..ebd1e4b2c 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 3aa47dc4b..c968be5c6 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index d88e0f2b0..cecb9919c 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 144cc78e6..1559adcf6 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -222,14 +222,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 372a98d88..cebd44a19 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index af0eadaf4..a960b7dbc 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 6731af504..943d3d949 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 4108b79e9..790015b84 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -252,14 +252,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index a87412f99..060ec61b4 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index f01377641..27f2ea9e3 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -446,14 +446,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index b5d96de34..fcc771a5e 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 76ee5bdcf..860a640b3 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 768ad5c89..85109f81a 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -216,14 +216,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 3eee40297..f21e72cea 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 0afe9456f..a7238c8e3 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index ab765a1e8..321c7ed16 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 1d050e09e..5ba3ef949 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 7e472507c..b3b385146 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 655078514..02bc2e3ed 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 8057685aa..8b15a36e1 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -235,14 +235,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index b1b27e90a..03c1d9fa2 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 5fa1e4aab..5759eafc5 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 042c4925c..d6a0fbf53 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 639d99824..99117722b 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 8b2d893b7..ed34dac69 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index f934bc988..e11968972 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 43c157a0c..08185a695 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 4fdb037ee..e58aaeadd 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index c51b9fdca..511287cec 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 5c3c85003..3fa37ab7c 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index b4eb43e47..e9687185b 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 6662e1697..df8433c43 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 6e1504d58..6c2afd9d8 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 7f050630f..64351a57d 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 8ead957e2..b1d995d86 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 2d3823474..daea24f6e 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index c0af3acd7..646d4c500 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -154,14 +154,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index f8e977a71..683e7430a 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 0b51a5158..13e472b18 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index e74febe89..7507c8017 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 56bb151ce..22ef06024 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index dbcffad87..58345f642 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/build.gradle b/build.gradle index b2cbaed21..54b237152 100644 --- a/build.gradle +++ b/build.gradle @@ -211,11 +211,11 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.30' springCloudVersion ='2021.0.0-SNAPSHOT' - springIntegrationVersion = '5.5.3' + springIntegrationVersion = '5.5.4' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.9' - springSecurityVersion = '5.5.1' + springVersion = '5.3.10' + springSecurityVersion = '5.5.2' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.15.2' tilesJspVersion = '2.2.1' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 8904a98ec..f9e1b08d1 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 6815fac4b..60088d56a 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -206,14 +206,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index be0d9fc68..b46e2e3a6 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -128,14 +128,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index bfc3ee914..1a7b3fbfb 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -276,14 +276,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 3ad6cd644..893047d63 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index a0363d776..dc53396be 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index eb35148b9..aa45f982b 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 06d4643cd..9e2059ebc 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 644e8e816..237d36257 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -224,14 +224,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index b064247fb..5f6e91562 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 7d316599f..a99efb2ae 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 145f93ee5..c3e62a024 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -141,7 +141,7 @@ org.springframework.security spring-security-web - 5.5.1 + 5.5.2 compile @@ -153,7 +153,7 @@ org.springframework.security spring-security-config - 5.5.1 + 5.5.2 compile @@ -266,14 +266,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index cebe9c205..bdad86682 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 6ff60cbd6..004e99509 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 17767af78..e1e4d122a 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 19386b27c..c563f9046 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 45df09705..2e5e68035 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index ecd0c2d89..82aa05219 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index e6873a7e2..90a679aee 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index b1598f1d6..bcd83f301 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 9b8143fe6..845d17f21 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -251,14 +251,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 3d2557f81..9b7c0a62c 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 67b491100..db95e5fb7 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.9 + 5.3.10 import pom org.springframework.integration spring-integration-bom - 5.5.3 + 5.5.4 import pom From c7f05cc9fc4ab489eba5a0f5bd413072ce42b181 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 19 Oct 2021 16:04:16 -0400 Subject: [PATCH 273/356] Upgrade dependencies; fix build for Boot 2.6 --- build.gradle | 42 +++++++++++++++++++----------------------- gradle.properties | 2 +- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index 54b237152..8d3275237 100644 --- a/build.gradle +++ b/build.gradle @@ -202,7 +202,7 @@ subprojects { subproject -> jstlVersion = '1.2' junitVersion = '4.13.2' jythonVersion = '2.7.2' - log4jVersion = '2.14.0' + log4jVersion = '2.14.1' mockitoVersion = '3.11.2' mongoDriverVersion = '4.3.0' openJpaVersion = '2.4.0' @@ -211,11 +211,11 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.30' springCloudVersion ='2021.0.0-SNAPSHOT' - springIntegrationVersion = '5.5.4' + springIntegrationVersion = '5.5.5' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.10' - springSecurityVersion = '5.5.2' + springVersion = '5.3.11' + springSecurityVersion = '5.5.3' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.15.2' tilesJspVersion = '2.2.1' @@ -472,7 +472,7 @@ project('barrier') { } springBoot { - mainClassName = 'org.springframework.integration.samples.barrier.Application' + mainClass = 'org.springframework.integration.samples.barrier.Application' } task run(type: JavaExec) { @@ -599,7 +599,7 @@ project('http') { } springBoot { - mainClassName = 'org.springframework.integration.samples.splunk.Application' + mainClass = 'org.springframework.integration.samples.splunk.Application' } task run(type: JavaExec) { @@ -626,7 +626,7 @@ project('kafka') { } springBoot { - mainClassName = 'org.springframework.integration.samples.kafka.Application' + mainClass = 'org.springframework.integration.samples.kafka.Application' } task run(type: JavaExec) { @@ -649,7 +649,7 @@ project('mqtt') { } springBoot { - mainClassName = 'org.springframework.integration.samples.mqtt.Application' + mainClass = 'org.springframework.integration.samples.mqtt.Application' } task run(type: JavaExec) { @@ -684,7 +684,7 @@ project('si4demo') { } springBoot { - mainClassName = 'org.springframework.integration.samples.si4demo.dsl.Application' + mainClass = 'org.springframework.integration.samples.si4demo.dsl.Application' } tasks.withType(JavaExec) { @@ -706,7 +706,7 @@ project('cafe-dsl') { } springBoot { - mainClassName = 'org.springframework.integration.samples.dsl.cafe.lambda.Application' + mainClass = 'org.springframework.integration.samples.dsl.cafe.lambda.Application' } tasks.withType(JavaExec) { @@ -897,7 +897,7 @@ project('tcp-broadcast') { } springBoot { - mainClassName = 'org.springframework.integration.samples.tcpbroadcast.TcpBroadcastApplication' + mainClass = 'org.springframework.integration.samples.tcpbroadcast.TcpBroadcastApplication' } task run(type: JavaExec) { @@ -927,7 +927,7 @@ project('testcontainers-rabbitmq') { apply plugin: 'org.springframework.boot' springBoot { - mainClassName = 'org.springframework.integration.samples.testcontainersrabbitmq.TestcontainersRabbitmqApplication' + mainClass = 'org.springframework.integration.samples.testcontainersrabbitmq.TestcontainersRabbitmqApplication' } dependencies { @@ -1253,10 +1253,6 @@ project('stored-procedures-oracle') { mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' - repositories { - mavenLocal() //Oracle JDBC Driver - } - dependencies { compile 'org.springframework.integration:spring-integration-jdbc' compile "com.oracle.ojdbc:ojdbc8:$oracleDriverVersion" @@ -1317,7 +1313,7 @@ project('tcp-async-bi-directional') { } springBoot { - mainClassName = 'org.springframework.integration.samples.tcpasyncbi.TcpAsyncBiDirectionalApplication' + mainClass = 'org.springframework.integration.samples.tcpasyncbi.TcpAsyncBiDirectionalApplication' } task run(type: JavaExec) { @@ -1385,7 +1381,7 @@ project('web-sockets') { } springBoot { - mainClassName = 'org.springframework.integration.samples.websocket.standard.server.Application' + mainClass = 'org.springframework.integration.samples.websocket.standard.server.Application' } tasks.withType(JavaExec) { @@ -1408,7 +1404,7 @@ project('stomp-chat') { } springBoot { - mainClassName = 'org.springframework.integration.samples.chat.stomp.server.Application' + mainClass = 'org.springframework.integration.samples.chat.stomp.server.Application' } tasks.withType(JavaExec) { @@ -1430,7 +1426,7 @@ project('kafka-dsl') { } springBoot { - mainClassName = 'org.springframework.integration.samples.dsl.kafka.Application' + mainClass = 'org.springframework.integration.samples.dsl.kafka.Application' } task run(type: JavaExec) { @@ -1463,7 +1459,7 @@ project('file-split-ftp') { } springBoot { - mainClassName = 'org.springframework.integration.samples.filesplit.Application' + mainClass = 'org.springframework.integration.samples.filesplit.Application' } task run(type: JavaExec) { @@ -1485,7 +1481,7 @@ project('dynamic-tcp-client') { } springBoot { - mainClassName = 'org.springframework.integration.samples.dynamictcp.DynamicTcpClientApplication' + mainClass = 'org.springframework.integration.samples.dynamictcp.DynamicTcpClientApplication' } task run(type: JavaExec) { @@ -1508,7 +1504,7 @@ project('tcp-with-headers') { } springBoot { - mainClassName = 'org.springframework.integration.samples.tcpheaders.TcpWithHeadersApplication' + mainClass = 'org.springframework.integration.samples.tcpheaders.TcpWithHeadersApplication' } task run(type: JavaExec) { diff --git a/gradle.properties b/gradle.properties index c6554ac7e..1b4dd5e83 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ version=5.5.0 -springBootVersion=2.5.0-SNAPSHOT +springBootVersion=2.6.0-SNAPSHOT org.gradle.jvmargs=-Xmx1536m From 1e9d2dc71509d944608bac3331d9f85b9dbdbc18 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 16 Nov 2021 16:45:40 -0500 Subject: [PATCH 274/356] Upgrade dependencies --- advanced/advanced-testing-examples/pom.xml | 6 +++--- advanced/dynamic-ftp/pom.xml | 6 +++--- advanced/dynamic-tcp-client/pom.xml | 8 ++++---- applications/cafe-scripted/pom.xml | 6 +++--- applications/cafe/cafe-amqp/pom.xml | 6 +++--- applications/cafe/cafe-jms/pom.xml | 6 +++--- applications/cafe/cafe-si/pom.xml | 6 +++--- applications/file-split-ftp/pom.xml | 8 ++++---- applications/loan-broker/pom.xml | 6 +++--- applications/loanshark/pom.xml | 6 +++--- applications/stomp-chat/pom.xml | 8 ++++---- basic/amqp/pom.xml | 6 +++--- basic/barrier/pom.xml | 8 ++++---- basic/control-bus/pom.xml | 6 +++--- basic/enricher/pom.xml | 6 +++--- basic/feed/pom.xml | 6 +++--- basic/file/pom.xml | 6 +++--- basic/ftp/pom.xml | 6 +++--- basic/helloworld/pom.xml | 6 +++--- basic/http/pom.xml | 6 +++--- basic/jdbc/pom.xml | 6 +++--- basic/jms/pom.xml | 6 +++--- basic/jmx/pom.xml | 6 +++--- basic/jpa/pom.xml | 8 ++++---- basic/kafka/pom.xml | 10 +++++----- basic/mail/pom.xml | 6 +++--- basic/mongodb/pom.xml | 6 +++--- basic/mqtt/pom.xml | 8 ++++---- basic/oddeven/pom.xml | 6 +++--- basic/quote/pom.xml | 6 +++--- basic/sftp/pom.xml | 6 +++--- basic/tcp-amqp/pom.xml | 6 +++--- basic/tcp-broadcast/pom.xml | 8 ++++---- basic/tcp-client-server/pom.xml | 6 +++--- basic/tcp-with-headers/pom.xml | 8 ++++---- basic/testing-examples/pom.xml | 6 +++--- basic/twitter/pom.xml | 6 +++--- basic/web-sockets/pom.xml | 8 ++++---- basic/ws-inbound-gateway/pom.xml | 6 +++--- basic/ws-outbound-gateway/pom.xml | 6 +++--- basic/xml/pom.xml | 6 +++--- basic/xmpp/pom.xml | 6 +++--- build.gradle | 4 ++-- dsl/cafe-dsl/pom.xml | 8 ++++---- dsl/kafka-dsl/pom.xml | 10 +++++----- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 8 ++++---- intermediate/async-gateway/pom.xml | 6 +++--- intermediate/dynamic-poller/pom.xml | 6 +++--- intermediate/errorhandling/pom.xml | 6 +++--- intermediate/file-processing/pom.xml | 6 +++--- intermediate/mail-attachments/pom.xml | 6 +++--- intermediate/monitoring/pom.xml | 6 +++--- intermediate/multipart-http/pom.xml | 6 +++--- intermediate/rest-http/pom.xml | 10 +++++----- intermediate/retry-and-more/pom.xml | 6 +++--- intermediate/splitter-aggregator-reaper/pom.xml | 6 +++--- intermediate/stored-procedures-derby/pom.xml | 6 +++--- intermediate/stored-procedures-ms/pom.xml | 6 +++--- intermediate/stored-procedures-oracle/pom.xml | 6 +++--- intermediate/stored-procedures-postgresql/pom.xml | 6 +++--- intermediate/tcp-async-bi-directional/pom.xml | 8 ++++---- intermediate/tcp-client-server-multiplex/pom.xml | 6 +++--- intermediate/testcontainers-rabbitmq/pom.xml | 8 ++++---- intermediate/travel/pom.xml | 6 +++--- intermediate/tx-synch/pom.xml | 6 +++--- 66 files changed, 215 insertions(+), 215 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index ebd1e4b2c..2e073d385 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index c968be5c6..4a130d01b 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index cecb9919c..38f6a1949 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT org.springframework.integration.samples dynamic-tcp-client @@ -169,7 +169,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT import pom @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 1559adcf6..10a15b36e 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -133,7 +133,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -222,14 +222,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index cebd44a19..1e13b9457 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index a960b7dbc..6257ada86 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -116,7 +116,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 943d3d949..22bbf785e 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 790015b84..02c87d12c 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT org.springframework.integration.samples file-split-ftp @@ -238,7 +238,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT import pom @@ -252,14 +252,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 060ec61b4..37eafdbbc 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 27f2ea9e3..1935b30f7 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -333,7 +333,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 runtime @@ -446,14 +446,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index fcc771a5e..93c13541d 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT org.springframework.integration.samples stomp-chat @@ -191,7 +191,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT import pom @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 860a640b3..4e43f396f 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 85109f81a..da3839ddd 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT org.springframework.integration.samples barrier @@ -202,7 +202,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT import pom @@ -216,14 +216,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index f21e72cea..3f237426f 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index a7238c8e3..6f9a86523 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 321c7ed16..2c83857c1 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 5ba3ef949..46e6a0269 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index b3b385146..d34f04e26 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -167,7 +167,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 test @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 02bc2e3ed..4e80475d5 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 8b15a36e1..7dc1d2b2c 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -146,7 +146,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -235,14 +235,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 03c1d9fa2..e85c4ffc1 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 5759eafc5..c09a4d4b1 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -115,7 +115,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index d6a0fbf53..ae679198c 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 99117722b..8d403b87c 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT org.springframework.integration.samples jpa @@ -204,7 +204,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT import pom @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index ed34dac69..29fd676a9 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT org.springframework.integration.samples kafka @@ -95,7 +95,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -196,7 +196,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT import pom @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index e11968972..46a21c91d 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -111,7 +111,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 08185a695..b41c931ae 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index e58aaeadd..9b812903d 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT org.springframework.integration.samples mqtt @@ -180,7 +180,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT import pom @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 511287cec..8fb76355b 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 3fa37ab7c..8c0941e5e 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index e9687185b..5c9d28f3f 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index df8433c43..e88badba6 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 runtime @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 6c2afd9d8..a80cfb4f8 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT org.springframework.integration.samples tcp-broadcast @@ -180,7 +180,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT import pom @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 64351a57d..9dc95430e 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index b1d995d86..222ae46ab 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT org.springframework.integration.samples tcp-with-headers @@ -180,7 +180,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT import pom @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index daea24f6e..cb8e5211a 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -97,7 +97,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 646d4c500..f6d94789d 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -154,14 +154,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 683e7430a..1052f6fd6 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT org.springframework.integration.samples web-sockets @@ -169,7 +169,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT import pom @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 13e472b18..eda2498b5 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -86,7 +86,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 7507c8017..8fa082bc2 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 22ef06024..0cf92ab8c 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 58345f642..e62f3209c 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/build.gradle b/build.gradle index 8d3275237..a22ecbf49 100644 --- a/build.gradle +++ b/build.gradle @@ -211,10 +211,10 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.30' springCloudVersion ='2021.0.0-SNAPSHOT' - springIntegrationVersion = '5.5.5' + springIntegrationVersion = '5.5.6' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.11' + springVersion = '5.3.13' springSecurityVersion = '5.5.3' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.15.2' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index f9e1b08d1..864754fce 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT org.springframework.integration.samples cafe-dsl @@ -181,7 +181,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT import pom @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 60088d56a..e1abe77e4 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT org.springframework.integration.samples kafka-dsl @@ -91,7 +91,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -192,7 +192,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT import pom @@ -206,14 +206,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index b46e2e3a6..2a5a93eb5 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -128,14 +128,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 1a7b3fbfb..5f972dac6 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT org.springframework.integration.samples si4demo @@ -262,7 +262,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT import pom @@ -276,14 +276,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 893047d63..972ab52a6 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index dc53396be..dda825fc1 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index aa45f982b..816d0e355 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 9e2059ebc..e8352b623 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 237d36257..285da797e 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -123,7 +123,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -224,14 +224,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 5f6e91562..ab64a63e0 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -110,7 +110,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index a99efb2ae..2386d71b4 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -110,7 +110,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index c3e62a024..936d4dd0b 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -141,7 +141,7 @@ org.springframework.security spring-security-web - 5.5.2 + 5.5.3 compile @@ -153,7 +153,7 @@ org.springframework.security spring-security-config - 5.5.2 + 5.5.3 compile @@ -165,7 +165,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -266,14 +266,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index bdad86682..bc880cd31 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -125,7 +125,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 004e99509..f9b26393e 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index e1e4d122a..31146cef6 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index c563f9046..d6ec9d403 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -88,7 +88,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 2e5e68035..5d8f53c3c 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 82aa05219..672b31bce 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -100,7 +100,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 90a679aee..046c4c94e 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT org.springframework.integration.samples tcp-async-bi-directional @@ -169,7 +169,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT import pom @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index bcd83f301..d2383eea9 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 845d17f21..a67876521 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT org.springframework.integration.samples testcontainers-rabbitmq @@ -237,7 +237,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT import pom @@ -251,14 +251,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 9b7c0a62c..e8faeaba4 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -86,7 +86,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index db95e5fb7..6c9a64dd6 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.14.0 + 2.14.1 compile @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.10 + 5.3.13 import pom org.springframework.integration spring-integration-bom - 5.5.4 + 5.5.6 import pom From b143431a14f21cfcf15805acfbe8becf8b8bd855 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 10 Dec 2021 10:28:48 -0500 Subject: [PATCH 275/356] Upgrade to Log4J-2.15.0 --- advanced/advanced-testing-examples/pom.xml | 2 +- advanced/dynamic-ftp/pom.xml | 2 +- applications/cafe-scripted/pom.xml | 2 +- applications/cafe/cafe-amqp/pom.xml | 2 +- applications/cafe/cafe-jms/pom.xml | 2 +- applications/cafe/cafe-si/pom.xml | 2 +- applications/loan-broker/pom.xml | 2 +- applications/loanshark/pom.xml | 2 +- basic/amqp/pom.xml | 2 +- basic/control-bus/pom.xml | 2 +- basic/enricher/pom.xml | 2 +- basic/feed/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/kafka/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 +- build.gradle | 2 +- dsl/kafka-dsl/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/rest-http/pom.xml | 2 +- intermediate/retry-and-more/pom.xml | 2 +- intermediate/splitter-aggregator-reaper/pom.xml | 2 +- intermediate/stored-procedures-derby/pom.xml | 2 +- intermediate/stored-procedures-ms/pom.xml | 2 +- intermediate/stored-procedures-oracle/pom.xml | 2 +- intermediate/stored-procedures-postgresql/pom.xml | 2 +- intermediate/tcp-client-server-multiplex/pom.xml | 2 +- intermediate/travel/pom.xml | 2 +- intermediate/tx-synch/pom.xml | 2 +- 52 files changed, 52 insertions(+), 52 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 2e073d385..26670848c 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 4a130d01b..fe00a7f19 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 10a15b36e..90a25a902 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -133,7 +133,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 1e13b9457..3db694c09 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 6257ada86..495991931 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -116,7 +116,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 22bbf785e..782240ee3 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 37eafdbbc..837c19cb5 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 1935b30f7..7e90a0527 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -333,7 +333,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 runtime diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 4e43f396f..338ad42f2 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 3f237426f..dc680848b 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 6f9a86523..35349cc69 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 2c83857c1..15ce100b7 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 46e6a0269..293b64125 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index d34f04e26..a210bac5e 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -167,7 +167,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 test diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 4e80475d5..d584f9e35 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 7dc1d2b2c..0195d79bf 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -146,7 +146,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index e85c4ffc1..56633be1f 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index c09a4d4b1..9a68a61bf 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -115,7 +115,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index ae679198c..ada3f72a1 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 29fd676a9..47d605b70 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -95,7 +95,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 46a21c91d..b207acf9e 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -111,7 +111,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index b41c931ae..9f8f9f7f2 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 8fb76355b..f73d79687 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 8c0941e5e..c3a2b7951 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 5c9d28f3f..e856334af 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index e88badba6..c1c9d1211 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 runtime diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 9dc95430e..1816552f0 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index cb8e5211a..f6b00fc58 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -97,7 +97,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index f6d94789d..ff09ff8a6 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index eda2498b5..d12b70de2 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -86,7 +86,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 8fa082bc2..e80162f62 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 0cf92ab8c..ddd4471d4 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index e62f3209c..758549a78 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/build.gradle b/build.gradle index a22ecbf49..9623e62d0 100644 --- a/build.gradle +++ b/build.gradle @@ -202,7 +202,7 @@ subprojects { subproject -> jstlVersion = '1.2' junitVersion = '4.13.2' jythonVersion = '2.7.2' - log4jVersion = '2.14.1' + log4jVersion = '2.15.0' mockitoVersion = '3.11.2' mongoDriverVersion = '4.3.0' openJpaVersion = '2.4.0' diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index e1abe77e4..643965eeb 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -91,7 +91,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 972ab52a6..67b969f2b 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index dda825fc1..d1e879238 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 816d0e355..1b516910e 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index e8352b623..71e6412d4 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 285da797e..6fd428106 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -123,7 +123,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index ab64a63e0..62b83ad6f 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -110,7 +110,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 2386d71b4..534e170f9 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -110,7 +110,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 936d4dd0b..8afa8c889 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -165,7 +165,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index bc880cd31..e9ffc31b5 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -125,7 +125,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index f9b26393e..278286480 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 31146cef6..ef92eb3b7 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index d6ec9d403..8d89ac1d9 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -88,7 +88,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 5d8f53c3c..c28292395 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 672b31bce..67099fb2b 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -100,7 +100,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index d2383eea9..fbf7640cb 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index e8faeaba4..8fbfe488e 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -86,7 +86,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 6c9a64dd6..eed786f2b 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.14.1 + 2.15.0 compile From f6d05d9cb9730357d3236db969ab42d5e028c92c Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 14 Dec 2021 16:21:53 -0500 Subject: [PATCH 276/356] Upgrade to Log4j-2.16.0 --- advanced/advanced-testing-examples/pom.xml | 2 +- advanced/dynamic-ftp/pom.xml | 2 +- applications/cafe-scripted/pom.xml | 2 +- applications/cafe/cafe-amqp/pom.xml | 2 +- applications/cafe/cafe-jms/pom.xml | 2 +- applications/cafe/cafe-si/pom.xml | 2 +- applications/loan-broker/pom.xml | 2 +- applications/loanshark/pom.xml | 2 +- basic/amqp/pom.xml | 2 +- basic/control-bus/pom.xml | 2 +- basic/enricher/pom.xml | 2 +- basic/feed/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/kafka/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 +- build.gradle | 2 +- dsl/kafka-dsl/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/rest-http/pom.xml | 2 +- intermediate/retry-and-more/pom.xml | 2 +- intermediate/splitter-aggregator-reaper/pom.xml | 2 +- intermediate/stored-procedures-derby/pom.xml | 2 +- intermediate/stored-procedures-ms/pom.xml | 2 +- intermediate/stored-procedures-oracle/pom.xml | 2 +- intermediate/stored-procedures-postgresql/pom.xml | 2 +- intermediate/tcp-client-server-multiplex/pom.xml | 2 +- intermediate/travel/pom.xml | 2 +- intermediate/tx-synch/pom.xml | 2 +- 52 files changed, 52 insertions(+), 52 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 26670848c..1bbeb5718 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index fe00a7f19..57c2770d7 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 90a25a902..635550efc 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -133,7 +133,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 3db694c09..4b7785373 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 495991931..646619940 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -116,7 +116,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 782240ee3..ba044de30 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 837c19cb5..4938c2921 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 7e90a0527..66511186e 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -333,7 +333,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 runtime diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 338ad42f2..69ba025c7 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index dc680848b..fae48be7a 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 35349cc69..bdf86a008 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 15ce100b7..da7b6eb25 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 293b64125..fb665827f 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index a210bac5e..8ab48d553 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -167,7 +167,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 test diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index d584f9e35..342261860 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 0195d79bf..a72f29286 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -146,7 +146,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 56633be1f..35bfcb8c2 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 9a68a61bf..de72d4615 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -115,7 +115,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index ada3f72a1..a52999831 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 47d605b70..405192e60 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -95,7 +95,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index b207acf9e..cf55062c4 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -111,7 +111,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 9f8f9f7f2..5453f0af8 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index f73d79687..7eaac4087 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index c3a2b7951..dbfceb129 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index e856334af..992224a91 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index c1c9d1211..ec493fea3 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 runtime diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 1816552f0..9e3175c71 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index f6b00fc58..6f934870e 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -97,7 +97,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index ff09ff8a6..0df3e6e81 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index d12b70de2..eaff4954c 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -86,7 +86,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index e80162f62..4e00cf1c2 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index ddd4471d4..61d97d925 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 758549a78..6ead5b5f9 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/build.gradle b/build.gradle index 9623e62d0..a2148d637 100644 --- a/build.gradle +++ b/build.gradle @@ -202,7 +202,7 @@ subprojects { subproject -> jstlVersion = '1.2' junitVersion = '4.13.2' jythonVersion = '2.7.2' - log4jVersion = '2.15.0' + log4jVersion = '2.16.0' mockitoVersion = '3.11.2' mongoDriverVersion = '4.3.0' openJpaVersion = '2.4.0' diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 643965eeb..28ffbc148 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -91,7 +91,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 67b969f2b..e307cbcb1 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index d1e879238..b85acf1ac 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 1b516910e..dfc030456 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 71e6412d4..f8be12a46 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 6fd428106..902029232 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -123,7 +123,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 62b83ad6f..37b98d118 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -110,7 +110,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 534e170f9..8913964c0 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -110,7 +110,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 8afa8c889..a3653e82d 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -165,7 +165,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index e9ffc31b5..48c0286f4 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -125,7 +125,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 278286480..5f943eda9 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index ef92eb3b7..d958b1bd8 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 8d89ac1d9..d4be97087 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -88,7 +88,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index c28292395..1ebfdad58 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 67099fb2b..7e89fd979 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -100,7 +100,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index fbf7640cb..d630e3983 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 8fbfe488e..2a662f144 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -86,7 +86,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index eed786f2b..bc64e1d36 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.15.0 + 2.16.0 compile From 182f91d162a32fe92ddab447d02e43e43588385b Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 21 Dec 2021 17:02:53 -0500 Subject: [PATCH 277/356] Upgrade dependencies --- advanced/advanced-testing-examples/pom.xml | 6 +++--- advanced/dynamic-ftp/pom.xml | 6 +++--- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 6 +++--- applications/cafe/cafe-amqp/pom.xml | 6 +++--- applications/cafe/cafe-jms/pom.xml | 6 +++--- applications/cafe/cafe-si/pom.xml | 6 +++--- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 6 +++--- applications/loanshark/pom.xml | 8 ++++---- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 6 +++--- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 6 +++--- basic/enricher/pom.xml | 6 +++--- basic/feed/pom.xml | 6 +++--- basic/file/pom.xml | 6 +++--- basic/ftp/pom.xml | 6 +++--- basic/helloworld/pom.xml | 6 +++--- basic/http/pom.xml | 6 +++--- basic/jdbc/pom.xml | 6 +++--- basic/jms/pom.xml | 6 +++--- basic/jmx/pom.xml | 6 +++--- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 6 +++--- basic/mail/pom.xml | 6 +++--- basic/mongodb/pom.xml | 6 +++--- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 6 +++--- basic/quote/pom.xml | 6 +++--- basic/sftp/pom.xml | 6 +++--- basic/tcp-amqp/pom.xml | 6 +++--- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 6 +++--- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 6 +++--- basic/twitter/pom.xml | 6 +++--- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 6 +++--- basic/ws-outbound-gateway/pom.xml | 6 +++--- basic/xml/pom.xml | 6 +++--- basic/xmpp/pom.xml | 6 +++--- build.gradle | 12 ++++++------ dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 6 +++--- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 6 +++--- intermediate/dynamic-poller/pom.xml | 6 +++--- intermediate/errorhandling/pom.xml | 6 +++--- intermediate/file-processing/pom.xml | 6 +++--- intermediate/mail-attachments/pom.xml | 6 +++--- intermediate/monitoring/pom.xml | 6 +++--- intermediate/multipart-http/pom.xml | 6 +++--- intermediate/rest-http/pom.xml | 10 +++++----- intermediate/retry-and-more/pom.xml | 6 +++--- intermediate/splitter-aggregator-reaper/pom.xml | 6 +++--- intermediate/stored-procedures-derby/pom.xml | 6 +++--- intermediate/stored-procedures-ms/pom.xml | 6 +++--- intermediate/stored-procedures-oracle/pom.xml | 6 +++--- intermediate/stored-procedures-postgresql/pom.xml | 6 +++--- intermediate/tcp-async-bi-directional/pom.xml | 4 ++-- intermediate/tcp-client-server-multiplex/pom.xml | 6 +++--- intermediate/testcontainers-rabbitmq/pom.xml | 6 +++--- intermediate/travel/pom.xml | 6 +++--- intermediate/tx-synch/pom.xml | 6 +++--- 66 files changed, 191 insertions(+), 191 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 1bbeb5718..d33a83f16 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 57c2770d7..cfa609ea7 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 38f6a1949..355af6784 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 635550efc..0ecc3e520 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -133,7 +133,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -222,14 +222,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 4b7785373..8dc2a74dd 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 646619940..5cc8c603e 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -116,7 +116,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index ba044de30..d6a454605 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 02c87d12c..63498617e 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -252,14 +252,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 4938c2921..138b0d0ed 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 66511186e..b0a7588cf 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -297,7 +297,7 @@ org.hibernate hibernate-entitymanager - 5.5.4.Final + 5.5.9.Final compile @@ -333,7 +333,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 runtime @@ -446,14 +446,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 93c13541d..9da201fa4 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 69ba025c7..65552d194 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index da3839ddd..110d16e92 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -216,14 +216,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index fae48be7a..30e2fcc2b 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index bdf86a008..81f04e026 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index da7b6eb25..0c4a7248a 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index fb665827f..be41d3f72 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 8ab48d553..dda516ea9 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -167,7 +167,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 test @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 342261860..4d76fe739 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index a72f29286..4352acbd5 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -146,7 +146,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -235,14 +235,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 35bfcb8c2..555c59fb7 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index de72d4615..2c8bad0bd 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -115,7 +115,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index a52999831..13198ce36 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 8d403b87c..c48338d82 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 405192e60..6389c2371 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -95,7 +95,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index cf55062c4..d0d67aa39 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -111,7 +111,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 5453f0af8..6f7699e2c 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 9b812903d..d58178c9a 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 7eaac4087..e4536881d 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index dbfceb129..d11943285 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 992224a91..dc40a6f1b 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index ec493fea3..f61f6010d 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 runtime @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index a80cfb4f8..83833ee64 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 9e3175c71..45b6a30bb 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 222ae46ab..0b3e9c7b9 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 6f934870e..a0b6ad474 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -97,7 +97,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 0df3e6e81..ec7ea012e 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -154,14 +154,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 1052f6fd6..03e57c90c 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index eaff4954c..942b51453 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -86,7 +86,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 4e00cf1c2..bec67dcfd 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 61d97d925..1aeeaa1b0 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 6ead5b5f9..2e2736186 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/build.gradle b/build.gradle index a2148d637..be83d5e83 100644 --- a/build.gradle +++ b/build.gradle @@ -181,7 +181,7 @@ subprojects { subproject -> c3p0Version = '0.9.1.2' derbyVersion = '10.14.2.0' hamcrestVersion = '2.2' - hibernateVersion = '5.5.4.Final' + hibernateVersion = '5.5.9.Final' hibernateValidatorVersion = '6.1.2.Final' ftpServerVersion = '1.1.1' flexjsonVersion = '2.0' @@ -202,7 +202,7 @@ subprojects { subproject -> jstlVersion = '1.2' junitVersion = '4.13.2' jythonVersion = '2.7.2' - log4jVersion = '2.16.0' + log4jVersion = '2.17.0' mockitoVersion = '3.11.2' mongoDriverVersion = '4.3.0' openJpaVersion = '2.4.0' @@ -211,13 +211,13 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.30' springCloudVersion ='2021.0.0-SNAPSHOT' - springIntegrationVersion = '5.5.6' + springIntegrationVersion = '5.5.7' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.13' - springSecurityVersion = '5.5.3' + springVersion = '5.3.14' + springSecurityVersion = '5.5.4' springWebFlowVersion = '2.3.3.RELEASE' - testcontainersVersion = '1.15.2' + testcontainersVersion = '1.16.2' tilesJspVersion = '2.2.1' validationApiVersion = '1.0.0.GA' } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 864754fce..5e799a1e2 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 28ffbc148..6a575d3e2 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -91,7 +91,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -206,14 +206,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 2a5a93eb5..e9d496b94 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -128,14 +128,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 5f972dac6..ef1fce76c 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -276,14 +276,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index e307cbcb1..a6deed056 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index b85acf1ac..b29ce729a 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index dfc030456..4642885b8 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index f8be12a46..68e32ae85 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 902029232..2738bde46 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -123,7 +123,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -224,14 +224,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 37b98d118..bdbc27957 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -110,7 +110,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 8913964c0..d42f5be40 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -110,7 +110,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index a3653e82d..671cfa7da 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -141,7 +141,7 @@ org.springframework.security spring-security-web - 5.5.3 + 5.5.4 compile @@ -153,7 +153,7 @@ org.springframework.security spring-security-config - 5.5.3 + 5.5.4 compile @@ -165,7 +165,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -266,14 +266,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 48c0286f4..47d9bf940 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -125,7 +125,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 5f943eda9..91cea85eb 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index d958b1bd8..26a3b86b1 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index d4be97087..cbefa9302 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -88,7 +88,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 1ebfdad58..dc50e5af6 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -76,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 7e89fd979..4fb4a1b62 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -100,7 +100,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 046c4c94e..265691add 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index d630e3983..49a79118c 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -64,7 +64,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index a67876521..5052e0caa 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -183,7 +183,7 @@ org.testcontainers junit-jupiter - 1.15.2 + 1.16.2 test @@ -251,14 +251,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 2a662f144..e7a9089a5 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -86,7 +86,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index bc64e1d36..5c937a495 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -87,7 +87,7 @@ org.apache.logging.log4j log4j-core - 2.16.0 + 2.17.0 compile @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.13 + 5.3.14 import pom org.springframework.integration spring-integration-bom - 5.5.6 + 5.5.7 import pom From 86b543cef7f36cfb277e68056dc72fcf14634e39 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 18 Jan 2022 13:53:56 -0500 Subject: [PATCH 278/356] Upgrade dependencies --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/cafe-amqp/pom.xml | 4 ++-- applications/cafe/cafe-jms/pom.xml | 4 ++-- applications/cafe/cafe-si/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 4 ++-- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 4 ++-- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 4 ++-- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 4 ++-- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- build.gradle | 4 ++-- dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 4 ++-- dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 4 ++-- intermediate/retry-and-more/pom.xml | 4 ++-- intermediate/splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- intermediate/stored-procedures-postgresql/pom.xml | 4 ++-- intermediate/tcp-async-bi-directional/pom.xml | 4 ++-- intermediate/tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/testcontainers-rabbitmq/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 66 files changed, 132 insertions(+), 132 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index d33a83f16..10103a84d 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index cfa609ea7..9f4400ea8 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 355af6784..79c705b1a 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 0ecc3e520..74e0e08cd 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -222,14 +222,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 8dc2a74dd..896d7d04a 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 5cc8c603e..09a9745b2 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index d6a454605..0b1304fe4 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 63498617e..b70f4a6ea 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -252,14 +252,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 138b0d0ed..d15c556cf 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index b0a7588cf..2190cb61e 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -446,14 +446,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 9da201fa4..afc93257c 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -205,14 +205,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 65552d194..2ee84ec7d 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 110d16e92..f5fb15cea 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -216,14 +216,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 30e2fcc2b..6fb582e57 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 81f04e026..326aa2f3c 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 0c4a7248a..e0d63d2c3 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index be41d3f72..543993f6e 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index dda516ea9..94ca65537 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -201,14 +201,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 4d76fe739..0a4a33054 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 4352acbd5..7dd29a5e1 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -235,14 +235,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 555c59fb7..fdfc8a239 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 2c8bad0bd..69f092516 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -204,14 +204,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 13198ce36..b601977e5 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index c48338d82..8afd358f2 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -218,14 +218,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 6389c2371..b8650ba23 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -210,14 +210,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index d0d67aa39..f893c8c2c 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -200,14 +200,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 6f7699e2c..1fcc99d62 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index d58178c9a..0fb4f931a 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index e4536881d..37ea6dca8 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index d11943285..b930e6dde 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index dc40a6f1b..5b5fbf50e 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index f61f6010d..e745ade7c 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -188,14 +188,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 83833ee64..bce43b592 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 45b6a30bb..d863cf2f5 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 0b3e9c7b9..27de0badc 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -194,14 +194,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index a0b6ad474..77f5bedd0 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index ec7ea012e..73fabb873 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -154,14 +154,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 03e57c90c..e9612614f 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 942b51453..1461efb77 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index bec67dcfd..81ff65467 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -164,14 +164,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 1aeeaa1b0..660fd8615 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 2e2736186..ab66ef2fd 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/build.gradle b/build.gradle index be83d5e83..ef352468a 100644 --- a/build.gradle +++ b/build.gradle @@ -211,10 +211,10 @@ subprojects { subproject -> subethasmtpVersion = '1.2' slf4jVersion = '1.7.30' springCloudVersion ='2021.0.0-SNAPSHOT' - springIntegrationVersion = '5.5.7' + springIntegrationVersion = '5.5.8' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.14' + springVersion = '5.3.15' springSecurityVersion = '5.5.4' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.16.2' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 5e799a1e2..5a12a425a 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -195,14 +195,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 6a575d3e2..3af15208d 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -206,14 +206,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index e9d496b94..5c0eac7fa 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -128,14 +128,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index ef1fce76c..ef1d2db6d 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -276,14 +276,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index a6deed056..e60ff43b3 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index b29ce729a..8040048da 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 4642885b8..c4b7d8965 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 68e32ae85..be37ba66d 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 2738bde46..fd29dc18c 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -224,14 +224,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index bdbc27957..acb8b271e 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index d42f5be40..02db71cc6 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -199,14 +199,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 671cfa7da..f934f191d 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -266,14 +266,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 47d9bf940..d2bbdb594 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 91cea85eb..d90448a0b 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 26a3b86b1..9e8716259 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index cbefa9302..387eae4e5 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -177,14 +177,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index dc50e5af6..b721c414c 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 4fb4a1b62..3a9a8a397 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -189,14 +189,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 265691add..143a7c2aa 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -183,14 +183,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 49a79118c..1b45b651d 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 5052e0caa..631943895 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -251,14 +251,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index e7a9089a5..58512798d 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -175,14 +175,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 5c937a495..c93fe16aa 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -176,14 +176,14 @@ org.springframework spring-framework-bom - 5.3.14 + 5.3.15 import pom org.springframework.integration spring-integration-bom - 5.5.7 + 5.5.8 import pom From 361866da58eac96f10373b2b67ed58d3c0e0809c Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 20 Jan 2022 17:10:31 -0500 Subject: [PATCH 279/356] Move main to version 6.0 * Upgrade to the latest dependencies * Migrate samples to `jakarta` namespace * Rework `cafe-scripted` to RSocket instead of already removed RMI * Migrate JMS samples to Apache Artemis for Jakarta EE 9 * Disables mails tests since there is a requirement to migrate to Greenmail for Jakarta EE 9 support * Rework `generatePom` task to a new `maven-publish` plugin style --- advanced/advanced-testing-examples/pom.xml | 143 ++- .../advance/testing/jms/JmsMockTests.java | 15 +- advanced/dynamic-ftp/pom.xml | 125 +-- advanced/dynamic-tcp-client/pom.xml | 158 ++- advanced/pom.xml | 51 - applications/cafe-scripted/README.md | 2 +- applications/cafe-scripted/pom.xml | 167 ++-- .../integration/samples/cafe/Waiter.java | 4 +- .../samples/cafe/WaiterMonitor.java | 8 +- .../samples/cafe/demo/CafeDemoApp.java | 4 +- .../samples/cafe/demo/ControlBusMain.java | 2 +- .../integration/cafeDemo-control-bus.xml | 52 +- .../META-INF/spring/integration/cafeDemo.xml | 160 +-- applications/cafe/cafe-amqp/pom.xml | 133 ++- applications/cafe/cafe-jms/pom.xml | 167 ++-- applications/cafe/cafe-si/pom.xml | 131 +-- applications/cafe/pom.xml | 51 - applications/file-split-ftp/pom.xml | 208 ++-- applications/loan-broker/pom.xml | 125 +-- applications/loanshark/pom.xml | 341 +++---- .../loanshark/domain/LoanShark.java | 19 +- .../loanshark/web/SharkController.java | 4 +- applications/pom.xml | 51 - applications/stomp-chat/pom.xml | 170 ++-- basic/amqp/pom.xml | 137 +-- basic/barrier/pom.xml | 176 ++-- basic/control-bus/pom.xml | 125 +-- basic/enricher/pom.xml | 133 ++- basic/feed/pom.xml | 125 +-- basic/file/pom.xml | 125 +-- basic/ftp/pom.xml | 151 ++- basic/helloworld/pom.xml | 125 +-- basic/http/pom.xml | 197 ++-- basic/jdbc/pom.xml | 133 ++- .../jdbc/src/main/resources/setup-tables.sql | 2 +- basic/jms/pom.xml | 165 ++- .../META-INF/spring/integration/common.xml | 27 +- .../jms/ActiveMQMultiContextTests.java | 81 ++ .../samples/jms/AggregatorDemoTest.java | 12 +- .../samples/jms/ChannelAdapterDemoTest.java | 10 +- .../samples/jms/GatewayDemoTest.java | 11 +- basic/jmx/pom.xml | 131 +-- basic/jpa/pom.xml | 184 ++-- .../samples/jpa/domain/Person.java | 17 +- basic/kafka/pom.xml | 170 ++-- basic/mail/pom.xml | 163 ++- basic/mongodb/pom.xml | 133 ++- basic/mqtt/pom.xml | 164 ++- basic/oddeven/pom.xml | 125 +-- basic/pom.xml | 51 - basic/quote/pom.xml | 125 +-- basic/sftp/pom.xml | 133 ++- basic/splunk/pom.xml | 211 ---- basic/tcp-amqp/pom.xml | 143 +-- basic/tcp-broadcast/pom.xml | 164 ++- basic/tcp-client-server/pom.xml | 142 ++- .../samples/tcpclientserver/CustomOrder.java | 9 +- .../CustomSerializerDeserializer.java | 11 +- basic/tcp-with-headers/pom.xml | 164 ++- basic/testing-examples/pom.xml | 143 +-- basic/twitter/pom.xml | 125 +-- basic/web-sockets/pom.xml | 158 ++- basic/ws-inbound-gateway/pom.xml | 157 +-- basic/ws-outbound-gateway/pom.xml | 131 +-- basic/xml/pom.xml | 125 +-- basic/xmpp/pom.xml | 125 +-- build.gradle | 944 +++++++++--------- dsl/cafe-dsl/pom.xml | 171 ++-- dsl/kafka-dsl/pom.xml | 172 ++-- dsl/pom.xml | 144 --- dsl/si4demo/pom.xml | 222 ++-- gradle.properties | 9 +- gradle/wrapper/gradle-wrapper.properties | 2 +- intermediate/async-gateway/pom.xml | 125 +-- intermediate/dynamic-poller/pom.xml | 125 +-- intermediate/errorhandling/pom.xml | 125 +-- intermediate/file-processing/pom.xml | 125 +-- intermediate/mail-attachments/pom.xml | 177 +--- .../support/EmailParserUtils.java | 55 +- .../support/EmailTransformer.java | 4 +- .../MimeMessageParsingTest.java | 38 +- intermediate/monitoring/pom.xml | 169 ++-- intermediate/multipart-http/pom.xml | 169 ++-- intermediate/pom.xml | 51 - intermediate/rest-http/pom.xml | 209 ++-- intermediate/retry-and-more/pom.xml | 149 ++- .../splitter-aggregator-reaper/pom.xml | 137 +-- .../TestSplitterAggregator.java | 10 +- intermediate/stored-procedures-derby/pom.xml | 131 +-- intermediate/stored-procedures-ms/pom.xml | 141 ++- intermediate/stored-procedures-oracle/pom.xml | 131 +-- .../stored-procedures-postgresql/pom.xml | 151 ++- intermediate/tcp-async-bi-directional/pom.xml | 158 ++- .../tcp-client-server-multiplex/pom.xml | 125 +-- intermediate/testcontainers-rabbitmq/pom.xml | 196 ++-- .../testcontainersrabbitmq/Receiver.java | 4 +- intermediate/travel/pom.xml | 137 +-- intermediate/tx-synch/pom.xml | 139 ++- 98 files changed, 4818 insertions(+), 7057 deletions(-) delete mode 100644 advanced/pom.xml delete mode 100644 applications/cafe/pom.xml delete mode 100644 applications/pom.xml create mode 100644 basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java delete mode 100644 basic/pom.xml delete mode 100644 basic/splunk/pom.xml delete mode 100644 dsl/pom.xml delete mode 100644 intermediate/pom.xml diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 10103a84d..b147d5477 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples advanced-testing-examples - 5.5.0 - Advanced Testing Examples - Advanced Testing Examples - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,144 +47,119 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + - javax.jms - javax.jms-api - 2.0.1 + jakarta.jms + jakarta.jms-api + 3.0.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-jms compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-groovy compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java index 0749e3154..4e5ed368c 100644 --- a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java +++ b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java @@ -18,29 +18,22 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.willAnswer; import static org.mockito.BDDMockito.willReturn; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import java.io.IOException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javax.jms.JMSException; -import javax.jms.TextMessage; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; -import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.beans.factory.annotation.Autowired; @@ -58,6 +51,9 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import jakarta.jms.JMSException; +import jakarta.jms.TextMessage; + /** * @author David Turanski * @author Gunnar Hillert @@ -165,7 +161,7 @@ protected void verifyMessage(Message message) { * @throws InterruptedException */ protected boolean verifyJmsMessageReceivedOnOutputChannel(Object obj, SubscribableChannel expectedOutputChannel, - CountDownHandler handler) throws JMSException, InterruptedException { + CountDownHandler handler) throws InterruptedException { return verifyJmsMessageOnOutputChannel(obj, expectedOutputChannel, handler, 7000); } @@ -184,8 +180,7 @@ protected boolean verifyJmsMessageReceivedOnOutputChannel(Object obj, Subscribab * @throws InterruptedException */ protected boolean verifyJmsMessageOnOutputChannel(Object obj, SubscribableChannel expectedOutputChannel, - CountDownHandler handler, int timeoutMillisec) throws JMSException, - InterruptedException { + CountDownHandler handler, int timeoutMillisec) throws InterruptedException { if (!(obj instanceof String)) { throw new IllegalArgumentException("Only TextMessage is currently supported"); diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 9f4400ea8..e2c72394b 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples dynamic-ftp - 5.5.0 - Dynamic FTP Demo - Dynamic FTP Demo - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,121 +47,108 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-ftp compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 79c705b1a..683c7d0c5 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -1,24 +1,18 @@ - + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.0-SNAPSHOT - org.springframework.integration.samples dynamic-tcp-client - 5.5.0 - Dynamic TCP Client - Dynamic TCP Client - https://projects.spring.io/spring-integration + 6.0.0 + pom + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +31,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -54,146 +48,132 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.boot spring-boot-starter-integration compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-ip compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.boot spring-boot-dependencies - 2.6.0-SNAPSHOT + 3.0.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.8.2 import pom com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.0.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/advanced/pom.xml b/advanced/pom.xml deleted file mode 100644 index 9716a1ee8..000000000 --- a/advanced/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - advanced - 5.5.0 - https://projects.spring.io/spring-integration - - SpringIO - https://spring.io - - - - The Apache Software License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - diff --git a/applications/cafe-scripted/README.md b/applications/cafe-scripted/README.md index 12e518918..ee9fbf438 100644 --- a/applications/cafe-scripted/README.md +++ b/applications/cafe-scripted/README.md @@ -1,7 +1,7 @@ Cafe Demo - Scripted Implementation =================================== -This is the scripted implementation of the classic **cafe** sample application. You can choose among **javascript**, **groovy**, **ruby**, and **python** scripting languages. The functionality is basically identical in all cases to the original cafe demo. +This is the scripted implementation of the classic **cafe** sample application. You can choose among **groovy**, **ruby**, and **python** scripting languages. The functionality is basically identical in all cases to the original cafe demo. # Instructions for running the CafeDemo sample diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 74e0e08cd..e33277bfa 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples cafe-scripted - 5.5.0 - Cafe Sample (Scripted Implementation) - Cafe Sample (Scripted Implementation) - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,190 +47,141 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-stream compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-groovy compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration - spring-integration-rmi + spring-integration-jmx compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration - spring-integration-jmx + spring-integration-rsocket compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.jruby jruby-complete 9.2.14.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.python jython-standalone 2.7.2 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.codehaus.groovy groovy-all - 3.0.8 + 3.0.9 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Waiter.java b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Waiter.java index 507412717..5e26cc6a9 100644 --- a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Waiter.java +++ b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Waiter.java @@ -39,8 +39,8 @@ public Delivery prepareDelivery(List drinks) { } @ManagedOperation - public int getTotalDeliveries() { - return this.totalDeliveries.get(); + public String getTotalDeliveries() { + return this.totalDeliveries.toString(); } } diff --git a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/WaiterMonitor.java b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/WaiterMonitor.java index 01fbfc83a..57b958c08 100644 --- a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/WaiterMonitor.java +++ b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/WaiterMonitor.java @@ -14,9 +14,13 @@ /** * Send a groovy script to the control bus and return the result + * * @author David Turanski - * + * @author Artem Bilan + * */ public interface WaiterMonitor { - Object sendControlScript(String script); + + Integer sendControlScript(String script); + } diff --git a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/CafeDemoApp.java b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/CafeDemoApp.java index 8306cb725..bde7a57ac 100644 --- a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/CafeDemoApp.java +++ b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/CafeDemoApp.java @@ -42,7 +42,7 @@ public class CafeDemoApp { public static void main(String[] args) { - List languages = Arrays.asList(new String[]{"groovy","ruby","javascript","python"}); + List languages = Arrays.asList(new String[]{"groovy","ruby","python"}); if (args.length != 1) { usage(); } @@ -70,7 +70,7 @@ public static void main(String[] args) { private static void usage() { - System.out.println("missing or invalid commannd line argument [groovy,ruby,javascript,python]"); + System.out.println("missing or invalid command line argument [groovy,ruby,python]"); System.exit(1); } } diff --git a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/ControlBusMain.java b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/ControlBusMain.java index a90c4c90c..2b99f291e 100644 --- a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/ControlBusMain.java +++ b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/ControlBusMain.java @@ -48,7 +48,7 @@ public static void main(String[] args) { logger.error("Interrupted", e); } - totalDeliveries = (Integer)waiterMonitor.sendControlScript("waiter.totalDeliveries"); + totalDeliveries = waiterMonitor.sendControlScript("waiter.totalDeliveries"); logger.info("Total cafe deliveries: " + totalDeliveries); diff --git a/applications/cafe-scripted/src/main/resources/META-INF/spring/integration/cafeDemo-control-bus.xml b/applications/cafe-scripted/src/main/resources/META-INF/spring/integration/cafeDemo-control-bus.xml index 627131ab2..9fbe62d93 100644 --- a/applications/cafe-scripted/src/main/resources/META-INF/spring/integration/cafeDemo-control-bus.xml +++ b/applications/cafe-scripted/src/main/resources/META-INF/spring/integration/cafeDemo-control-bus.xml @@ -1,30 +1,32 @@ - - This is the application context for ControlBusMain. It configures a Gateway tied to an RMI outbound gateway to communicate - remotely with the CafeDemoApp. - - - - - - - - - + + This is the application context for ControlBusMain. It configures a Gateway tied to an RMI outbound gateway to + communicate + remotely with the CafeDemoApp. + + + + + + + + + + + + + + diff --git a/applications/cafe-scripted/src/main/resources/META-INF/spring/integration/cafeDemo.xml b/applications/cafe-scripted/src/main/resources/META-INF/spring/integration/cafeDemo.xml index de867c126..0f6db7d25 100644 --- a/applications/cafe-scripted/src/main/resources/META-INF/spring/integration/cafeDemo.xml +++ b/applications/cafe-scripted/src/main/resources/META-INF/spring/integration/cafeDemo.xml @@ -1,83 +1,91 @@ - - - This is the application context for the scripted implementation of CafeDemoApp. The functionality is basically - identical to the original CafeDemoApp. - - In order to demonstrate the Groovy control bus, the original cafe Gateway is replaced with an - inbound-channel-adapter (which supports the SmartLifeCycle interface). - - The inbound-channel-adapter is backed by a Customer bean which provides the orders. - - This configuration also uses Spring 3.1 environment profiles to inject a configuration specific to the - selected scripting language. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + This is the application context for the scripted implementation of CafeDemoApp. The functionality is basically + identical to the original CafeDemoApp. + + In order to demonstrate the Groovy control bus, the original cafe Gateway is replaced with an + inbound-channel-adapter (which supports the SmartLifeCycle interface). + + The inbound-channel-adapter is backed by a Customer bean which provides the orders. + + This configuration also uses Spring 3.1 environment profiles to inject a configuration specific to the + selected scripting language. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 896d7d04a..7bf360ea8 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples cafe-amqp - 5.5.0 - Cafe - With AMQP Message Broker - Cafe - With AMQP Message Broker - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,133 +47,114 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration.samples cafe-si - 5.5.0 + 6.0.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-amqp compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 09a9745b2..a205e81f2 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples cafe-jms - 5.5.0 - Cafe - With JMS Message Broker - Cafe - With JMS Message Broker - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,173 +47,138 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration.samples cafe-si - 5.5.0 + 6.0.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.activemq - activemq-broker - 5.16.2 + artemis-server + 2.20.0 compile - jackson-module-kotlin - com.fasterxml.jackson.module + * + org.jboss.logmanager org.apache.activemq - activemq-kahadb-store - 5.16.2 + artemis-jakarta-client + 2.20.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.springframework - - org.springframework.integration spring-integration-jms compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - javax.jms - javax.jms-api - 2.0.1 + jakarta.jms + jakarta.jms-api + 3.0.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 0b1304fe4..59789955a 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples cafe-si - 5.5.0 - Cafe - Pure Spring Integration - Cafe - Pure Spring Integration - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,132 +47,113 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-stream compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - com.fasterxml.jackson.core jackson-databind compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/applications/cafe/pom.xml b/applications/cafe/pom.xml deleted file mode 100644 index 10d820c05..000000000 --- a/applications/cafe/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - cafe - 5.5.0 - https://projects.spring.io/spring-integration - - SpringIO - https://spring.io - - - - The Apache Software License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index b70f4a6ea..ff2dbf779 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -1,24 +1,18 @@ - + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.0-SNAPSHOT - org.springframework.integration.samples file-split-ftp - 5.5.0 - File Split FTP - File Split FTP - https://projects.spring.io/spring-integration + 6.0.0 + pom + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +31,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -54,215 +48,153 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.boot spring-boot-starter-web compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-integration compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-ftp compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-http compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-mail compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - jakarta.mail - jakarta.mail-api - 1.6.7 - compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - com.sun.mail - imap - 1.6.7 - compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - com.sun.mail jakarta.mail - 1.6.7 + 2.0.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.boot spring-boot-dependencies - 2.6.0-SNAPSHOT + 3.0.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.8.2 import pom com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.0.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index d15c556cf..5810a631d 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples loan-broker - 5.5.0 - Loan Broker Sample - Loan Broker Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,121 +47,108 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-ip compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 2190cb61e..9c3249c2a 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples loanshark - 5.5.0 - Loan Shark Sample - Loan Shark Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,296 +47,186 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-ip compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-webmvc compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-orm compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-aop compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-aspects compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.aspectj aspectjtools - 1.9.7 + 1.9.8.RC3 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-jdbc compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-tx compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-context compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - commons-fileupload commons-fileupload 1.4 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.commons commons-dbcp2 - 2.8.0 + 2.9.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - commons-digester commons-digester - 2.0 + 2.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - commons-pool - commons-pool - 1.5.4 + org.apache.commons + commons-pool2 + 2.11.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.tiles tiles-jsp 2.2.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - joda-time joda-time 1.6 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - javax.transaction - jta - 1.1 + jakarta.transaction + jakarta.transaction-api + 2.0.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.hsqldb hsqldb - 2.6.0 + 2.6.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - net.sf.flexjson flexjson 2.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - javax.validation - validation-api - 1.0.0.GA - compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.hibernate hibernate-validator - 6.1.2.Final + 7.0.2.Final compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.eclipse.persistence - javax.persistence - 2.2.1 + org.eclipse.persistence.jpa + 3.0.2 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.hibernate - hibernate-entitymanager - 5.5.9.Final + hibernate-core-jakarta + 5.6.3.Final compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.webflow spring-js 2.3.3.RELEASE compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.slf4j slf4j-api 1.7.30 compile + + + javax.servlet + javax.servlet-api + 3.1.0 + runtime + + + spring-boot-starter-tomcat + * + + + spring-boot-starter-jetty + * + + + + + javax.websocket + javax.websocket-api + 1.0 + runtime - jackson-module-kotlin - com.fasterxml.jackson.module + spring-boot-starter-tomcat + * + + + spring-boot-starter-jetty + * org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 runtime - jackson-module-kotlin - com.fasterxml.jackson.module + spring-boot-starter-tomcat + * + + + spring-boot-starter-jetty + * @@ -349,8 +237,12 @@ runtime - jackson-module-kotlin - com.fasterxml.jackson.module + spring-boot-starter-tomcat + * + + + spring-boot-starter-jetty + * @@ -361,8 +253,12 @@ runtime - jackson-module-kotlin - com.fasterxml.jackson.module + spring-boot-starter-tomcat + * + + + spring-boot-starter-jetty + * @@ -371,92 +267,87 @@ junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark.java b/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark.java index 769f1c655..759ed7e99 100644 --- a/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark.java +++ b/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/domain/LoanShark.java @@ -19,21 +19,20 @@ import java.util.Collection; import java.util.List; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; -import javax.persistence.Version; - import org.springframework.beans.factory.annotation.Configurable; import org.springframework.transaction.annotation.Transactional; import flexjson.JSONDeserializer; import flexjson.JSONSerializer; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EntityManager; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; +import jakarta.persistence.Version; @Configurable @Entity diff --git a/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController.java b/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController.java index f36fe15aa..e8e3f113d 100644 --- a/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController.java +++ b/applications/loanshark/src/main/java/org/springframework/integration/samples/loanbroker/loanshark/web/SharkController.java @@ -15,8 +15,6 @@ */ package org.springframework.integration.samples.loanbroker.loanshark.web; -import javax.validation.Valid; - import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.http.HttpStatus; @@ -34,6 +32,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import jakarta.validation.Valid; + @RequestMapping("/loansharks") @Controller public class SharkController { diff --git a/applications/pom.xml b/applications/pom.xml deleted file mode 100644 index fe08cf64a..000000000 --- a/applications/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - applications - 5.5.0 - https://projects.spring.io/spring-integration - - SpringIO - https://spring.io - - - - The Apache Software License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index afc93257c..b2074a94c 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -1,24 +1,18 @@ - + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.0-SNAPSHOT - org.springframework.integration.samples stomp-chat - 5.5.0 - Web Sockets Stomp Chat Sample - Web Sockets Stomp Chat Sample - https://projects.spring.io/spring-integration + 6.0.0 + pom + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +31,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -54,168 +48,142 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.boot spring-boot-starter-websocket compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-websocket compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-event compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-groovy compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.boot spring-boot-dependencies - 2.6.0-SNAPSHOT + 3.0.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.8.2 import pom com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.0.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 2ee84ec7d..e73bdf29b 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples amqp - 5.5.0 - AMQP Basic Sample - AMQP Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,144 +47,119 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-stream compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-amqp compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.slf4j slf4j-jcl 1.7.30 runtime - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index f5fb15cea..e73417c5b 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -1,24 +1,18 @@ - + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.0-SNAPSHOT - org.springframework.integration.samples barrier - 5.5.0 - Barrier Sample - Barrier Sample - https://projects.spring.io/spring-integration + 6.0.0 + pom + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +31,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -54,179 +48,147 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.boot spring-boot-starter-web compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-integration compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-amqp compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-amqp compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-http compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.boot spring-boot-dependencies - 2.6.0-SNAPSHOT + 3.0.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.8.2 import pom com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.0.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 6fb582e57..d94213ccc 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples control-bus - 5.5.0 - Control Bus Basic Sample - Control Bus Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,121 +47,108 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-core compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 326aa2f3c..79251d21a 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples enricher - 5.5.0 - Enricher Basic Sample - Enricher Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,133 +47,114 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-core compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - com.h2database h2 - 1.4.200 + 2.1.210 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index e0d63d2c3..92f8fd647 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples feed - 5.5.0 - Feed (RSS/ATOM) Basic Sample - Feed (RSS/ATOM) Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,121 +47,108 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-feed compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 543993f6e..0d8beefdd 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples file - 5.5.0 - File Copy Basic Sample - File Copy Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,121 +47,108 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-file compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 94ca65537..739762d59 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples ftp - 5.5.0 - FTP Basic Sample - FTP Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,169 +47,132 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-ftp compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - commons-io commons-io 2.11.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.ftpserver ftpserver-core - 1.1.1 + 1.1.2 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.slf4j slf4j-api 1.7.30 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.slf4j slf4j-log4j12 1.7.30 runtime - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 0a4a33054..2f4398311 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples helloworld - 5.5.0 - Hello World Sample - Hello World Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,121 +47,108 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-core compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 7dd29a5e1..e54cce16c 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples http - 5.5.0 - HTTP Sample - HTTP Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,109 +47,79 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-http compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-mail compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-webmvc compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - commons-fileupload commons-fileupload 1.4 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - commons-io commons-io 2.11.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - jakarta.mail - jakarta.mail-api - 1.6.7 + com.sun.mail + jakarta.mail + 2.0.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - com.sun.mail - imap - 1.6.7 + org.apache.logging.log4j + log4j-core + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - com.sun.mail - jakarta.mail - 1.6.7 - compile + javax.servlet + javax.servlet-api + 3.1.0 + runtime - jackson-module-kotlin - com.fasterxml.jackson.module + spring-boot-starter-tomcat + * + + + spring-boot-starter-jetty + * - org.apache.logging.log4j - log4j-core - 2.17.0 - compile + javax.websocket + javax.websocket-api + 1.0 + runtime - jackson-module-kotlin - com.fasterxml.jackson.module + spring-boot-starter-tomcat + * + + + spring-boot-starter-jetty + * @@ -160,92 +128,87 @@ junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index fdfc8a239..3a677ee9d 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples jdbc - 5.5.0 - JDBC Basic Sample - JDBC Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,133 +47,114 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-jdbc compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - com.h2database h2 - 1.4.200 + 2.1.210 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/jdbc/src/main/resources/setup-tables.sql b/basic/jdbc/src/main/resources/setup-tables.sql index f837ec3ff..0360c0171 100644 --- a/basic/jdbc/src/main/resources/setup-tables.sql +++ b/basic/jdbc/src/main/resources/setup-tables.sql @@ -1,5 +1,5 @@ create table IF NOT EXISTS USERS(USERNAME varchar(100),PASSWORD varchar(100), EMAIL varchar(100)); -create table IF NOT EXISTS Person(id integer identity primary key , name varchar(100), gender varchar(1), dateOfBirth date); +create table IF NOT EXISTS Person(id int auto_increment primary key , name varchar(100), gender varchar(1), dateOfBirth date); INSERT INTO USERS(USERNAME, PASSWORD, EMAIL) VALUES ('a', 'secret', 'spring-integration@awesome.com'); INSERT INTO USERS(USERNAME, PASSWORD, EMAIL) VALUES ('b', 's3cr3t', 'spring@rocks.com'); INSERT INTO USERS(USERNAME, PASSWORD, EMAIL) VALUES ('foo', 'bar', 'foo@bar.de'); diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 69f092516..0655f283b 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples jms - 5.5.0 - JMS Basic Sample - JMS Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,172 +47,137 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + - javax.jms - javax.jms-api - 2.0.1 + jakarta.jms + jakarta.jms-api + 3.0.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-jms compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-stream compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.activemq - activemq-broker - 5.16.2 + artemis-server + 2.20.0 compile - jackson-module-kotlin - com.fasterxml.jackson.module + * + org.jboss.logmanager org.apache.activemq - activemq-kahadb-store - 5.16.2 + artemis-jakarta-client + 2.20.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.springframework - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/jms/src/main/resources/META-INF/spring/integration/common.xml b/basic/jms/src/main/resources/META-INF/spring/integration/common.xml index 8b6944b4c..8348870a0 100644 --- a/basic/jms/src/main/resources/META-INF/spring/integration/common.xml +++ b/basic/jms/src/main/resources/META-INF/spring/integration/common.xml @@ -1,31 +1,26 @@ + https://www.springframework.org/schema/integration/spring-integration.xsd + http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd"> - - - - - - - - - + - + - + - + diff --git a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java new file mode 100644 index 000000000..40bc9efef --- /dev/null +++ b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java @@ -0,0 +1,81 @@ +/* + * Copyright 2002-2021 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.jms; + +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.TransportConfiguration; +import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; +import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; +import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; +import org.apache.activemq.artemis.core.settings.impl.AddressSettings; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.utils.ObjectInputStreamWithClassLoader; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; + +import org.springframework.jms.connection.CachingConnectionFactory; + +/** + * Keeps an ActiveMQ open for the duration of + * all tests (avoids cycling the transport each time the last + * connection is closed). + * + * @author Gary Russell + * @author Artem Bilan + * + * @since 3.0 + */ +public abstract class ActiveMQMultiContextTests { + + public static final ActiveMQConnectionFactory amqFactory = new ActiveMQConnectionFactory("vm://0"); + + public static final CachingConnectionFactory connectionFactory = new CachingConnectionFactory(amqFactory); + + private static final EmbeddedActiveMQ broker = new EmbeddedActiveMQ(); + + static { + amqFactory.setDeserializationWhiteList(ObjectInputStreamWithClassLoader.CATCH_ALL_WILDCARD); + amqFactory.setRetryInterval(0); + } + + @BeforeAll + public static void startUp() throws Exception { + Configuration configuration = + new ConfigurationImpl() + .setName("embedded-server") + .setPersistenceEnabled(false) + .setSecurityEnabled(false) + .setJMXManagementEnabled(false) + .setJournalDatasync(false) + .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())) + .addAddressesSetting("#", + new AddressSettings() + .setDeadLetterAddress(SimpleString.toSimpleString("dla")) + .setExpiryAddress(SimpleString.toSimpleString("expiry"))); + broker.setConfiguration(configuration).start(); + connectionFactory.setCacheConsumers(false); + } + + @AfterAll + public static void shutDown() throws Exception { + connectionFactory.destroy(); + amqFactory.createConnection().close(); + broker.stop(); + } + +} diff --git a/basic/jms/src/test/java/org/springframework/integration/samples/jms/AggregatorDemoTest.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/AggregatorDemoTest.java index 38f65c35f..752e1c7e9 100644 --- a/basic/jms/src/test/java/org/springframework/integration/samples/jms/AggregatorDemoTest.java +++ b/basic/jms/src/test/java/org/springframework/integration/samples/jms/AggregatorDemoTest.java @@ -19,8 +19,8 @@ import java.util.List; import java.util.Map; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.context.support.GenericXmlApplicationContext; import org.springframework.integration.channel.QueueChannel; @@ -34,7 +34,7 @@ * @author Gary Russell * @author Artem Bilan */ -public class AggregatorDemoTest { +public class AggregatorDemoTest extends ActiveMQMultiContextTests { private final static String[] configFilesGatewayDemo = { "/META-INF/spring/integration/common.xml", @@ -42,7 +42,7 @@ public class AggregatorDemoTest { }; @Test - public void testGatewayDemo() throws InterruptedException { + public void testGatewayDemo() { System.setProperty("spring.profiles.active", "testCase"); @@ -74,10 +74,10 @@ public void testGatewayDemo() throws InterruptedException { @SuppressWarnings("unchecked") Message> reply = (Message>) queueChannel.receive(20_000); - Assert.assertNotNull(reply); + Assertions.assertNotNull(reply); List out = reply.getPayload(); - Assert.assertEquals("[JMS TEST, JMS TEST]", out.toString()); + Assertions.assertEquals("[JMS TEST, JMS TEST]", out.toString()); applicationContext.close(); } diff --git a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java index 00b609d59..919fd4aa1 100644 --- a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java +++ b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ChannelAdapterDemoTest.java @@ -16,8 +16,8 @@ package org.springframework.integration.samples.jms; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.context.support.GenericXmlApplicationContext; import org.springframework.messaging.Message; @@ -28,7 +28,7 @@ /** * @author Gunnar Hillert */ -public class ChannelAdapterDemoTest { +public class ChannelAdapterDemoTest extends ActiveMQMultiContextTests { private final static String[] configFilesChannelAdapterDemo = { "/META-INF/spring/integration/common.xml", @@ -51,9 +51,9 @@ public void testChannelAdapterDemo() throws InterruptedException { @SuppressWarnings("unchecked") Message reply = (Message) queueChannel.receive(20000); - Assert.assertNotNull(reply); + Assertions.assertNotNull(reply); String out = reply.getPayload(); - Assert.assertEquals("jms test", out); + Assertions.assertEquals("jms test", out); applicationContext.close(); } diff --git a/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java index a3a13eaf9..b8ed1f7c4 100644 --- a/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java +++ b/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java @@ -17,7 +17,8 @@ package org.springframework.integration.samples.jms; import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.context.support.GenericXmlApplicationContext; import org.springframework.messaging.Message; @@ -28,7 +29,7 @@ /** * @author Gunnar Hillert */ -public class GatewayDemoTest { +public class GatewayDemoTest extends ActiveMQMultiContextTests { private final static String[] configFilesGatewayDemo = { "/META-INF/spring/integration/common.xml", @@ -37,7 +38,7 @@ public class GatewayDemoTest { }; @Test - public void testGatewayDemo() throws InterruptedException { + public void testGatewayDemo() { System.setProperty("spring.profiles.active", "testCase"); @@ -51,10 +52,10 @@ public void testGatewayDemo() throws InterruptedException { @SuppressWarnings("unchecked") Message reply = (Message) queueChannel.receive(20000); - Assert.assertNotNull(reply); + Assertions.assertNotNull(reply); String out = reply.getPayload(); - Assert.assertEquals("JMS response: JMS TEST", out); + Assertions.assertEquals("JMS response: JMS TEST", out); applicationContext.close(); } diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index b601977e5..db28f9a69 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples jmx - 5.5.0 - JMX Basic Sample - JMX Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,132 +47,113 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-jmx compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-stream compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 8afd358f2..e0731b208 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -1,24 +1,18 @@ - + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.0-SNAPSHOT - org.springframework.integration.samples jpa - 5.5.0 - JPA Basic Sample - JPA Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + pom + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +31,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -54,181 +48,149 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.boot spring-boot-starter-data-jpa compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-jpa compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - com.h2database h2 - 1.4.200 + 2.1.210 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-instrument runtime - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - 1.0.0.Final + org.eclipse.persistence + org.eclipse.persistence.jpa + 3.0.2 runtime - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.boot spring-boot-dependencies - 2.6.0-SNAPSHOT + 3.0.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.8.2 import pom com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.0.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/domain/Person.java b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/domain/Person.java index 97880777b..36b09a969 100644 --- a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/domain/Person.java +++ b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/domain/Person.java @@ -18,17 +18,18 @@ import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; /** * A simple POJO representing a Person. + * * @author Amol Nayak * @author Gunnar Hillert * @author Artem Bilan diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index b8650ba23..25c439d41 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -1,24 +1,18 @@ - + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.0-SNAPSHOT - org.springframework.integration.samples kafka - 5.5.0 - Apache Kafka Sample - Apache Kafka Sample - https://projects.spring.io/spring-integration + 6.0.0 + pom + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +31,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -54,17 +48,15 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.boot spring-boot-starter-integration compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration @@ -75,152 +67,130 @@ * org.slf4j - - jackson-module-kotlin - com.fasterxml.jackson.module - org.springframework.integration spring-integration-core compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.boot spring-boot-dependencies - 2.6.0-SNAPSHOT + 3.0.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.8.2 import pom com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.0.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index f893c8c2c..c04e114ab 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples mail - 5.5.0 - Mail (IMAP + POP3) Sample - Mail (IMAP + POP3) Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,168 +47,119 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-mail compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-context compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - jakarta.mail - jakarta.mail-api - 1.6.7 - compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - com.sun.mail - imap - 1.6.7 - compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - com.sun.mail jakarta.mail - 1.6.7 + 2.0.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 1fcc99d62..62cf2e2df 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples mongodb - 5.5.0 - MongoDb Basic Sample - MongoDb Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,133 +47,114 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-mongodb compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mongodb mongodb-driver-sync - 4.3.0 + 4.4.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 0fb4f931a..1be66c496 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -1,24 +1,18 @@ - + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.0-SNAPSHOT - org.springframework.integration.samples mqtt - 5.5.0 - MQTT Basic Sample - MQTT Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + pom + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +31,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -54,157 +48,137 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.boot spring-boot-starter-integration compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-stream compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-mqtt compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.boot spring-boot-dependencies - 2.6.0-SNAPSHOT + 3.0.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.8.2 import pom com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.0.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 37ea6dca8..a32800157 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples oddeven - 5.5.0 - Odd-Even Sample - Odd-Even Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,121 +47,108 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-core compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/pom.xml b/basic/pom.xml deleted file mode 100644 index f2a78bf76..000000000 --- a/basic/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - basic - 5.5.0 - https://projects.spring.io/spring-integration - - SpringIO - https://spring.io - - - - The Apache Software License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index b930e6dde..12ef7f1a4 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples quote - 5.5.0 - Quote Sample - Quote Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,121 +47,108 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-stream compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 5b5fbf50e..8c07039de 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples sftp - 5.5.0 - SFTP Basic Sample - SFTP Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,133 +47,114 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-sftp compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.sshd sshd-sftp - 2.7.0 + 2.8.0 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml deleted file mode 100644 index 5febdf614..000000000 --- a/basic/splunk/pom.xml +++ /dev/null @@ -1,211 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.4.0-SNAPSHOT - - org.springframework.integration.samples - splunk - 5.4.0 - Splunk Sample - Splunk Sample - https://projects.spring.io/spring-integration - - SpringIO - https://spring.io - - - - The Apache Software License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - - org.springframework.boot - spring-boot-starter-integration - compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - org.springframework.integration - spring-integration-core - compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - org.springframework.integration - spring-integration-splunk - 1.2.0.BUILD-SNAPSHOT - compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - junit - junit - 4.13.1 - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - - - - org.hamcrest - hamcrest-library - 2.2 - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - org.mockito - mockito-core - 3.4.6 - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - - - - org.springframework.integration - spring-integration-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - org.springframework.boot - spring-boot-starter-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - - org.springframework.boot - spring-boot-dependencies - 2.4.0-SNAPSHOT - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.11.1 - import - pom - - - org.springframework - spring-framework-bom - 5.3.3 - import - pom - - - org.springframework.integration - spring-integration-bom - 5.5.0-M1 - import - pom - - - - diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index e745ade7c..b6e112e76 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples tcp-amqp - 5.5.0 - TCP-AMQP Basic Sample - TCP-AMQP Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,156 +47,125 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-amqp compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-ip compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.slf4j slf4j-api 1.7.30 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 runtime - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.slf4j slf4j-log4j12 1.7.30 runtime - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index bce43b592..3bedf993b 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -1,24 +1,18 @@ - + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.0-SNAPSHOT - org.springframework.integration.samples tcp-broadcast - 5.5.0 - TCP Client Broadcast Sample - TCP Client Broadcast Sample - https://projects.spring.io/spring-integration + 6.0.0 + pom + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +31,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -54,157 +48,137 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.boot spring-boot-starter-web compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-integration compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-ip compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.boot spring-boot-dependencies - 2.6.0-SNAPSHOT + 3.0.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.8.2 import pom com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.0.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index d863cf2f5..98ac6a76e 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples tcp-client-server - 5.5.0 - TCP Client Server Sample - TCP Client Server Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,133 +47,119 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-ip compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - commons-lang - commons-lang - 2.6 + org.apache.commons + commons-lang3 + 3.12.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-test compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomOrder.java b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomOrder.java index d3978c3f6..b2ad37471 100644 --- a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomOrder.java +++ b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomOrder.java @@ -13,18 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.tcpclientserver; -import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * @author Christian Posta * @author Gunnar Hillert */ public class CustomOrder { + private int number; + private String sender; + private String message; public CustomOrder(int number, String sender) { @@ -52,4 +56,5 @@ public void setMessage(String message) { public String toString() { return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE); } + } diff --git a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomSerializerDeserializer.java b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomSerializerDeserializer.java index 87a4bdbea..df6d134a2 100644 --- a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomSerializerDeserializer.java +++ b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomSerializerDeserializer.java @@ -13,15 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.tcpclientserver; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.core.serializer.Deserializer; import org.springframework.core.serializer.Serializer; @@ -49,12 +51,14 @@ * @author Christian Posta * @author Gunnar Hillert */ -public class CustomSerializerDeserializer implements Serializer, Deserializer{ +public class CustomSerializerDeserializer implements Serializer, Deserializer { protected final Log logger = LogFactory.getLog(this.getClass()); private static final int ORDER_NUMBER_LENGTH = 3; + private static final int SENDER_NAME_LENGTH = 10; + private static final int MESSAGE_LENGTH_LENGTH = 6; /** @@ -115,7 +119,7 @@ private String parseString(InputStream inputStream, int length) throws IOExcepti for (int i = 0; i < length; ++i) { c = inputStream.read(); checkClosure(c); - builder.append((char)c); + builder.append((char) c); } return builder.toString(); @@ -145,4 +149,5 @@ protected void checkClosure(int bite) throws IOException { throw new IOException("Socket closed during message assembly"); } } + } diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 27de0badc..5e2f6596f 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -1,24 +1,18 @@ - + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.0-SNAPSHOT - org.springframework.integration.samples tcp-with-headers - 5.5.0 - TCP Send/Receive with headers - TCP Send/Receive with headers - https://projects.spring.io/spring-integration + 6.0.0 + pom + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +31,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -54,157 +48,137 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.boot spring-boot-starter-integration compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-ip compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - com.fasterxml.jackson.core jackson-databind compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.boot spring-boot-dependencies - 2.6.0-SNAPSHOT + 3.0.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.8.2 import pom com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.0.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 77f5bedd0..4d602ad31 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples testing-examples - 5.5.0 - Testing Examples - Testing Examples - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,154 +47,123 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-file compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-http compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-ws compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-webmvc compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 73fabb873..55db0db7b 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples twitter - 5.5.0 - Twitter Basic Sample - Twitter Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,122 +47,109 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-social-twitter 1.0.1.BUILD-SNAPSHOT compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index e9612614f..fa514d1da 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -1,24 +1,18 @@ - + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.0-SNAPSHOT - org.springframework.integration.samples web-sockets - 5.5.0 - Web Sockets Basic Sample - Web Sockets Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + pom + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +31,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -54,146 +48,132 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.boot spring-boot-starter-websocket compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-websocket compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.boot spring-boot-dependencies - 2.6.0-SNAPSHOT + 3.0.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.8.2 import pom com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.0.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 1461efb77..d1ccfc583 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples ws-inbound-gateway - 5.5.0 - WS Inbound Gateway Sample - WS Inbound Gateway Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,143 +47,150 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-xml compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-ws compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-webmvc compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile + + + javax.servlet + javax.servlet-api + 3.1.0 + runtime - jackson-module-kotlin - com.fasterxml.jackson.module + spring-boot-starter-tomcat + * + + + spring-boot-starter-jetty + * - junit - junit - 4.13.2 - test + javax.websocket + javax.websocket-api + 1.0 + runtime - jackson-module-kotlin - com.fasterxml.jackson.module + spring-boot-starter-tomcat + * - * - org.hamcrest + spring-boot-starter-jetty + * + + junit + junit + 4.13.2 + test + org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 81ff65467..d64f27e17 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples ws-outbound-gateway - 5.5.0 - WS Outbound Gateway Sample - WS Outbound Gateway Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,132 +47,113 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-stream compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-ws compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 660fd8615..d95c16e9e 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples xml - 5.5.0 - XML Sample - XML Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,121 +47,108 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-xml compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index ab66ef2fd..fa0aa1522 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples xmpp - 5.5.0 - XMPP Basic Sample - XMPP Basic Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,121 +47,108 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-xmpp compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/build.gradle b/build.gradle index ef352468a..75de3ee5c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,10 @@ buildscript { repositories { mavenCentral() - maven { url 'https://plugins.gradle.org/m2' } - maven { url 'https://repo.spring.io/libs-snapshot' } + gradlePluginPortal() + maven { url 'https://repo.spring.io/plugins-release-local' } + maven { url 'https://repo.spring.io/milestone' } + maven { url 'https://repo.spring.io/snapshot' } } dependencies { classpath 'io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE' @@ -45,181 +47,227 @@ subprojects { subproject -> apply plugin: 'eclipse' apply plugin: 'idea' - apply plugin: 'maven' - - task generatePom { - doLast { - pom { - project { - name = project.description - description = project.description - url = linkHomepage - - organization { - name = 'SpringIO' - url = 'https://spring.io' - } - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'https://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } - } + eclipse { + project { + natures += 'org.springframework.ide.eclipse.core.springnature' + } + } - scm { - url = linkScmUrl - connection = 'scm:git:' + linkScmConnection - developerConnection = 'scm:git:' + linkScmDevConnection - } + if (!(subproject.name in ['advanced', 'applications', 'basic', 'intermediate', 'dsl', 'cafe'])) { + + apply plugin: 'java-library' + apply plugin: 'jacoco' + apply plugin: 'io.spring.dependency-management' + apply plugin: 'maven-publish' - developers { - developer { - id = 'artembilan' - name = 'Artem Bilan' - email = 'abilan@vmware.com' - roles = ['project lead'] + tasks.withType(GenerateModuleMetadata) { + enabled = false + } + + model { + tasks.generatePomFileForMavenJavaPublication { + destination = file('pom.xml') + } + } + + task generatePom(dependsOn: 'generatePomFileForMavenJavaPublication') + + publishing { + publications { + mavenJava(MavenPublication) { + suppressAllPomMetadataWarnings() + from components.java + pom { + name = project.description + description = project.description + url = linkScmUrl + organization { + name = 'Spring IO' + url = 'https://spring.io/projects/spring-integration' } - developer { - id = 'garyrussell' - name = 'Gary Russell' - email = 'grussell@vmware.com' - roles = ['lead emeritus'] + licenses { + license { + name = 'Apache License, Version 2.0' + url = 'https://www.apache.org/licenses/LICENSE-2.0.txt' + distribution = 'repo' + } } - developer { - id = 'markfisher' - name = 'Mark Fisher' - email = 'markfisher@vmware.com' - roles = ['project founder and lead emeritus'] + scm { + url = linkScmUrl + connection = 'scm:git:' + linkScmConnection + developerConnection = 'scm:git:' + linkScmDevConnection } - } - - if (subproject.plugins.hasPlugin('java')) { - repositories { - repository { - id = 'repo.spring.io.milestone' - name = 'Spring Framework Maven Milestone Repository' - url = 'https://repo.spring.io/libs-milestone' + developers { + developer { + id = 'artembilan' + name = 'Artem Bilan' + email = 'abilan@vmware.com' + roles = ['project lead'] + } + developer { + id = 'garyrussell' + name = 'Gary Russell' + email = 'grussell@vmware.com' + roles = ['project lead emeritus'] } - repository { - id = 'repo.spring.io.snapshot' - name = 'Spring Framework Maven Snapshot Repository' - url = 'https://repo.spring.io/libs-snapshot' + developer { + id = 'markfisher' + name = 'Mark Fisher' + email = 'markfisher@vmware.com' + roles = ['project founder and lead emeritus'] } } - } - - if (subproject.plugins.hasPlugin('org.springframework.boot')) { - parent { - groupId = 'org.springframework.boot' - artifactId = 'spring-boot-starter-parent' - version = springBootVersion + issueManagement { + system = 'GitHub' + url = linkIssue } - } - }.withXml { - if (subproject.plugins.hasPlugin('org.akhikhl.gretty')) { - asNode().appendNode('packaging', 'war') - asNode().appendNode('build') - .appendNode('plugins') - .appendNode('plugin').with { - appendNode('groupId', 'org.mortbay.jetty') - appendNode('artifactId', 'jetty-maven-plugin') - appendNode('version', '8.1.14.v20131031') - appendNode('configuration') - .appendNode('webAppConfig') - .appendNode('contextPath', '/' + subproject.name) - } - } - if (subproject.plugins.hasPlugin('org.springframework.boot')) { - asNode().appendNode('build').appendNode('plugins') - .appendNode('plugin').with { - appendNode('groupId', 'org.springframework.boot') - appendNode('artifactId', 'spring-boot-maven-plugin') + withXml { + if (subproject.plugins.hasPlugin('org.akhikhl.gretty')) { + asNode().appendNode('packaging', 'war') + def plugins = asNode().build?.find()?.plugins?.find() + if (!plugins) { + plugins = asNode().appendNode('build').appendNode('plugins') + } + plugins.appendNode('plugin') + .with { + appendNode('groupId', 'org.mortbay.jetty') + appendNode('artifactId', 'jetty-maven-plugin') + appendNode('version', '8.1.14.v20131031') + appendNode('configuration') + .appendNode('webAppConfig') + .appendNode('contextPath', '/' + subproject.name) + } + } + if (subproject.plugins.hasPlugin('org.springframework.boot')) { + def plugins = asNode().build?.find()?.plugins?.find() + if (!plugins) { + plugins = asNode().appendNode('build').appendNode('plugins') + } + plugins.appendNode('plugin') + .with { + appendNode('groupId', 'org.springframework.boot') + appendNode('artifactId', 'spring-boot-maven-plugin') + } + } + if (subproject.plugins.hasPlugin('org.springframework.boot')) { + asNode().appendNode('parent').with { + appendNode('groupId', 'org.springframework.boot') + appendNode('artifactId', 'spring-boot-starter-parent') + appendNode('version', property('springBootVersion')) + } + } + + if (subproject.plugins.hasPlugin('java-library')) { + def repositories = asNode().appendNode('repositories') + repositories.appendNode('repository') + .with { + appendNode('id', 'repo.spring.io.milestone') + appendNode('name', 'Spring Framework Maven Milestone Repository') + appendNode('url', 'https://repo.spring.io/milestone') + } + repositories.appendNode('repository') + .with { + appendNode('id', 'repo.spring.io.snapshot') + appendNode('name', 'Spring Framework Maven Snapshot Repository') + appendNode('url', 'https://repo.spring.io/snapshot') + } + } + + def pomDeps = asNode().dependencies.find() + if (!pomDeps) { + pomDeps = asNode().appendNode('dependencies') + } + subproject.configurations.testImplementation.dependencies.each { dep -> + pomDeps.appendNode('dependency').with { + appendNode('groupId', dep.group) + appendNode('artifactId', dep.name) + if (dep.version) { + appendNode('version', dep.version) + } + appendNode('scope', 'test') + } + } + subproject.configurations.testRuntimeOnly.dependencies.each { dep -> + pomDeps.appendNode('dependency').with { + appendNode('groupId', dep.group) + appendNode('artifactId', dep.name) + if (dep.version) { + appendNode('version', dep.version) + } + appendNode('scope', 'runtime') + } + } } } - if (subproject.plugins.hasPlugin('io.spring.dependency-management')) { - dependencyManagement.pomConfigurer.configurePom(asNode()) - } - }.writeTo('pom.xml') + } } - - } - } - - eclipse { - project { - natures += 'org.springframework.ide.eclipse.core.springnature' } - } - - if (!(subproject.name in ['advanced', 'applications', 'basic', 'intermediate', 'cafe'])) { - - apply plugin: 'java' - apply plugin: 'jacoco' - apply plugin: 'io.spring.dependency-management' jacoco { - toolVersion = "0.8.6" + toolVersion = '0.8.7' } compileJava { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + compileTestJava { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + options.encoding = 'UTF-8' } ext { - activeMqVersion = '5.16.2' - apacheSshdVersion = '2.7.0' - aspectjVersion = '1.9.7' - commonsDigesterVersion = '2.0' - commonsDbcpVersion = '2.8.0' + apacheSshdVersion = '2.8.0' + artemisVersion = '2.20.0' + aspectjVersion = '1.9.8.RC3' + commonsDigesterVersion = '2.1' + commonsDbcpVersion = '2.9.0' commonsFileUploadVersion = '1.4' commonsIoVersion = '2.11.0' - commonsLangVersion = '2.6' - commonsPoolVersion = '1.5.4' - c3p0Version = '0.9.1.2' + commonsLangVersion = '3.12.0' + commonsPoolVersion = '2.11.1' + c3p0Version = '0.9.5.5' derbyVersion = '10.14.2.0' hamcrestVersion = '2.2' - hibernateVersion = '5.5.9.Final' - hibernateValidatorVersion = '6.1.2.Final' - ftpServerVersion = '1.1.1' + hibernateVersion = '5.6.3.Final' + hibernateValidatorVersion = '7.0.2.Final' + ftpServerVersion = '1.1.2' flexjsonVersion = '2.0' - groovyVersion = '3.0.8' - hsqldbVersion = '2.6.0' - h2Version = '1.4.200' - jacksonVersion = '2.12.1' - javaxInjectVersion = '1' - javaxMailVersion = '1.6.7' + groovyVersion = '3.0.9' + hsqldbVersion = '2.6.1' + h2Version = '2.1.210' + jacksonVersion = '2.13.1' + mailVersion = '2.0.1' jaxbVersion = '2.3.3' jodaTimeVersion = '1.6' - jtaVersion = '1.1' + jtaVersion = '2.0.0' jtdsVersion = '1.2.6' - jmsApiVersion = '2.0.1' + jmsApiVersion = '3.0.0' jrubyVersion = '9.2.14.0' - jpa21ApiVersion = '1.0.0.Final' - jpaApiVersion = '2.2.1' + jpaApiVersion = '3.0.2' jstlVersion = '1.2' junitVersion = '4.13.2' + junitJupiterVersion = '5.8.2' jythonVersion = '2.7.2' - log4jVersion = '2.17.0' - mockitoVersion = '3.11.2' - mongoDriverVersion = '4.3.0' + log4jVersion = '2.17.1' + mockitoVersion = '4.2.0' + mongoDriverVersion = '4.4.1' openJpaVersion = '2.4.0' oracleDriverVersion = '19.3.0.0' postgresVersion = '42.2.14' - subethasmtpVersion = '1.2' slf4jVersion = '1.7.30' - springCloudVersion ='2021.0.0-SNAPSHOT' - springIntegrationVersion = '5.5.8' + springCloudVersion = '2022.0.0-SNAPSHOT' + springIntegrationVersion = '6.0.0-M1' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '5.3.15' - springSecurityVersion = '5.5.4' + springVersion = '6.0.0-M2' + springSecurityVersion = '6.0.0-M1' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.16.2' tilesJspVersion = '2.2.1' - validationApiVersion = '1.0.0.GA' } sourceSets.each { @@ -231,23 +279,25 @@ subprojects { subproject -> mavenBom "org.springframework.integration:spring-integration-bom:$springIntegrationVersion" mavenBom "org.springframework:spring-framework-bom:$springVersion" mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonVersion" + mavenBom "org.junit:junit-bom:$junitJupiterVersion" } } // dependencies that are common across all java projects dependencies { - testCompile("junit:junit:$junitVersion") { + testImplementation("junit:junit:$junitVersion") { exclude group: 'org.hamcrest' } - testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion" - testCompile("org.mockito:mockito-core:$mockitoVersion") { + testImplementation "org.hamcrest:hamcrest-library:$hamcrestVersion" + testImplementation("org.mockito:mockito-core:$mockitoVersion") { exclude group: 'org.hamcrest' } - testCompile 'org.springframework.integration:spring-integration-test' - } - - configurations { - all*.exclude group: 'com.fasterxml.jackson.module', module: 'jackson-module-kotlin' + testImplementation 'org.junit.jupiter:junit-jupiter-api' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + // To support JUnit 4 tests + testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + testImplementation 'org.springframework.integration:spring-integration-test' } // enable all compiler warnings; individual projects may customize further @@ -286,10 +336,10 @@ project('advanced-testing-examples') { description = 'Advanced Testing Examples' dependencies { - compile "javax.jms:javax.jms-api:$jmsApiVersion" - compile 'org.springframework.integration:spring-integration-jms' - compile 'org.springframework.integration:spring-integration-groovy' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api "jakarta.jms:jakarta.jms-api:$jmsApiVersion" + api 'org.springframework.integration:spring-integration-jms' + api 'org.springframework.integration:spring-integration-groovy' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -297,8 +347,8 @@ project('dynamic-ftp') { description = 'Dynamic FTP Demo' dependencies { - compile 'org.springframework.integration:spring-integration-ftp' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-ftp' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -310,9 +360,9 @@ project('cafe-si') { mainClassName = 'org.springframework.integration.samples.cafe.xml.CafeDemoApp' dependencies { - compile 'org.springframework.integration:spring-integration-stream' - compile 'com.fasterxml.jackson.core:jackson-databind' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-stream' + api 'com.fasterxml.jackson.core:jackson-databind' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -320,9 +370,9 @@ project('cafe-amqp') { description = 'Cafe - With AMQP Message Broker' dependencies { - compile project(':cafe-si') - compile 'org.springframework.integration:spring-integration-amqp' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api project(':cafe-si') + api 'org.springframework.integration:spring-integration-amqp' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -330,14 +380,14 @@ project('cafe-jms') { description = 'Cafe - With JMS Message Broker' dependencies { - compile project(':cafe-si') - compile "org.apache.activemq:activemq-broker:$activeMqVersion" - compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { - exclude group: "org.springframework" + api project(':cafe-si') + api("org.apache.activemq:artemis-server:$artemisVersion") { + exclude group: 'org.jboss.logmanager' } - compile 'org.springframework.integration:spring-integration-jms' - compile "javax.jms:javax.jms-api:$jmsApiVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api "org.apache.activemq:artemis-jakarta-client:$artemisVersion" + api 'org.springframework.integration:spring-integration-jms' + api "jakarta.jms:jakarta.jms-api:$jmsApiVersion" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -345,14 +395,14 @@ project('cafe-scripted') { description = 'Cafe Sample (Scripted Implementation)' dependencies { - compile 'org.springframework.integration:spring-integration-stream' - compile 'org.springframework.integration:spring-integration-groovy' - compile 'org.springframework.integration:spring-integration-rmi' - compile 'org.springframework.integration:spring-integration-jmx' - compile "org.jruby:jruby-complete:$jrubyVersion" - compile "org.python:jython-standalone:$jythonVersion" - compile "org.codehaus.groovy:groovy-all:$groovyVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-stream' + api 'org.springframework.integration:spring-integration-groovy' + api 'org.springframework.integration:spring-integration-jmx' + api 'org.springframework.integration:spring-integration-rsocket' + api "org.jruby:jruby-complete:$jrubyVersion" + api "org.python:jython-standalone:$jythonVersion" + api "org.codehaus.groovy:groovy-all:$groovyVersion" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } task runCafeDemoApp(type: JavaExec) { @@ -375,8 +425,8 @@ project('loan-broker') { mainClassName = 'org.springframework.integration.samples.loanbroker.demo.LoanBrokerDemo' dependencies { - compile 'org.springframework.integration:spring-integration-ip' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-ip' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } task runLoanBrokerSharkDetectorDemo(type: JavaExec) { @@ -394,34 +444,33 @@ project('loanshark') { apply plugin: 'eclipse-wtp' dependencies { - compile 'org.springframework.integration:spring-integration-ip' - compile 'org.springframework:spring-webmvc' - compile 'org.springframework:spring-orm' - compile 'org.springframework:spring-aop' - compile 'org.springframework:spring-aspects' - compile "org.aspectj:aspectjtools:$aspectjVersion" - compile 'org.springframework:spring-jdbc' - compile 'org.springframework:spring-tx' - compile 'org.springframework:spring-context' - compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" - compile "org.apache.commons:commons-dbcp2:$commonsDbcpVersion" - compile "commons-digester:commons-digester:$commonsDigesterVersion" - compile "commons-pool:commons-pool:$commonsPoolVersion" - compile "org.apache.tiles:tiles-jsp:$tilesJspVersion" - compile "joda-time:joda-time:$jodaTimeVersion" - compile "javax.transaction:jta:$jtaVersion" - compile "org.hsqldb:hsqldb:$hsqldbVersion" - compile "net.sf.flexjson:flexjson:$flexjsonVersion" - compile "javax.validation:validation-api:$validationApiVersion" - compile "org.hibernate:hibernate-validator:$hibernateValidatorVersion" - compile "org.eclipse.persistence:javax.persistence:$jpaApiVersion" - compile "org.hibernate:hibernate-entitymanager:$hibernateVersion" - compile "org.springframework.webflow:spring-js:$springWebFlowVersion" - compile "org.slf4j:slf4j-api:$slf4jVersion" - - runtime "org.apache.logging.log4j:log4j-core:$log4jVersion" - runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" - runtime "org.slf4j:jcl-over-slf4j:$slf4jVersion" + api 'org.springframework.integration:spring-integration-ip' + api 'org.springframework:spring-webmvc' + api 'org.springframework:spring-orm' + api 'org.springframework:spring-aop' + api 'org.springframework:spring-aspects' + api "org.aspectj:aspectjtools:$aspectjVersion" + api 'org.springframework:spring-jdbc' + api 'org.springframework:spring-tx' + api 'org.springframework:spring-context' + api "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" + api "org.apache.commons:commons-dbcp2:$commonsDbcpVersion" + api "commons-digester:commons-digester:$commonsDigesterVersion" + api "org.apache.commons:commons-pool2:$commonsPoolVersion" + api "org.apache.tiles:tiles-jsp:$tilesJspVersion" + api "joda-time:joda-time:$jodaTimeVersion" + api "jakarta.transaction:jakarta.transaction-api:$jtaVersion" + api "org.hsqldb:hsqldb:$hsqldbVersion" + api "net.sf.flexjson:flexjson:$flexjsonVersion" + api "org.hibernate:hibernate-validator:$hibernateValidatorVersion" + api "org.eclipse.persistence:org.eclipse.persistence.jpa:$jpaApiVersion" + api "org.hibernate:hibernate-core-jakarta:$hibernateVersion" + api "org.springframework.webflow:spring-js:$springWebFlowVersion" + api "org.slf4j:slf4j-api:$slf4jVersion" + + runtimeOnly "org.apache.logging.log4j:log4j-core:$log4jVersion" + runtimeOnly "org.slf4j:slf4j-log4j12:$slf4jVersion" + runtimeOnly "org.slf4j:jcl-over-slf4j:$slf4jVersion" } } @@ -430,10 +479,10 @@ project('amqp') { description = 'AMQP Basic Sample' dependencies { - compile 'org.springframework.integration:spring-integration-stream' - compile 'org.springframework.integration:spring-integration-amqp' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - runtime "org.slf4j:slf4j-jcl:$slf4jVersion" + api 'org.springframework.integration:spring-integration-stream' + api 'org.springframework.integration:spring-integration-amqp' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" + runtimeOnly "org.slf4j:slf4j-jcl:$slf4jVersion" } task runSimple(type: JavaExec) { @@ -462,13 +511,13 @@ project('barrier') { apply plugin: 'org.springframework.boot' dependencies { - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.springframework.boot:spring-boot-starter-integration' - compile 'org.springframework.boot:spring-boot-starter-amqp' - compile 'org.springframework.integration:spring-integration-amqp' - compile 'org.springframework.integration:spring-integration-http' + api 'org.springframework.boot:spring-boot-starter-web' + api 'org.springframework.boot:spring-boot-starter-integration' + api 'org.springframework.boot:spring-boot-starter-amqp' + api 'org.springframework.integration:spring-integration-amqp' + api 'org.springframework.integration:spring-integration-http' - testCompile 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.boot:spring-boot-starter-test' } springBoot { @@ -485,8 +534,8 @@ project('control-bus') { description = 'Control Bus Basic Sample' dependencies { - compile 'org.springframework.integration:spring-integration-core' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-core' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -498,9 +547,9 @@ project('enricher') { mainClassName = 'org.springframework.integration.samples.enricher.Main' dependencies { - compile 'org.springframework.integration:spring-integration-core' - compile "com.h2database:h2:$h2Version" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-core' + api "com.h2database:h2:$h2Version" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -508,8 +557,8 @@ project('feed') { description = 'Feed (RSS/ATOM) Basic Sample' dependencies { - compile 'org.springframework.integration:spring-integration-feed' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-feed' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -517,8 +566,8 @@ project('file') { description = 'File Copy Basic Sample' dependencies { - compile 'org.springframework.integration:spring-integration-file' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-file' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -526,15 +575,15 @@ project('ftp') { description = 'FTP Basic Sample' dependencies { - compile 'org.springframework.integration:spring-integration-ftp' - compile "commons-io:commons-io:$commonsIoVersion" - compile "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" - compile "org.slf4j:slf4j-api:$slf4jVersion" + api 'org.springframework.integration:spring-integration-ftp' + api "commons-io:commons-io:$commonsIoVersion" + api "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" + api "org.slf4j:slf4j-api:$slf4jVersion" - runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" + runtimeOnly "org.slf4j:slf4j-log4j12:$slf4jVersion" - testCompile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile 'org.springframework.integration:spring-integration-test' + testImplementation "org.apache.logging.log4j:log4j-core:$log4jVersion" + testImplementation 'org.springframework.integration:spring-integration-test' } test { @@ -546,8 +595,8 @@ project('helloworld') { description = 'Hello World Sample' dependencies { - compile 'org.springframework.integration:spring-integration-core' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-core' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } task runHelloWorldApp(type: JavaExec) { @@ -573,15 +622,13 @@ project('http') { mainClassName = 'org.springframework.integration.samples.http.HttpClientDemo' dependencies { - compile 'org.springframework.integration:spring-integration-http' - compile 'org.springframework.integration:spring-integration-mail' - compile 'org.springframework:spring-webmvc' - compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" - compile "commons-io:commons-io:$commonsIoVersion" - compile "jakarta.mail:jakarta.mail-api:$javaxMailVersion" - compile "com.sun.mail:imap:$javaxMailVersion" - compile "com.sun.mail:jakarta.mail:$javaxMailVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-http' + api 'org.springframework.integration:spring-integration-mail' + api 'org.springframework:spring-webmvc' + api "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" + api "commons-io:commons-io:$commonsIoVersion" + api "com.sun.mail:jakarta.mail:$mailVersion" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -592,10 +639,10 @@ project('http') { apply plugin: 'org.springframework.boot' dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile 'org.springframework.integration:spring-integration-core' - compile "org.springframework.integration:spring-integration-splunk:$springIntegrationSplunkVersion" - testCompile 'org.springframework.boot:spring-boot-starter-test' + api 'org.springframework.boot:spring-boot-starter-integration' + api 'org.springframework.integration:spring-integration-core' + api "org.springframework.integration:spring-integration-splunk:$springIntegrationSplunkVersion" + testImplementation 'org.springframework.boot:spring-boot-starter-test' } springBoot { @@ -614,15 +661,15 @@ project('kafka') { apply plugin: 'org.springframework.boot' dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile ('org.springframework.integration:spring-integration-kafka') { + api 'org.springframework.boot:spring-boot-starter-integration' + api('org.springframework.integration:spring-integration-kafka') { exclude group: 'org.slf4j' } - compile 'org.springframework.integration:spring-integration-core' + api 'org.springframework.integration:spring-integration-core' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.boot:spring-boot-starter-test' } springBoot { @@ -641,11 +688,11 @@ project('mqtt') { apply plugin: 'org.springframework.boot' dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile 'org.springframework.integration:spring-integration-stream' - compile 'org.springframework.integration:spring-integration-mqtt' - testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile "org.springframework.integration:spring-integration-test" + api 'org.springframework.boot:spring-boot-starter-integration' + api 'org.springframework.integration:spring-integration-stream' + api 'org.springframework.integration:spring-integration-mqtt' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation "org.springframework.integration:spring-integration-test" } springBoot { @@ -669,18 +716,16 @@ project('si4demo') { apply plugin: 'org.springframework.boot' dependencies { - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.springframework.boot:spring-boot-starter-integration' - compile 'org.springframework.integration:spring-integration-mail' - compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" - compile 'org.springframework.integration:spring-integration-http' - compile 'org.springframework.integration:spring-integration-ip' - compile "jakarta.mail:jakarta.mail-api:$javaxMailVersion" - compile "com.sun.mail:imap:$javaxMailVersion" - compile "com.sun.mail:jakarta.mail:$javaxMailVersion" - compile 'com.rometools:rome:1.5.0' + api 'org.springframework.boot:spring-boot-starter-web' + api 'org.springframework.boot:spring-boot-starter-integration' + api 'org.springframework.integration:spring-integration-mail' + api "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" + api 'org.springframework.integration:spring-integration-http' + api 'org.springframework.integration:spring-integration-ip' + api "com.sun.mail:jakarta.mail:$mailVersion" + api 'com.rometools:rome:1.18.0' - testCompile 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.boot:spring-boot-starter-test' } springBoot { @@ -698,11 +743,12 @@ project('cafe-dsl') { apply plugin: 'org.springframework.boot' dependencies { - compile project(":cafe-si") - compile 'org.springframework.boot:spring-boot-starter-integration' - compile 'org.springframework.integration:spring-integration-core' + api project(":cafe-si") + api 'org.springframework.boot:spring-boot-starter-integration' + api 'org.springframework.integration:spring-integration-core' + api 'org.springframework.integration:spring-integration-stream' - testCompile 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.boot:spring-boot-starter-test' } springBoot { @@ -723,9 +769,9 @@ project('jdbc') { mainClassName = 'org.springframework.integration.samples.jdbc.Main' dependencies { - compile 'org.springframework.integration:spring-integration-jdbc' - compile "com.h2database:h2:$h2Version" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-jdbc' + api "com.h2database:h2:$h2Version" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -737,16 +783,16 @@ project('jms') { mainClassName = 'org.springframework.integration.samples.jms.Main' dependencies { - compile "javax.jms:javax.jms-api:$jmsApiVersion" - compile 'org.springframework.integration:spring-integration-jms' - compile 'org.springframework.integration:spring-integration-stream' - compile "org.apache.activemq:activemq-broker:$activeMqVersion" - compile("org.apache.activemq:activemq-kahadb-store:$activeMqVersion") { - exclude group: "org.springframework" + api "jakarta.jms:jakarta.jms-api:$jmsApiVersion" + api 'org.springframework.integration:spring-integration-jms' + api 'org.springframework.integration:spring-integration-stream' + api("org.apache.activemq:artemis-server:$artemisVersion") { + exclude group: 'org.jboss.logmanager' } - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api "org.apache.activemq:artemis-jakarta-client:$artemisVersion" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile 'org.springframework.integration:spring-integration-test' + testImplementation 'org.springframework.integration:spring-integration-test' } } @@ -754,9 +800,9 @@ project('jmx') { description = 'JMX Basic Sample' dependencies { - compile 'org.springframework.integration:spring-integration-jmx' - compile 'org.springframework.integration:spring-integration-stream' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-jmx' + api 'org.springframework.integration:spring-integration-stream' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -769,14 +815,14 @@ project('jpa') { mainClassName = 'org.springframework.integration.samples.jpa.Main' dependencies { - compile 'org.springframework.boot:spring-boot-starter-data-jpa' - compile 'org.springframework.integration:spring-integration-jpa' - compile "com.h2database:h2:$h2Version" + api 'org.springframework.boot:spring-boot-starter-data-jpa' + api 'org.springframework.integration:spring-integration-jpa' + api "com.h2database:h2:$h2Version" - runtime 'org.springframework:spring-instrument' - runtime "org.hibernate.javax.persistence:hibernate-jpa-2.1-api:$jpa21ApiVersion" + runtimeOnly 'org.springframework:spring-instrument' + runtimeOnly "org.eclipse.persistence:org.eclipse.persistence.jpa:$jpaApiVersion" - testCompile 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.boot:spring-boot-starter-test' } tasks.withType(JavaExec) { @@ -789,12 +835,10 @@ project('mail') { description = 'Mail (IMAP + POP3) Sample' dependencies { - compile 'org.springframework.integration:spring-integration-mail' - compile 'org.springframework:spring-context' - compile "jakarta.mail:jakarta.mail-api:$javaxMailVersion" - compile "com.sun.mail:imap:$javaxMailVersion" - compile "com.sun.mail:jakarta.mail:$javaxMailVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-mail' + api 'org.springframework:spring-context' + api "com.sun.mail:jakarta.mail:$mailVersion" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } task runGmailInboundPop3AdapterTestApp(type: JavaExec) { @@ -812,9 +856,9 @@ project('mongodb') { description = 'MongoDb Basic Sample' dependencies { - compile 'org.springframework.integration:spring-integration-mongodb' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - compile "org.mongodb:mongodb-driver-sync:$mongoDriverVersion" + api 'org.springframework.integration:spring-integration-mongodb' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" + api "org.mongodb:mongodb-driver-sync:$mongoDriverVersion" } task runMongoDbInboundAdapterDemo(type: JavaExec) { @@ -832,8 +876,8 @@ project('oddeven') { description = 'Odd-Even Sample' dependencies { - compile 'org.springframework.integration:spring-integration-core' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-core' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } task runCronOddEvenDemo(type: JavaExec) { @@ -851,8 +895,8 @@ project('quote') { description = 'Quote Sample' dependencies { - compile 'org.springframework.integration:spring-integration-stream' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-stream' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -860,9 +904,9 @@ project('sftp') { description = 'SFTP Basic Sample' dependencies { - compile 'org.springframework.integration:spring-integration-sftp' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile "org.apache.sshd:sshd-sftp:$apacheSshdVersion" + api 'org.springframework.integration:spring-integration-sftp' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" + testImplementation "org.apache.sshd:sshd-sftp:$apacheSshdVersion" } } @@ -874,12 +918,12 @@ project('tcp-amqp') { mainClassName = 'org.springframework.integration.samples.tcpamqp.Main' dependencies { - compile 'org.springframework.integration:spring-integration-amqp' - compile 'org.springframework.integration:spring-integration-ip' - compile "org.slf4j:slf4j-api:$slf4jVersion" + api 'org.springframework.integration:spring-integration-amqp' + api 'org.springframework.integration:spring-integration-ip' + api "org.slf4j:slf4j-api:$slf4jVersion" - runtime "org.apache.logging.log4j:log4j-core:$log4jVersion" - runtime "org.slf4j:slf4j-log4j12:$slf4jVersion" + runtimeOnly "org.apache.logging.log4j:log4j-core:$log4jVersion" + runtimeOnly "org.slf4j:slf4j-log4j12:$slf4jVersion" } } @@ -889,11 +933,11 @@ project('tcp-broadcast') { apply plugin: 'org.springframework.boot' dependencies { - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.springframework.boot:spring-boot-starter-integration' - compile 'org.springframework.integration:spring-integration-ip' + api 'org.springframework.boot:spring-boot-starter-web' + api 'org.springframework.boot:spring-boot-starter-integration' + api 'org.springframework.integration:spring-integration-ip' - testCompile 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.boot:spring-boot-starter-test' } springBoot { @@ -914,10 +958,10 @@ project('tcp-client-server') { mainClassName = 'org.springframework.integration.samples.tcpclientserver.Main' dependencies { - compile 'org.springframework.integration:spring-integration-ip' - compile "commons-lang:commons-lang:$commonsLangVersion" - compile 'org.springframework.integration:spring-integration-test' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-ip' + api "org.apache.commons:commons-lang3:$commonsLangVersion" + api 'org.springframework.integration:spring-integration-test' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -931,19 +975,19 @@ project('testcontainers-rabbitmq') { } dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile 'org.springframework.integration:spring-integration-amqp' - compile 'org.springframework.boot:spring-boot-starter-json' + api 'org.springframework.boot:spring-boot-starter-integration' + api 'org.springframework.integration:spring-integration-amqp' + api 'org.springframework.boot:spring-boot-starter-json' - testCompile('org.springframework.boot:spring-boot-starter-test') { + testImplementation('org.springframework.boot:spring-boot-starter-test') { exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' } - testCompile 'org.springframework.integration:spring-integration-test' - testCompile 'org.springframework.amqp:spring-rabbit-test' - testCompile 'org.springframework.cloud:spring-cloud-starter' + testImplementation 'org.springframework.integration:spring-integration-test' + testImplementation 'org.springframework.amqp:spring-rabbit-test' + testImplementation 'org.springframework.cloud:spring-cloud-starter' - testCompile "org.testcontainers:junit-jupiter:$testcontainersVersion" - testCompile 'com.playtika.testcontainers:embedded-rabbitmq:1.42' + testImplementation "org.testcontainers:junit-jupiter:$testcontainersVersion" + testImplementation 'com.playtika.testcontainers:embedded-rabbitmq:2.0.19' } @@ -967,13 +1011,13 @@ project('testing-examples') { mainClassName = 'org.springframework.integration.samples.testing.externalgateway.Main' dependencies { - compile 'org.springframework.integration:spring-integration-file' - compile 'org.springframework.integration:spring-integration-http' - compile 'org.springframework.integration:spring-integration-ws' - compile 'org.springframework:spring-webmvc' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-file' + api 'org.springframework.integration:spring-integration-http' + api 'org.springframework.integration:spring-integration-ws' + api 'org.springframework:spring-webmvc' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile 'org.springframework.integration:spring-integration-test' + testImplementation 'org.springframework.integration:spring-integration-test' } } @@ -981,8 +1025,8 @@ project('twitter') { description = 'Twitter Basic Sample' dependencies { - compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } test { @@ -998,10 +1042,10 @@ project('ws-inbound-gateway') { apply plugin: 'eclipse-wtp' dependencies { - compile 'org.springframework.integration:spring-integration-xml' - compile 'org.springframework.integration:spring-integration-ws' - compile 'org.springframework:spring-webmvc' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-xml' + api 'org.springframework.integration:spring-integration-ws' + api 'org.springframework:spring-webmvc' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } test { @@ -1017,9 +1061,9 @@ project('ws-outbound-gateway') { mainClassName = 'org.springframework.integration.samples.ws.WebServiceDemoTestApp' dependencies { - compile 'org.springframework.integration:spring-integration-stream' - compile 'org.springframework.integration:spring-integration-ws' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-stream' + api 'org.springframework.integration:spring-integration-ws' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1031,8 +1075,8 @@ project('xml') { mainClassName = 'org.springframework.integration.samples.xml.BookOrderProcessingTestApp' dependencies { - compile 'org.springframework.integration:spring-integration-xml' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-xml' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1040,8 +1084,8 @@ project('xmpp') { description = 'XMPP Basic Sample' dependencies { - compile 'org.springframework.integration:spring-integration-xmpp' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-xmpp' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } test { @@ -1053,8 +1097,8 @@ project('async-gateway') { description = 'Async Gateway Sample' dependencies { - compile 'org.springframework.integration:spring-integration-core' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-core' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1066,8 +1110,8 @@ project('dynamic-poller') { mainClassName = 'org.springframework.integration.samples.poller.Main' dependencies { - compile 'org.springframework.integration:spring-integration-core' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-core' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1075,8 +1119,8 @@ project('errorhandling') { description = 'Error Handling Sample' dependencies { - compile 'org.springframework.integration:spring-integration-stream' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-stream' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1084,8 +1128,8 @@ project('file-processing') { description = 'File Processing Sample' dependencies { - compile 'org.springframework.integration:spring-integration-file' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-file' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1097,16 +1141,13 @@ project('mail-attachments') { mainClassName = 'org.springframework.integration.samples.mailattachments.Main' dependencies { - compile 'org.springframework.integration:spring-integration-mail' - compile 'org.springframework.integration:spring-integration-file' - compile "jakarta.mail:jakarta.mail-api:$javaxMailVersion" - compile "com.sun.mail:imap:$javaxMailVersion" - compile "com.sun.mail:jakarta.mail:$javaxMailVersion" - compile "commons-io:commons-io:$commonsIoVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-mail' + api 'org.springframework.integration:spring-integration-file' + api "com.sun.mail:jakarta.mail:$mailVersion" + api "commons-io:commons-io:$commonsIoVersion" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile 'org.springframework.integration:spring-integration-test' - testCompile "org.subethamail:subethasmtp-wiser:$subethasmtpVersion" + testImplementation 'org.springframework.integration:spring-integration-test' } } @@ -1122,12 +1163,12 @@ project('monitoring') { mainClassName = 'org.springintegration.SpringIntegrationTest' dependencies { - compile 'org.springframework.integration:spring-integration-jmx' - compile "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" - compile 'org.springframework.integration:spring-integration-groovy' - compile 'org.springframework:spring-webmvc' - compile "javax.servlet:jstl:$jstlVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-jmx' + api "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" + api 'org.springframework.integration:spring-integration-groovy' + api 'org.springframework:spring-webmvc' + api "javax.servlet:jstl:$jstlVersion" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1139,12 +1180,12 @@ project('multipart-http') { apply plugin: 'eclipse-wtp' dependencies { - compile 'org.springframework.integration:spring-integration-http' - compile 'org.springframework:spring-webmvc' - compile 'com.fasterxml.jackson.core:jackson-databind' - compile "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" - compile "commons-io:commons-io:$commonsIoVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-http' + api 'org.springframework:spring-webmvc' + api 'com.fasterxml.jackson.core:jackson-databind' + api "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" + api "commons-io:commons-io:$commonsIoVersion" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1156,18 +1197,18 @@ project('rest-http') { apply plugin: 'eclipse-wtp' dependencies { - compile 'org.springframework.integration:spring-integration-http' - compile 'org.springframework:spring-webmvc' - compile 'org.springframework:spring-oxm' - compile 'org.springframework:spring-tx' - compile 'org.springframework:spring-jdbc' - compile 'org.springframework:spring-context' - compile 'org.springframework:spring-aop' - compile 'com.fasterxml.jackson.core:jackson-databind' - compile "org.springframework.security:spring-security-web:$springSecurityVersion" - compile "org.springframework.security:spring-security-config:$springSecurityVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - compile "com.sun.xml.bind:jaxb-impl:$jaxbVersion" + api 'org.springframework.integration:spring-integration-http' + api 'org.springframework:spring-webmvc' + api 'org.springframework:spring-oxm' + api 'org.springframework:spring-tx' + api 'org.springframework:spring-jdbc' + api 'org.springframework:spring-context' + api 'org.springframework:spring-aop' + api 'com.fasterxml.jackson.core:jackson-databind' + api "org.springframework.security:spring-security-web:$springSecurityVersion" + api "org.springframework.security:spring-security-config:$springSecurityVersion" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" + api "com.sun.xml.bind:jaxb-impl:$jaxbVersion" } test { @@ -1180,15 +1221,15 @@ project('retry-and-more') { description = 'Retry and More Sample' dependencies { - compile 'org.springframework.integration:spring-integration-stream' - compile 'org.springframework.integration:spring-integration-amqp' - compile 'org.springframework.integration:spring-integration-ftp' - compile 'org.springframework.integration:spring-integration-file' - compile("org.mockito:mockito-core:$mockitoVersion") { + api 'org.springframework.integration:spring-integration-stream' + api 'org.springframework.integration:spring-integration-amqp' + api 'org.springframework.integration:spring-integration-ftp' + api 'org.springframework.integration:spring-integration-file' + api("org.mockito:mockito-core:$mockitoVersion") { exclude group: 'org.hamcrest' } - compile "org.hamcrest:hamcrest-library:$hamcrestVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api "org.hamcrest:hamcrest-library:$hamcrestVersion" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } task runCircuitBreakerDemo(type: JavaExec) { @@ -1225,9 +1266,8 @@ project('splitter-aggregator-reaper') { mainClassName = 'org.springframework.integration.samples.splitteraggregator.Main' dependencies { - compile 'org.springframework.integration:spring-integration-core' - compile "javax.inject:javax.inject:$javaxInjectVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-core' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1240,9 +1280,9 @@ project('stored-procedures-derby') { mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' dependencies { - compile 'org.springframework.integration:spring-integration-jdbc' - compile "org.apache.derby:derby:$derbyVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-jdbc' + api "org.apache.derby:derby:$derbyVersion" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1254,9 +1294,9 @@ project('stored-procedures-oracle') { mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' dependencies { - compile 'org.springframework.integration:spring-integration-jdbc' - compile "com.oracle.ojdbc:ojdbc8:$oracleDriverVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-jdbc' + api "com.oracle.ojdbc:ojdbc8:$oracleDriverVersion" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } test { @@ -1272,10 +1312,10 @@ project('stored-procedures-ms') { mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' dependencies { - compile 'org.springframework.integration:spring-integration-jdbc' - compile "net.sourceforge.jtds:jtds:$jtdsVersion" - compile "c3p0:c3p0:$c3p0Version" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-jdbc' + api "net.sourceforge.jtds:jtds:$jtdsVersion" + api "com.mchange:c3p0:$c3p0Version" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } test { @@ -1291,11 +1331,11 @@ project('stored-procedures-postgresql') { mainClassName = 'org.springframework.integration.samples.storedprocedure.Main' dependencies { - compile 'org.springframework.integration:spring-integration-jdbc' - compile "org.postgresql:postgresql:$postgresVersion" - compile "org.apache.commons:commons-dbcp2:$commonsDbcpVersion" - compile "commons-pool:commons-pool:$commonsPoolVersion" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-jdbc' + api "org.postgresql:postgresql:$postgresVersion" + api "org.apache.commons:commons-dbcp2:$commonsDbcpVersion" + api "org.apache.commons:commons-pool2:$commonsPoolVersion" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1305,11 +1345,11 @@ project('tcp-async-bi-directional') { apply plugin: 'org.springframework.boot' dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile "org.springframework.integration:spring-integration-ip" + api 'org.springframework.boot:spring-boot-starter-integration' + api "org.springframework.integration:spring-integration-ip" - testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile "org.springframework.integration:spring-integration-test" + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation "org.springframework.integration:spring-integration-test" } springBoot { @@ -1331,10 +1371,10 @@ project('tcp-client-server-multiplex') { description = 'TCP Client Server Multiplexing Sample' dependencies { - compile 'org.springframework.integration:spring-integration-ip' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-ip' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile 'org.springframework.integration:spring-integration-test' + testImplementation 'org.springframework.integration:spring-integration-test' } } @@ -1346,10 +1386,10 @@ project('travel') { mainClassName = 'org.springframework.integration.samples.travel.Main' dependencies { - compile 'org.springframework.integration:spring-integration-ws' - compile 'org.springframework.integration:spring-integration-http' - compile 'org.springframework:spring-web' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-ws' + api 'org.springframework.integration:spring-integration-http' + api 'org.springframework:spring-web' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1361,10 +1401,10 @@ project('tx-synch') { mainClassName = 'org.springframework.integration.samples.advice.TransactionSynchronizationDemo' dependencies { - compile 'org.springframework.integration:spring-integration-jdbc' - compile 'org.springframework.integration:spring-integration-file' - compile "com.h2database:h2:$h2Version" - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" + api 'org.springframework.integration:spring-integration-jdbc' + api 'org.springframework.integration:spring-integration-file' + api "com.h2database:h2:$h2Version" + api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } @@ -1374,10 +1414,10 @@ project('web-sockets') { apply plugin: 'org.springframework.boot' dependencies { - compile 'org.springframework.boot:spring-boot-starter-websocket' - compile "org.springframework.integration:spring-integration-websocket" + api 'org.springframework.boot:spring-boot-starter-websocket' + api "org.springframework.integration:spring-integration-websocket" - testCompile 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.boot:spring-boot-starter-test' } springBoot { @@ -1395,12 +1435,12 @@ project('stomp-chat') { apply plugin: 'org.springframework.boot' dependencies { - compile 'org.springframework.boot:spring-boot-starter-websocket' - compile 'org.springframework.integration:spring-integration-websocket' - compile 'org.springframework.integration:spring-integration-event' - compile 'org.springframework.integration:spring-integration-groovy' + api 'org.springframework.boot:spring-boot-starter-websocket' + api 'org.springframework.integration:spring-integration-websocket' + api 'org.springframework.integration:spring-integration-event' + api 'org.springframework.integration:spring-integration-groovy' - testCompile 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.boot:spring-boot-starter-test' } springBoot { @@ -1418,11 +1458,11 @@ project('kafka-dsl') { apply plugin: 'org.springframework.boot' dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile 'org.springframework.integration:spring-integration-core' - compile 'org.springframework.integration:spring-integration-kafka' - compile "org.apache.logging.log4j:log4j-core:$log4jVersion" - testCompile 'org.springframework.boot:spring-boot-starter-test' + api 'org.springframework.boot:spring-boot-starter-integration' + api 'org.springframework.integration:spring-integration-core' + api 'org.springframework.integration:spring-integration-kafka' + api "org.apache.logging.log4j:log4j-core:$log4jVersion" + testImplementation 'org.springframework.boot:spring-boot-starter-test' } springBoot { @@ -1445,17 +1485,15 @@ project('file-split-ftp') { apply plugin: 'org.springframework.boot' dependencies { - compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.springframework.boot:spring-boot-starter-integration' - compile 'org.springframework.integration:spring-integration-ftp' - compile 'org.springframework.integration:spring-integration-http' - compile 'org.springframework.integration:spring-integration-mail' - compile "jakarta.mail:jakarta.mail-api:$javaxMailVersion" - compile "com.sun.mail:imap:$javaxMailVersion" - compile "com.sun.mail:jakarta.mail:$javaxMailVersion" + api 'org.springframework.boot:spring-boot-starter-web' + api 'org.springframework.boot:spring-boot-starter-integration' + api 'org.springframework.integration:spring-integration-ftp' + api 'org.springframework.integration:spring-integration-http' + api 'org.springframework.integration:spring-integration-mail' + api "com.sun.mail:jakarta.mail:$mailVersion" - testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile 'org.springframework.integration:spring-integration-test' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.integration:spring-integration-test' } springBoot { @@ -1474,10 +1512,10 @@ project('dynamic-tcp-client') { apply plugin: 'org.springframework.boot' dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile 'org.springframework.integration:spring-integration-ip' + api 'org.springframework.boot:spring-boot-starter-integration' + api 'org.springframework.integration:spring-integration-ip' - testCompile 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.boot:spring-boot-starter-test' } springBoot { @@ -1496,11 +1534,11 @@ project('tcp-with-headers') { apply plugin: 'org.springframework.boot' dependencies { - compile 'org.springframework.boot:spring-boot-starter-integration' - compile 'org.springframework.integration:spring-integration-ip' - compile 'com.fasterxml.jackson.core:jackson-databind' + api 'org.springframework.boot:spring-boot-starter-integration' + api 'org.springframework.integration:spring-integration-ip' + api 'com.fasterxml.jackson.core:jackson-databind' - testCompile 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.boot:spring-boot-starter-test' } springBoot { diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 5a12a425a..971ee97cf 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -1,24 +1,18 @@ - + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.0-SNAPSHOT - org.springframework.integration.samples cafe-dsl - 5.5.0 - Java DSL Cafe Sample - Java DSL Cafe Sample - https://projects.spring.io/spring-integration + 6.0.0 + pom + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +31,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -54,158 +48,143 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration.samples cafe-si - 5.5.0 + 6.0.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-integration compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-core compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.springframework.integration + spring-integration-stream + compile junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.boot spring-boot-dependencies - 2.6.0-SNAPSHOT + 3.0.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.8.2 import pom com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.0.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 3af15208d..070b96c9c 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -1,24 +1,18 @@ - + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.0-SNAPSHOT - org.springframework.integration.samples kafka-dsl - 5.5.0 - Java DSL Kafka Sample - Java DSL Kafka Sample - https://projects.spring.io/spring-integration + 6.0.0 + pom + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +31,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -54,169 +48,143 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.boot spring-boot-starter-integration compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-core compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-kafka compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.boot spring-boot-dependencies - 2.6.0-SNAPSHOT + 3.0.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.8.2 import pom com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.0.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/dsl/pom.xml b/dsl/pom.xml deleted file mode 100644 index 5c0eac7fa..000000000 --- a/dsl/pom.xml +++ /dev/null @@ -1,144 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - dsl - 5.5.0 - https://projects.spring.io/spring-integration - - SpringIO - https://spring.io - - - - The Apache Software License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - - junit - junit - 4.13.2 - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - - - - org.hamcrest - hamcrest-library - 2.2 - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - org.mockito - mockito-core - 3.11.2 - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - - - - org.springframework.integration - spring-integration-test - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - com.fasterxml.jackson - jackson-bom - 2.12.1 - import - pom - - - org.springframework - spring-framework-bom - 5.3.15 - import - pom - - - org.springframework.integration - spring-integration-bom - 5.5.8 - import - pom - - - - diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index ef1d2db6d..fd414ac34 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -1,24 +1,18 @@ - + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.0-SNAPSHOT - org.springframework.integration.samples si4demo - 5.5.0 - Java Configuration/DSL Sample - Java Configuration/DSL Sample - https://projects.spring.io/spring-integration + 6.0.0 + pom + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +31,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -54,239 +48,165 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.boot spring-boot-starter-web compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-integration compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-mail compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-social-twitter 1.0.1.BUILD-SNAPSHOT compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-http compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-ip compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - jakarta.mail - jakarta.mail-api - 1.6.7 - compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - com.sun.mail - imap - 1.6.7 - compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - com.sun.mail jakarta.mail - 1.6.7 + 2.0.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - com.rometools rome - 1.5.0 + 1.18.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.boot spring-boot-dependencies - 2.6.0-SNAPSHOT + 3.0.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.8.2 import pom com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.0.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/gradle.properties b/gradle.properties index 1b4dd5e83..5ad8ef474 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,6 @@ -version=5.5.0 -springBootVersion=2.6.0-SNAPSHOT -org.gradle.jvmargs=-Xmx1536m +version=6.0.0 +springBootVersion=3.0.0-SNAPSHOT +org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8 +org.gradle.caching=true +org.gradle.parallel=true + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a563242c..2e6e5897b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index e60ff43b3..d8efd2de9 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples async-gateway - 5.5.0 - Async Gateway Sample - Async Gateway Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,121 +47,108 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-core compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 8040048da..4dbdf8998 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples dynamic-poller - 5.5.0 - Dynamic Poller Sample - Dynamic Poller Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,121 +47,108 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-core compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index c4b7d8965..04ab82581 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples errorhandling - 5.5.0 - Error Handling Sample - Error Handling Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,121 +47,108 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-stream compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index be37ba66d..07ac1735b 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples file-processing - 5.5.0 - File Processing Sample - File Processing Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,121 +47,108 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-file compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index fd29dc18c..48b934b4f 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples mail-attachments - 5.5.0 - Mail Attachment Sample - Mail Attachment Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,192 +47,125 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-mail compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-file compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - jakarta.mail - jakarta.mail-api - 1.6.7 - compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - com.sun.mail - imap - 1.6.7 - compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - com.sun.mail jakarta.mail - 1.6.7 + 2.0.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - commons-io commons-io 2.11.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - org.subethamail - subethasmtp-wiser - 1.2 - test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailParserUtils.java b/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailParserUtils.java index 8adf02d27..da4d4ebdf 100644 --- a/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailParserUtils.java +++ b/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailParserUtils.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.mailattachments.support; import java.io.ByteArrayOutputStream; @@ -21,25 +22,27 @@ import java.io.InputStream; import java.util.List; -import javax.mail.BodyPart; -import javax.mail.MessagingException; -import javax.mail.Multipart; -import javax.mail.Part; -import javax.mail.internet.ContentType; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.ParseException; - import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.util.Assert; +import jakarta.mail.BodyPart; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.Part; +import jakarta.mail.internet.ContentType; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.ParseException; + /** * Utility Class for parsing mail messages. * * @author Gunnar Hillert * @author Gary Russell + * @author Artem Bilan + * * @since 2.2 * */ @@ -61,15 +64,15 @@ private EmailParserUtils() { * which will contain the mail message's content. * * If the mail message is an instance of {@link Multipart} then we delegate - * to {@link #handleMultipart(File, Multipart, javax.mail.Message, List)}. + * to {@link #handleMultipart(File, Multipart, Message, List)}. * * @param directory The directory for storing the message. If null this is the root message. * @param mailMessage The mail message to be parsed. Must not be null. * @param emailFragments Must not be null. */ public static void handleMessage(final File directory, - final javax.mail.Message mailMessage, - final List emailFragments) { + final jakarta.mail.Message mailMessage, + final List emailFragments) { Assert.notNull(mailMessage, "The mail message to be parsed must not be null."); Assert.notNull(emailFragments, "The collection of emailfragments must not be null."); @@ -80,9 +83,11 @@ public static void handleMessage(final File directory, try { content = mailMessage.getContent(); subject = mailMessage.getSubject(); - } catch (IOException e) { + } + catch (IOException e) { throw new IllegalStateException("Error while retrieving the email contents.", e); - } catch (MessagingException e) { + } + catch (MessagingException e) { throw new IllegalStateException("Error while retrieving the email contents.", e); } @@ -90,7 +95,8 @@ public static void handleMessage(final File directory, if (directory == null) { directoryToUse = new File(subject); - } else { + } + else { directoryToUse = new File(directory, subject); } @@ -110,21 +116,21 @@ else if (content instanceof Multipart) { /** * Parses any {@link Multipart} instances that contain text or Html attachments, * {@link InputStream} instances, additional instances of {@link Multipart} - * or other attached instances of {@link javax.mail.Message}. + * or other attached instances of {@link jakarta.mail.Message}. * * Will create the respective {@link EmailFragment}s representing those attachments. * - * Instances of {@link javax.mail.Message} are delegated to - * {@link #handleMessage(File, javax.mail.Message, List)}. Further instances + * Instances of {@link jakarta.mail.Message} are delegated to + * {@link #handleMessage(File, jakarta.mail.Message, List)}. Further instances * of {@link Multipart} are delegated to - * {@link #handleMultipart(File, Multipart, javax.mail.Message, List)}. + * {@link #handleMultipart(File, Multipart, jakarta.mail.Message, List)}. * * @param directory Must not be null * @param multipart Must not be null * @param mailMessage Must not be null * @param emailFragments Must not be null */ - public static void handleMultipart(File directory, Multipart multipart, javax.mail.Message mailMessage, List emailFragments) { + public static void handleMultipart(File directory, Multipart multipart, jakarta.mail.Message mailMessage, List emailFragments) { Assert.notNull(directory, "The directory must not be null."); Assert.notNull(multipart, "The multipart object to be parsed must not be null."); @@ -164,9 +170,9 @@ public static void handleMultipart(File directory, Multipart multipart, javax.ma try { contentType = bp.getContentType(); - filename = bp.getFileName(); + filename = bp.getFileName(); disposition = bp.getDisposition(); - subject = mailMessage.getSubject(); + subject = mailMessage.getSubject(); if (filename == null && bp instanceof MimeBodyPart) { filename = ((MimeBodyPart) bp).getContentID(); @@ -179,7 +185,7 @@ public static void handleMultipart(File directory, Multipart multipart, javax.ma if (LOGGER.isInfoEnabled()) { LOGGER.info(String.format("BodyPart - Content Type: '%s', filename: '%s', disposition: '%s', subject: '%s'", - new Object[]{contentType, filename, disposition, subject})); + new Object[]{ contentType, filename, disposition, subject })); } if (Part.ATTACHMENT.equalsIgnoreCase(disposition)) { @@ -246,8 +252,8 @@ else if (content instanceof InputStream) { emailFragments.add(new EmailFragment(directory, filename, bis.toByteArray())); } - else if (content instanceof javax.mail.Message) { - handleMessage(directory, (javax.mail.Message) content, emailFragments); + else if (content instanceof jakarta.mail.Message) { + handleMessage(directory, (jakarta.mail.Message) content, emailFragments); } else if (content instanceof Multipart) { final Multipart mp2 = (Multipart) content; @@ -258,4 +264,5 @@ else if (content instanceof Multipart) { } } } + } diff --git a/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailTransformer.java b/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailTransformer.java index 9500b28fc..382de2c9a 100644 --- a/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailTransformer.java +++ b/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailTransformer.java @@ -37,9 +37,9 @@ public class EmailTransformer { private static final Log LOGGER = LogFactory.getLog(EmailTransformer.class); @Transformer - public List transformit(javax.mail.Message mailMessage) { + public List transformit(jakarta.mail.Message mailMessage) { - final List emailFragments = new ArrayList(); + final List emailFragments = new ArrayList<>(); EmailParserUtils.handleMessage(null, mailMessage, emailFragments); diff --git a/intermediate/mail-attachments/src/test/java/org/springframework/integration/samples/mailattachments/MimeMessageParsingTest.java b/intermediate/mail-attachments/src/test/java/org/springframework/integration/samples/mailattachments/MimeMessageParsingTest.java index 994e6ccb0..c4af31bd3 100644 --- a/intermediate/mail-attachments/src/test/java/org/springframework/integration/samples/mailattachments/MimeMessageParsingTest.java +++ b/intermediate/mail-attachments/src/test/java/org/springframework/integration/samples/mailattachments/MimeMessageParsingTest.java @@ -16,31 +16,7 @@ package org.springframework.integration.samples.mailattachments; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.subethamail.wiser.Wiser; -import org.subethamail.wiser.WiserMessage; - -import org.springframework.core.io.ByteArrayResource; import org.springframework.integration.samples.mailattachments.support.EmailFragment; -import org.springframework.integration.samples.mailattachments.support.EmailParserUtils; -import org.springframework.util.SocketUtils; -import org.springframework.mail.MailParseException; -import org.springframework.mail.javamail.JavaMailSenderImpl; -import org.springframework.mail.javamail.MimeMessageHelper; /** * Test to verify the correct parsing of Email Messages. @@ -53,6 +29,7 @@ */ public class MimeMessageParsingTest { +/* private static final Log LOGGER = LogFactory.getLog(MimeMessageParsingTest.class); private Wiser wiser; @@ -71,13 +48,15 @@ public void startWiser() { } + */ /** * This test will create a Mime Message that contains an Attachment, send it * to an SMTP Server (Using Wiser) and retrieve and process the Mime Message. * * This test verifies that the parsing of the retrieved Mime Message is * successful and that the correct number of {@link EmailFragment}s is created. - */ + *//* + @Test public void testProcessingOfEmailAttachments() { @@ -116,7 +95,7 @@ public void testProcessingOfEmailAttachments() { for (WiserMessage wiserMessage : wiserMessages) { - final List emailFragments = new ArrayList(); + final List emailFragments = new ArrayList<>(); try { final MimeMessage mailMessage = wiserMessage.getMimeMessage(); @@ -144,13 +123,15 @@ public void testProcessingOfEmailAttachments() { } } + */ /** * This test will create a Mime Message that in return contains another * mime message. The nested mime message contains an attachment. * * The root message consist of both HTML and Text message. * - */ + *//* + @Test public void testProcessingOfNestedEmailAttachments() { @@ -191,7 +172,7 @@ public void testProcessingOfNestedEmailAttachments() { for (WiserMessage wiserMessage : wiserMessages) { - List emailFragments = new ArrayList(); + List emailFragments = new ArrayList<>(); try { @@ -250,5 +231,6 @@ public void stopWiser() { wiser.stop(); LOGGER.info("Wiser stopped."); } +*/ } diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index acb8b271e..78e24ab72 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples monitoring - 5.5.0 - Monitoring Application - Monitoring Application - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,167 +47,162 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-jmx compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-social-twitter 1.0.1.BUILD-SNAPSHOT compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-groovy compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-webmvc compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - javax.servlet jstl 1.2 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile + + + javax.servlet + javax.servlet-api + 3.1.0 + runtime - jackson-module-kotlin - com.fasterxml.jackson.module + spring-boot-starter-tomcat + * + + + spring-boot-starter-jetty + * - junit - junit - 4.13.2 - test + javax.websocket + javax.websocket-api + 1.0 + runtime - jackson-module-kotlin - com.fasterxml.jackson.module + spring-boot-starter-tomcat + * - * - org.hamcrest + spring-boot-starter-jetty + * + + junit + junit + 4.13.2 + test + org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 02db71cc6..af38e3ffd 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples multipart-http - 5.5.0 - HTTP Multipart Demo - HTTP Multipart Demo - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,167 +47,162 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-http compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-webmvc compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - com.fasterxml.jackson.core jackson-databind compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - commons-fileupload commons-fileupload 1.4 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - commons-io commons-io 2.11.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile + + + javax.servlet + javax.servlet-api + 3.1.0 + runtime - jackson-module-kotlin - com.fasterxml.jackson.module + spring-boot-starter-tomcat + * + + + spring-boot-starter-jetty + * - junit - junit - 4.13.2 - test + javax.websocket + javax.websocket-api + 1.0 + runtime - jackson-module-kotlin - com.fasterxml.jackson.module + spring-boot-starter-tomcat + * - * - org.hamcrest + spring-boot-starter-jetty + * + + junit + junit + 4.13.2 + test + org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/pom.xml b/intermediate/pom.xml deleted file mode 100644 index 827c85dd6..000000000 --- a/intermediate/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - intermediate - 5.5.0 - https://projects.spring.io/spring-integration - - SpringIO - https://spring.io - - - - The Apache Software License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index f934f191d..ad3c73ce6 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples rest-http - 5.5.0 - Spring Integration Rest HTTP Path Usage Demo - Spring Integration Rest HTTP Path Usage Demo - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,234 +47,193 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-http compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-webmvc compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-oxm compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-tx compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-jdbc compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-context compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-aop compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - com.fasterxml.jackson.core jackson-databind compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.security spring-security-web - 5.5.4 + 6.0.0-M1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.security spring-security-config - 5.5.4 + 6.0.0-M1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - com.sun.xml.bind jaxb-impl 2.3.3 compile + + + javax.servlet + javax.servlet-api + 3.1.0 + runtime - jackson-module-kotlin - com.fasterxml.jackson.module + spring-boot-starter-tomcat + * + + + spring-boot-starter-jetty + * - junit - junit - 4.13.2 - test + javax.websocket + javax.websocket-api + 1.0 + runtime - jackson-module-kotlin - com.fasterxml.jackson.module + spring-boot-starter-tomcat + * - * - org.hamcrest + spring-boot-starter-jetty + * + + junit + junit + 4.13.2 + test + org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index d2bbdb594..cb8c5de59 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples retry-and-more - 5.5.0 - Retry and More Sample - Retry and More Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,61 +47,37 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-stream compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-amqp compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-ftp compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-file compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 compile - - jackson-module-kotlin - com.fasterxml.jackson.module - * org.hamcrest @@ -115,88 +89,99 @@ hamcrest-library 2.2 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api + test org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index d90448a0b..fc5a76965 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper - 5.5.0 - Splitter-Aggregator-Reaper Sample - Splitter-Aggregator-Reaper Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,133 +47,108 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-core compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - - - javax.inject - javax.inject - 1 - compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java b/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java index 575838964..6a8747375 100644 --- a/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java +++ b/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java @@ -18,10 +18,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import javax.inject.Inject; - import org.junit.Test; import org.junit.runner.RunWith; + +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.samples.splitteraggregator.support.TestUtils; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; @@ -40,13 +40,13 @@ @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) public class TestSplitterAggregator { - @Inject + @Autowired SearchRequestor searchRequestor; - @Inject + @Autowired SearchA searchA; - @Inject + @Autowired SearchB searchB; /** diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 9e8716259..b902e2d31 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples stored-procedures-derby - 5.5.0 - Derby Stored Procedures Sample - Derby Stored Procedures Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,133 +47,114 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-jdbc compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.derby derby 10.14.2.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 387eae4e5..555c100e6 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples stored-procedures-ms - 5.5.0 - MS SQLServer Stored Procedures Sample - MS SQLServer Stored Procedures Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,145 +47,120 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-jdbc compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - net.sourceforge.jtds jtds 1.2.6 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - c3p0 + com.mchange c3p0 - 0.9.1.2 + 0.9.5.5 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index b721c414c..5c828dcdf 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples stored-procedures-oracle - 5.5.0 - Oracle Stored Procedures Sample - Oracle Stored Procedures Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,133 +47,114 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-jdbc compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - com.oracle.ojdbc ojdbc8 19.3.0.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 3a9a8a397..9fe8c1bbb 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples stored-procedures-postgresql - 5.5.0 - PostgreSQL Stored Procedures Sample - PostgreSQL Stored Procedures Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,157 +47,126 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-jdbc compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.postgresql postgresql 42.2.14 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.commons commons-dbcp2 - 2.8.0 + 2.9.0 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - commons-pool - commons-pool - 1.5.4 + org.apache.commons + commons-pool2 + 2.11.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 143a7c2aa..0fa7add77 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -1,24 +1,18 @@ - + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.0-SNAPSHOT - org.springframework.integration.samples tcp-async-bi-directional - 5.5.0 - Bi-Directional TCP Sample - Bi-Directional TCP Sample - https://projects.spring.io/spring-integration + 6.0.0 + pom + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +31,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -54,146 +48,132 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.boot spring-boot-starter-integration compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-ip compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.boot spring-boot-dependencies - 2.6.0-SNAPSHOT + 3.0.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.8.2 import pom com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.0.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 1b45b651d..083bb5523 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex - 5.5.0 - TCP Client Server Multiplexing Sample - TCP Client Server Multiplexing Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,121 +47,108 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-ip compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 631943895..6710c65a8 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -1,24 +1,18 @@ - + 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.6.0-SNAPSHOT - org.springframework.integration.samples testcontainers-rabbitmq - 5.5.0 - Testcontainers RabbitMQ Sample - Testcontainers RabbitMQ Sample - https://projects.spring.io/spring-integration + 6.0.0 + pom + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -37,7 +31,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -54,214 +48,166 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.boot spring-boot-starter-integration compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-amqp compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-json compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.boot spring-boot-starter-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - junit-vintage-engine - org.junit.vintage - - org.springframework.amqp spring-rabbit-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.cloud spring-cloud-starter test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.testcontainers junit-jupiter 1.16.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - com.playtika.testcontainers embedded-rabbitmq - 1.42 + 2.0.19 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.springframework.cloud spring-cloud-dependencies - 2021.0.0-SNAPSHOT + 2022.0.0-SNAPSHOT import pom org.springframework.boot spring-boot-dependencies - 2.6.0-SNAPSHOT + 3.0.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.8.2 import pom com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.0.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/testcontainers-rabbitmq/src/test/java/org/springframework/integration/samples/testcontainersrabbitmq/Receiver.java b/intermediate/testcontainers-rabbitmq/src/test/java/org/springframework/integration/samples/testcontainersrabbitmq/Receiver.java index f54d94c18..19a0aea1f 100644 --- a/intermediate/testcontainers-rabbitmq/src/test/java/org/springframework/integration/samples/testcontainersrabbitmq/Receiver.java +++ b/intermediate/testcontainers-rabbitmq/src/test/java/org/springframework/integration/samples/testcontainersrabbitmq/Receiver.java @@ -20,8 +20,6 @@ import java.util.Map; import java.util.Random; -import javax.annotation.PostConstruct; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,6 +30,8 @@ import org.springframework.messaging.handler.annotation.SendTo; import org.springframework.stereotype.Component; +import jakarta.annotation.PostConstruct; + @Component public class Receiver { diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 58512798d..0d7e20f60 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples travel - 5.5.0 - Travel Services Sample - Travel Services Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,143 +47,118 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-ws compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-http compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework spring-web compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index c93fe16aa..750d8ff62 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -1,19 +1,17 @@ - + 4.0.0 org.springframework.integration.samples tx-synch - 5.5.0 - Transaction Synchronization Sample - Transaction Synchronization Sample - https://projects.spring.io/spring-integration + 6.0.0 + https://github.com/spring-projects/spring-integration-samples - SpringIO - https://spring.io + Spring IO + https://spring.io/projects/spring-integration - The Apache Software License, Version 2.0 + Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -32,7 +30,7 @@ Gary Russell grussell@vmware.com - lead emeritus + project lead emeritus @@ -49,144 +47,119 @@ scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git https://github.com/spring-projects/spring-integration-samples + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + org.springframework.integration spring-integration-jdbc compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.springframework.integration spring-integration-file compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - com.h2database h2 - 1.4.200 + 2.1.210 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 compile - - - jackson-module-kotlin - com.fasterxml.jackson.module - - junit junit 4.13.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.hamcrest hamcrest-library 2.2 test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - org.mockito mockito-core - 3.11.2 + 4.2.0 + test + + + org.junit.jupiter + junit-jupiter-api test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - - * - org.hamcrest - - org.springframework.integration spring-integration-test test - - - jackson-module-kotlin - com.fasterxml.jackson.module - - + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/libs-milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/libs-snapshot - - + + org.junit + junit-bom + 5.8.2 + import + pom + com.fasterxml.jackson jackson-bom - 2.12.1 + 2.13.1 import pom org.springframework spring-framework-bom - 5.3.15 + 6.0.0-M2 import pom org.springframework.integration spring-integration-bom - 5.5.8 + 6.0.0-M1 import pom + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + From db9db657a37696e1aa56f0fe84cbcc23deeb40b8 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 10 Mar 2022 09:42:54 -0500 Subject: [PATCH 280/356] Upgrade to Gradle 7.4.1 --- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 257 ++++++++++++++--------- 3 files changed, 154 insertions(+), 105 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 GIT binary patch delta 20926 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 i_W%EDg1>@4`_NK(#)z|gdCiK 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e5897b..00e33edef 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c8..1b6c78733 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" From 1aa24b6577e4d42a471718b0effc57b5cffb3ac6 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 24 Mar 2022 12:02:16 -0400 Subject: [PATCH 281/356] Upgrade dependencies and various fixes * Remove usage of removed `org.springframework.util.SocketUtils` in favor of OS-selected port * Migrate mail tests to Greenmail instead of already obsolete (and soon to be removed) `org.springframework.integration.test.mail.TestMailServer` --- advanced/advanced-testing-examples/pom.xml | 4 +- advanced/dynamic-ftp/pom.xml | 4 +- advanced/dynamic-tcp-client/pom.xml | 4 +- applications/cafe-scripted/pom.xml | 4 +- applications/cafe/cafe-amqp/pom.xml | 4 +- applications/cafe/cafe-jms/pom.xml | 4 +- applications/cafe/cafe-si/pom.xml | 4 +- applications/file-split-ftp/pom.xml | 10 +- .../samples/filesplit/Application.java | 29 ++- .../samples/filesplit/ApplicationTests.java | 89 ++++--- applications/loan-broker/pom.xml | 4 +- applications/loanshark/pom.xml | 4 +- applications/stomp-chat/pom.xml | 4 +- basic/amqp/pom.xml | 4 +- basic/barrier/pom.xml | 4 +- basic/control-bus/pom.xml | 4 +- basic/enricher/pom.xml | 4 +- basic/feed/pom.xml | 4 +- basic/file/pom.xml | 4 +- basic/ftp/pom.xml | 4 +- basic/helloworld/pom.xml | 4 +- basic/http/pom.xml | 4 +- basic/jdbc/pom.xml | 4 +- basic/jms/pom.xml | 4 +- basic/jmx/pom.xml | 4 +- basic/jpa/pom.xml | 4 +- basic/kafka/pom.xml | 4 +- basic/mail/pom.xml | 4 +- basic/mongodb/pom.xml | 4 +- basic/mqtt/pom.xml | 4 +- basic/oddeven/pom.xml | 4 +- basic/quote/pom.xml | 4 +- basic/sftp/pom.xml | 4 +- basic/tcp-amqp/pom.xml | 4 +- basic/tcp-broadcast/pom.xml | 4 +- .../tcpbroadcast/TcpBroadcastApplication.java | 4 +- basic/tcp-client-server/pom.xml | 4 +- .../samples/tcpclientserver/Main.java | 69 ++--- .../tcpClientServerDemo-context.xml | 3 +- ...tcpClientServerDemo-conversion-context.xml | 2 +- ...tcpServerConnectionDeserialize-context.xml | 2 +- .../tcpServerCustomSerialize-context.xml | 2 +- basic/tcp-with-headers/pom.xml | 4 +- basic/testing-examples/pom.xml | 4 +- basic/twitter/pom.xml | 4 +- basic/web-sockets/pom.xml | 4 +- basic/ws-inbound-gateway/pom.xml | 4 +- basic/ws-outbound-gateway/pom.xml | 4 +- basic/xml/pom.xml | 4 +- basic/xmpp/pom.xml | 4 +- build.gradle | 9 +- dsl/cafe-dsl/pom.xml | 4 +- dsl/kafka-dsl/pom.xml | 4 +- dsl/si4demo/pom.xml | 4 +- intermediate/async-gateway/pom.xml | 4 +- intermediate/dynamic-poller/pom.xml | 4 +- intermediate/errorhandling/pom.xml | 4 +- intermediate/file-processing/pom.xml | 4 +- intermediate/mail-attachments/pom.xml | 4 +- .../MimeMessageParsingTest.java | 236 ------------------ intermediate/monitoring/pom.xml | 4 +- intermediate/multipart-http/pom.xml | 4 +- intermediate/rest-http/pom.xml | 8 +- intermediate/retry-and-more/pom.xml | 4 +- .../splitter-aggregator-reaper/pom.xml | 4 +- intermediate/stored-procedures-derby/pom.xml | 4 +- intermediate/stored-procedures-ms/pom.xml | 4 +- intermediate/stored-procedures-oracle/pom.xml | 4 +- .../stored-procedures-postgresql/pom.xml | 4 +- intermediate/tcp-async-bi-directional/pom.xml | 4 +- ...TcpAsyncBiDirectionalApplicationTests.java | 4 +- .../tcp-client-server-multiplex/pom.xml | 4 +- ...tcpClientServerDemo-conversion-context.xml | 8 +- .../TcpClientServerDemoTest.java | 75 +++--- .../support/CustomTestContextLoader.java | 60 ----- intermediate/testcontainers-rabbitmq/pom.xml | 4 +- intermediate/travel/pom.xml | 4 +- intermediate/tx-synch/pom.xml | 4 +- 78 files changed, 284 insertions(+), 574 deletions(-) delete mode 100644 intermediate/mail-attachments/src/test/java/org/springframework/integration/samples/mailattachments/MimeMessageParsingTest.java delete mode 100644 intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/support/CustomTestContextLoader.java diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index b147d5477..af4ab8422 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index e2c72394b..e91bfd12d 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 683c7d0c5..920d1935f 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index e33277bfa..fb4bc5cd6 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 7bf360ea8..bea8a960b 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index a205e81f2..612691f95 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -156,14 +156,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 59789955a..018888119 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index ff2dbf779..0c5a68135 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -117,6 +117,12 @@ spring-boot-starter-test test + + com.icegreen + greenmail + 2.0.0-alpha-2 + test + org.junit.jupiter junit-jupiter-engine @@ -159,14 +165,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java index cb8121193..7555f4cb7 100644 --- a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java +++ b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.mail.MailProperties; import org.springframework.context.annotation.Bean; import org.springframework.integration.dsl.IntegrationFlow; @@ -34,6 +33,7 @@ import org.springframework.integration.dsl.Pollers; import org.springframework.integration.file.FileHeaders; import org.springframework.integration.file.FileWritingMessageHandler; +import org.springframework.integration.file.dsl.FileWritingMessageHandlerSpec; import org.springframework.integration.file.dsl.Files; import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.file.splitter.FileSplitter; @@ -67,11 +67,11 @@ public static void main(String[] args) { @Bean public IntegrationFlow fromFile() { return IntegrationFlows.from( - Files.inboundAdapter(new File("/tmp/in")) - .preventDuplicates(false) - .patternFilter("*.txt"), e -> e.poller(Pollers.fixedDelay(5000) - .errorChannel("tfrErrors.input")) - .id("fileInboundChannelAdapter")) + Files.inboundAdapter(new File("/tmp/in")) + .preventDuplicates(false) + .patternFilter("*.txt"), e -> e.poller(Pollers.fixedDelay(5000) + .errorChannel("tfrErrors.input")) + .id("fileInboundChannelAdapter")) .handle(Files.splitter(true, true)) .>route(Object::getClass, m -> m .channelMapping(FileSplitter.FileMarker.class, "markers.input") @@ -90,11 +90,10 @@ public IntegrationFlow lines(FileWritingMessageHandler fileOut) { } @Bean - public FileWritingMessageHandler fileOut() { + public FileWritingMessageHandlerSpec fileOut() { return Files.outboundAdapter("'/tmp/out'") .appendNewLine(true) - .fileNameExpression("payload.substring(1, 4) + '.txt'") - .get(); + .fileNameExpression("payload.substring(1, 4) + '.txt'"); } /** @@ -106,7 +105,7 @@ public FileWritingMessageHandler fileOut() { @Bean public IntegrationFlow markers() { return f -> f.filter(m -> m.getMark().equals(FileSplitter.FileMarker.Mark.END), - e -> e.id("markerFilter")) + e -> e.id("markerFilter")) .publishSubscribeChannel(s -> s // first trigger file flushes @@ -133,7 +132,7 @@ public IntegrationFlow markers() { .enrichHeaders(Mail.headers() .subject("File successfully split and transferred") .from("foo@bar") - .toFunction(m -> new String[] { "bar@baz" })) + .toFunction(m -> new String[]{ "bar@baz" })) .enrichHeaders(h -> h.header(EMAIL_SUCCESS_SUFFIX, ".success")) .channel("toMail.input"))); } @@ -176,12 +175,12 @@ public IntegrationFlow tfrErrors() { .enrichHeaders(Mail.headers() .subject("File split and transfer failed") .from("foo@bar") - .toFunction(m -> new String[] { "bar@baz" })) + .toFunction(m -> new String[]{ "bar@baz" })) .enrichHeaders(h -> h.header(EMAIL_SUCCESS_SUFFIX, ".failed") .headerExpression(FileHeaders.ORIGINAL_FILE, "payload.failedMessage.headers['" + FileHeaders.ORIGINAL_FILE + "']")) .transform(p -> - p.getFailedMessage().getPayload().toString() + "\n" + getStackTraceAsString(p)) + p.getFailedMessage().getPayload() + "\n" + getStackTraceAsString(p)) .channel("toMail.input"); } @@ -189,7 +188,7 @@ public IntegrationFlow tfrErrors() { public IntegrationFlow toMail() { return f -> f .handle(Mail.outboundAdapter(this.mailProperties.getHost()) -// .javaMailProperties(b -> b.put("mail.debug", "true")) + // .javaMailProperties(b -> b.put("mail.debug", "true")) .port(this.mailProperties.getPort()) .credentials(this.mailProperties.getUsername(), this.mailProperties.getPassword()), e -> e.id("mailOut").advice(afterMailAdvice())); diff --git a/applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java b/applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java index 788687aa3..6f73b7fa3 100644 --- a/applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java +++ b/applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,15 +30,14 @@ import java.io.FileReader; import java.io.IOException; import java.io.InputStream; -import java.util.List; import org.apache.commons.io.FileUtils; import org.apache.commons.net.ftp.FTPFile; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -49,19 +48,22 @@ import org.springframework.integration.file.remote.session.Session; import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.test.context.SpringIntegrationTest; -import org.springframework.integration.test.mail.TestMailServer; -import org.springframework.integration.test.mail.TestMailServer.SmtpServer; import org.springframework.integration.test.util.TestUtils; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringRunner; -@RunWith(SpringRunner.class) +import com.icegreen.greenmail.store.FolderException; +import com.icegreen.greenmail.util.GreenMail; +import com.icegreen.greenmail.util.ServerSetup; +import com.icegreen.greenmail.util.ServerSetupTest; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; + @SpringBootTest(properties = "spring.main.allow-bean-definition-overriding=true") @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) @SpringIntegrationTest(noAutoStartup = "fileInboundChannelAdapter") public class ApplicationTests { - private static final SmtpServer smtpServer = TestMailServer.smtp(0); + private static GreenMail mailServer; @Autowired private Session session; @@ -69,23 +71,31 @@ public class ApplicationTests { @Autowired private SourcePollingChannelAdapter fileInboundChannelAdapter; - @BeforeClass + @BeforeAll public static void setup() { + ServerSetup smtp = ServerSetupTest.SMTP.dynamicPort(); + smtp.setServerStartupTimeout(10000); + mailServer = new GreenMail(smtp); + mailServer.setUser("bar@bar@baz", "user", "pw"); + mailServer.start(); // Configure the boot property to send email to the test email server. - System.setProperty("spring.mail.port", Integer.toString(smtpServer.getPort())); + System.setProperty("spring.mail.port", Integer.toString(mailServer.getSmtp().getPort())); } - @Before - public void beforeTest() throws IOException { - smtpServer.getMessages().clear(); - - tearDown(); + @AfterAll + static void tearDown() { + mailServer.stop(); + } + @BeforeEach + public void beforeTest() throws FolderException, IOException { + mailServer.purgeEmailFromAllMailboxes(); + cleanup(); this.fileInboundChannelAdapter.start(); } - @After - public void tearDown() throws IOException { + @AfterEach + public void cleanup() throws IOException { File inDir = new File("/tmp/in"); if (inDir.exists()) { FileUtils.cleanDirectory(inDir); @@ -97,22 +107,21 @@ public void tearDown() throws IOException { } } - @SuppressWarnings("unchecked") @Test public void testSuccess() throws Exception { - String message = runTest(false); - assertThat(message).contains("File successfully split and transferred"); - assertThat(message).contains(TestUtils.applySystemFileSeparator("/tmp/in/foo.txt")); + MimeMessage message = runTest(false); + assertThat(message.getSubject()).isEqualTo("File successfully split and transferred"); + assertThat(message.getContent()).asString().contains(TestUtils.applySystemFileSeparator("/tmp/in/foo.txt")); } @Test public void testFailure() throws Exception { willThrow(new RuntimeException("fail test exception")) .given(this.session).write(any(InputStream.class), eq("foo/002.txt.writing")); - String message = runTest(true); - assertThat(message).contains("File split and transfer failed"); - assertThat(message).contains("fail test exception"); - assertThat(message).contains(TestUtils.applySystemFileSeparator("/tmp/out/002.txt")); + MimeMessage message = runTest(true); + assertThat(message.getSubject()).isEqualTo("File split and transfer failed"); + assertThat(message.getContent()).asString().contains("fail test exception"); + assertThat(message.getContent()).asString().contains(TestUtils.applySystemFileSeparator("/tmp/out/002.txt")); } /* @@ -121,7 +130,7 @@ public void testFailure() throws Exception { * Verify the input file was renamed based on success/failure. * Verify the email was sent. */ - private String runTest(boolean fail) throws Exception { + private MimeMessage runTest(boolean fail) throws Exception { File in = new File("/tmp/in/", "foo"); FileOutputStream fos = new FileOutputStream(in); fos.write("*002,foo,bar\n*006,baz,qux\n*009,fiz,buz\n".getBytes()); @@ -175,20 +184,18 @@ private String runTest(boolean fail) throws Exception { verify(this.session).rename("foo/009.txt.writing", "foo/009.txt"); } - String message = verifyMail(); - assertThat(message).contains("From: foo@bar"); - assertThat(message).contains("To: bar@baz"); + MimeMessage message = verifyMail(); + assertThat(message.getFrom()).containsOnly(new InternetAddress("foo@bar")); + assertThat(message.getRecipients(MimeMessage.RecipientType.TO)).containsOnly(new InternetAddress("bar@baz")); return message; } - public String verifyMail() throws Exception { - List messages = smtpServer.getMessages(); - int n = 0; - while (n++ < 100 && messages.size() < 1) { - Thread.sleep(100); - } - assertThat(messages).hasSize(1); - return messages.get(0); + public MimeMessage verifyMail() { + mailServer.waitForIncomingEmail(10000, 1); + MimeMessage[] mail = mailServer.getReceivedMessagesForDomain("baz"); + assertThat(mail).hasSize(1); + MimeMessage message = mail[0]; + return message; } /** diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 5810a631d..844375372 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 9c3249c2a..0f4910927 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -325,14 +325,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index b2074a94c..e35837a32 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index e73bdf29b..380eeb28d 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index e73417c5b..30f06150b 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index d94213ccc..027db46bd 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 79251d21a..e27e1c990 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 92f8fd647..6f4e7e11e 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 0d8beefdd..0ad9aae0f 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 739762d59..f9b3403dd 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -150,14 +150,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 2f4398311..f94cd3f94 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index e54cce16c..0b70047e9 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 3a677ee9d..011b4d688 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 0655f283b..52ac0c732 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index db28f9a69..51d3ae272 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index e0731b208..a93bfead7 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 25c439d41..6aa9802ab 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index c04e114ab..0d47e3ec0 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 62cf2e2df..fcf9e4155 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 1be66c496..0148da520 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index a32800157..5f59b2de4 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 12ef7f1a4..13b4e6878 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 8c07039de..9ea159bea 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index b6e112e76..d6f05e69c 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 3bedf993b..e3acd54c4 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java b/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java index 054e5218f..8dd551a7a 100644 --- a/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java +++ b/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 the original author or authors. + * Copyright 2018-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -98,7 +98,7 @@ public IntegrationFlow toTcp(AbstractServerConnectionFactory serverFactory) { } /* - * Excutor for clients. + * Executor for clients. */ @Bean public ThreadPoolTaskExecutor exec() { diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 98ac6a76e..e16dd2a1e 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/Main.java b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/Main.java index ca5874e2b..49e3a9120 100644 --- a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/Main.java +++ b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/Main.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,14 @@ package org.springframework.integration.samples.tcpclientserver; -import java.util.HashMap; -import java.util.Map; import java.util.Scanner; -import org.springframework.context.support.GenericXmlApplicationContext; -import org.springframework.core.env.MapPropertySource; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.endpoint.AbstractEndpoint; +import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; import org.springframework.integration.ip.util.TestingUtilities; -import org.springframework.util.SocketUtils; /** * Demonstrates the use of a gateway as an entry point into the integration flow. @@ -50,12 +49,11 @@ */ public final class Main { - private static final String AVAILABLE_SERVER_SOCKET = "availableServerSocket"; - /** * Prevent instantiation. */ - private Main() {} + private Main() { + } /** * Load the Spring Integration Application Context @@ -66,22 +64,28 @@ public static void main(final String... args) { final Scanner scanner = new Scanner(System.in); - System.out.println("\n=========================================================" - + "\n " - + "\n Welcome to the Spring Integration " - + "\n TCP-Client-Server Sample! " - + "\n " - + "\n For more information please visit: " - + "\n https://www.springsource.org/spring-integration/ " - + "\n " - + "\n========================================================="); - - final GenericXmlApplicationContext context = Main.setupContext(); + System.out.println(""" + + ========================================================= + \s + Welcome to the Spring Integration \s + TCP-Client-Server Sample! \s + \s + For more information please visit: \s + https://www.springsource.org/spring-integration/ \s + \s + ========================================================="""); + + final ConfigurableApplicationContext context = Main.setupContext(); final SimpleGateway gateway = context.getBean(SimpleGateway.class); final AbstractServerConnectionFactory crLfServer = context.getBean(AbstractServerConnectionFactory.class); + final AbstractClientConnectionFactory client = context.getBean(AbstractClientConnectionFactory.class); + final AbstractEndpoint outGateway = context.getBean("outGateway", AbstractEndpoint.class); System.out.print("Waiting for server to accept connections..."); TestingUtilities.waitListening(crLfServer, 10000L); + client.setPort(crLfServer.getPort()); + outGateway.start(); System.out.println("running.\n\n"); System.out.println("Please enter some text and press : "); @@ -107,32 +111,13 @@ public static void main(final String... args) { } System.out.println("Exiting application...bye."); + context.close(); System.exit(0); } - public static GenericXmlApplicationContext setupContext() { - final GenericXmlApplicationContext context = new GenericXmlApplicationContext(); - - if (System.getProperty(AVAILABLE_SERVER_SOCKET) == null) { - System.out.print("Detect open server socket..."); - int availableServerSocket = SocketUtils.findAvailableTcpPort(5678); - - final Map sockets = new HashMap<>(); - sockets.put(AVAILABLE_SERVER_SOCKET, availableServerSocket); - - final MapPropertySource propertySource = new MapPropertySource("sockets", sockets); - - context.getEnvironment().getPropertySources().addLast(propertySource); - } - - System.out.println("using port " + context.getEnvironment().getProperty(AVAILABLE_SERVER_SOCKET)); - - context.load("classpath:META-INF/spring/integration/tcpClientServerDemo-context.xml"); - context.registerShutdownHook(); - context.refresh(); - - return context; + public static ConfigurableApplicationContext setupContext() { + return new ClassPathXmlApplicationContext("META-INF/spring/integration/tcpClientServerDemo-context.xml"); } } diff --git a/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-context.xml b/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-context.xml index 30cceb93c..4fea27349 100644 --- a/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-context.xml +++ b/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-context.xml @@ -27,6 +27,7 @@ + port="0"/> + port="0"/> diff --git a/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpServerCustomSerialize-context.xml b/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpServerCustomSerialize-context.xml index 02c568c21..47c185d1a 100644 --- a/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpServerCustomSerialize-context.xml +++ b/basic/tcp-client-server/src/main/resources/META-INF/spring/integration/tcpServerCustomSerialize-context.xml @@ -17,7 +17,7 @@ formatted with the Stx-Etx bytes. --> org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 4d602ad31..46a69c392 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -141,14 +141,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 55db0db7b..232ea079f 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -127,14 +127,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index fa514d1da..86b2dfa11 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index d1ccfc583..2eae2d5bf 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -168,14 +168,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index d64f27e17..2995f49d2 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index d95c16e9e..b92e57a6f 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index fa0aa1522..99c6c3a15 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/build.gradle b/build.gradle index 75de3ee5c..7623b65a7 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ allprojects { maven { url 'https://repo.spring.io/release' } maven { url 'https://repo.spring.io/milestone' } maven { url 'https://repo.spring.io/snapshot' } -// maven { url 'https://repo.spring.io/libs-staging-local' } + maven { url 'https://repo.spring.io/libs-staging-local' } } } @@ -260,11 +260,11 @@ subprojects { subproject -> postgresVersion = '42.2.14' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.0-SNAPSHOT' - springIntegrationVersion = '6.0.0-M1' + springIntegrationVersion = '6.0.0-M2' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.0.0-M2' - springSecurityVersion = '6.0.0-M1' + springVersion = '6.0.0-M3' + springSecurityVersion = '6.0.0-M2' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.16.2' tilesJspVersion = '2.2.1' @@ -1494,6 +1494,7 @@ project('file-split-ftp') { testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.integration:spring-integration-test' + testImplementation "com.icegreen:greenmail:2.0.0-alpha-2" } springBoot { diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 971ee97cf..01e88e71d 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -149,14 +149,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 070b96c9c..37b9824a3 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -149,14 +149,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index fd414ac34..3307393e0 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index d8efd2de9..61811aa58 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 4dbdf8998..fbc9dd26f 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 04ab82581..9f8bd4f39 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 07ac1735b..00c9bdf20 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 48b934b4f..35b6b2478 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/mail-attachments/src/test/java/org/springframework/integration/samples/mailattachments/MimeMessageParsingTest.java b/intermediate/mail-attachments/src/test/java/org/springframework/integration/samples/mailattachments/MimeMessageParsingTest.java deleted file mode 100644 index c4af31bd3..000000000 --- a/intermediate/mail-attachments/src/test/java/org/springframework/integration/samples/mailattachments/MimeMessageParsingTest.java +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.samples.mailattachments; - -import org.springframework.integration.samples.mailattachments.support.EmailFragment; - -/** - * Test to verify the correct parsing of Email Messages. - * - * @author Gunnar Hillert - * @author Gary Russell - * @author Artem Bilan - * - * @since 2.2 - */ -public class MimeMessageParsingTest { - -/* - private static final Log LOGGER = LogFactory.getLog(MimeMessageParsingTest.class); - - private Wiser wiser; - - private int wiserPort; - - @Before - public void startWiser() { - - this.wiserPort = SocketUtils.findAvailableTcpPort(2500); - - wiser = new Wiser(); - wiser.setPort(this.wiserPort); - wiser.start(); - LOGGER.info("Wiser was started."); - - } - - */ - /** - * This test will create a Mime Message that contains an Attachment, send it - * to an SMTP Server (Using Wiser) and retrieve and process the Mime Message. - * - * This test verifies that the parsing of the retrieved Mime Message is - * successful and that the correct number of {@link EmailFragment}s is created. - *//* - - @Test - public void testProcessingOfEmailAttachments() { - - final JavaMailSenderImpl mailSender = new JavaMailSenderImpl(); - mailSender.setPort(this.wiserPort); - - final MimeMessage message = mailSender.createMimeMessage(); - final String pictureName = "picture.png"; - - final ByteArrayResource byteArrayResource = getFileData(pictureName); - - try { - - final MimeMessageHelper helper = new MimeMessageHelper(message, true); - - helper.setFrom("testfrom@springintegration.org"); - helper.setTo("testto@springintegration.org"); - helper.setSubject("Parsing of Attachments"); - helper.setText("Spring Integration Rocks!"); - - helper.addAttachment(pictureName, byteArrayResource, "image/png"); - - } - catch (MessagingException e) { - throw new MailParseException(e); - } - - mailSender.send(message); - - final List wiserMessages = wiser.getMessages(); - - Assert.assertTrue(wiserMessages.size() == 1); - - boolean foundTextMessage = false; - boolean foundPicture = false; - - for (WiserMessage wiserMessage : wiserMessages) { - - final List emailFragments = new ArrayList<>(); - - try { - final MimeMessage mailMessage = wiserMessage.getMimeMessage(); - EmailParserUtils.handleMessage(null, mailMessage, emailFragments); - } - catch (MessagingException e) { - throw new IllegalStateException("Error while retrieving Mime Message."); - } - - Assert.assertTrue(emailFragments.size() == 2); - - for (EmailFragment emailFragment : emailFragments) { - if ("picture.png".equals(emailFragment.getFilename())) { - foundPicture = true; - } - - if ("message.txt".equals(emailFragment.getFilename())) { - foundTextMessage = true; - } - } - - Assert.assertTrue(foundPicture); - Assert.assertTrue(foundTextMessage); - - } - } - - */ - /** - * This test will create a Mime Message that in return contains another - * mime message. The nested mime message contains an attachment. - * - * The root message consist of both HTML and Text message. - * - *//* - - @Test - public void testProcessingOfNestedEmailAttachments() { - - final JavaMailSenderImpl mailSender = new JavaMailSenderImpl(); - mailSender.setPort(this.wiserPort); - - final MimeMessage rootMessage = mailSender.createMimeMessage(); - - try { - - final MimeMessageHelper messageHelper = new MimeMessageHelper(rootMessage, true); - - messageHelper.setFrom("testfrom@springintegration.org"); - messageHelper.setTo("testto@springintegration.org"); - messageHelper.setSubject("Parsing of Attachments"); - messageHelper.setText("Spring Integration Rocks!", "Spring Integration Rocks!"); - - final String pictureName = "picture.png"; - - final ByteArrayResource byteArrayResource = getFileData(pictureName); - - messageHelper.addInline("picture12345", byteArrayResource, "image/png"); - - } - catch (MessagingException e) { - throw new MailParseException(e); - } - - mailSender.send(rootMessage); - - final List wiserMessages = wiser.getMessages(); - - Assert.assertTrue(wiserMessages.size() == 1); - - boolean foundTextMessage = false; - boolean foundPicture = false; - boolean foundHtmlMessage = false; - - for (WiserMessage wiserMessage : wiserMessages) { - - List emailFragments = new ArrayList<>(); - - try { - - final MimeMessage mailMessage = wiserMessage.getMimeMessage(); - EmailParserUtils.handleMessage(null, mailMessage, emailFragments); - - } catch (MessagingException e) { - throw new IllegalStateException("Error while retrieving Mime Message."); - } - - Assert.assertTrue(emailFragments.size() == 3); - - for (EmailFragment emailFragment : emailFragments) { - if ("".equals(emailFragment.getFilename())) { - foundPicture = true; - } - - if ("message.txt".equals(emailFragment.getFilename())) { - foundTextMessage = true; - } - - if ("message.html".equals(emailFragment.getFilename())) { - foundHtmlMessage = true; - } - } - - Assert.assertTrue(foundPicture); - Assert.assertTrue(foundTextMessage); - Assert.assertTrue(foundHtmlMessage); - - } - } - - private ByteArrayResource getFileData(String filename) { - - final InputStream attachmentInputStream = MimeMessageParsingTest.class.getResourceAsStream(filename); - - Assert.assertNotNull("Resource not found: " + filename, attachmentInputStream); - - ByteArrayResource byteArrayResource = null; - - try { - byteArrayResource = new ByteArrayResource(IOUtils.toByteArray(attachmentInputStream)); - attachmentInputStream.close(); - } - catch (IOException e1) { - Assert.fail(); - } - - return byteArrayResource; - - } - - @After - public void stopWiser() { - wiser.stop(); - LOGGER.info("Wiser stopped."); - } -*/ - -} diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 78e24ab72..a66d0a2d2 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index af38e3ffd..ee19baad2 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index ad3c73ce6..5914fa71a 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -95,13 +95,13 @@ org.springframework.security spring-security-web - 6.0.0-M1 + 6.0.0-M2 compile org.springframework.security spring-security-config - 6.0.0-M1 + 6.0.0-M2 compile @@ -211,14 +211,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index cb8c5de59..bd7832ad2 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index fc5a76965..60eb6a39f 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index b902e2d31..32f6f76b9 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 555c100e6..8e199c59f 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 5c828dcdf..7cc66717d 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 9fe8c1bbb..c683150fe 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -144,14 +144,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 0fa7add77..53007fc96 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/tcp-async-bi-directional/src/test/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplicationTests.java b/intermediate/tcp-async-bi-directional/src/test/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplicationTests.java index 7dea93403..d6a50af11 100644 --- a/intermediate/tcp-async-bi-directional/src/test/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplicationTests.java +++ b/intermediate/tcp-async-bi-directional/src/test/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 the original author or authors. + * Copyright 2020-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,9 +33,11 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.ChannelInterceptor; +import org.springframework.test.annotation.DirtiesContext; @SpringBootTest @SpringIntegrationTest(noAutoStartup = { "client1Adapter", "client2Adapter" }) +@DirtiesContext class TcpAsyncBiDirectionalApplicationTests { @Autowired diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 083bb5523..057807b00 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml b/intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml index 13af8dc72..251c5920f 100644 --- a/intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml +++ b/intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml @@ -36,7 +36,7 @@ + @@ -84,7 +86,7 @@ diff --git a/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java b/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java index 503fab311..8559d0d12 100644 --- a/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java +++ b/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,31 +16,28 @@ package org.springframework.integration.samples.tcpclientserver; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import java.util.concurrent.BlockingQueue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.core.task.TaskExecutor; +import org.springframework.integration.endpoint.AbstractEndpoint; +import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; import org.springframework.integration.ip.util.TestingUtilities; -import org.springframework.integration.samples.tcpclientserver.support.CustomTestContextLoader; import org.springframework.messaging.MessagingException; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; /** @@ -56,9 +53,7 @@ * @since 2.1 * */ -@ContextConfiguration(loader = CustomTestContextLoader.class, - locations = { "/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml" }) -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig(locations = "/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml") @DirtiesContext public class TcpClientServerDemoTest { @@ -68,15 +63,31 @@ public class TcpClientServerDemoTest { @Autowired AbstractServerConnectionFactory crLfServer; - @Before + @Autowired + AbstractClientConnectionFactory client; + + @Autowired + @Qualifier("outAdapter.client") + AbstractEndpoint outAdapterClient; + + @Autowired + @Qualifier("inAdapter.client") + AbstractEndpoint inAdapterClient; + + @BeforeEach public void setup() { - TestingUtilities.waitListening(this.crLfServer, 10000L); + if (!this.outAdapterClient.isRunning()) { + TestingUtilities.waitListening(this.crLfServer, 10000L); + this.client.setPort(this.crLfServer.getPort()); + this.outAdapterClient.start(); + this.inAdapterClient.start(); + } } @Test public void testHappyDay() { String result = gw.send("999Hello world!"); // first 3 bytes is correlationid - assertEquals("999Hello world!:echo", result); + assertThat(result).isEqualTo("999Hello world!:echo"); } @Test @@ -88,36 +99,28 @@ public void testMultiPlex() throws Exception { results.add(i); final int j = i; executor.execute(() -> { - String result = gw.send(j + "Hello world!"); // first 3 bytes is correlationid - assertEquals(j + "Hello world!:echo", result); + String result = gw.send(j + "Hello world!"); // first 3 bytes is correlationId + assertThat(result).isEqualTo(j + "Hello world!:echo"); results.remove(j); latch.countDown(); }); } - assertTrue(latch.await(60, TimeUnit.SECONDS)); - assertEquals(0, results.size()); + assertThat(latch.await(60, TimeUnit.SECONDS)).isTrue(); + assertThat(results).hasSize(0); } @Test public void testTimeoutThrow() { - try { - gw.send("TIMEOUT_TEST_THROW"); - fail("expected exception"); - } - catch (MessagingException e) { - assertThat(e.getMessage(), containsString("No response received for TIMEOUT_TEST")); - } + assertThatExceptionOfType(MessagingException.class) + .isThrownBy(() -> gw.send("TIMEOUT_TEST_THROW")) + .withMessageContaining("No response received for TIMEOUT_TEST"); } @Test public void testTimeoutReturn() { - try { - gw.send("TIMEOUT_TEST_RETURN"); - fail("expected exception"); - } - catch (MessagingException e) { - assertThat(e.getMessage(), containsString("No response received for TIMEOUT_TEST")); - } + assertThatExceptionOfType(MessagingException.class) + .isThrownBy(() -> gw.send("TIMEOUT_TEST_RETURN")) + .withMessageContaining("No response received for TIMEOUT_TEST"); } } diff --git a/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/support/CustomTestContextLoader.java b/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/support/CustomTestContextLoader.java deleted file mode 100644 index f952646ba..000000000 --- a/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/support/CustomTestContextLoader.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2002-2017 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.integration.samples.tcpclientserver.support; - -import java.util.HashMap; -import java.util.Map; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.context.support.GenericApplicationContext; -import org.springframework.core.env.MapPropertySource; -import org.springframework.util.SocketUtils; -import org.springframework.test.context.MergedContextConfiguration; -import org.springframework.test.context.support.GenericXmlContextLoader; - -/** - * - * @author Gunnar Hillert - * @author Gary Russell - * @author Artem Bilan - * - */ -public class CustomTestContextLoader extends GenericXmlContextLoader { - - private static final Log LOGGER = LogFactory.getLog(CustomTestContextLoader.class); - - @Override - protected void loadBeanDefinitions(GenericApplicationContext context, - MergedContextConfiguration mergedConfig) { - - int availableServerSocket = SocketUtils.findAvailableTcpPort(5678); - - final Map sockets = new HashMap(); - sockets.put("availableServerSocket", availableServerSocket); - - if (LOGGER.isInfoEnabled()) { - LOGGER.info("Available Server Socket: " + availableServerSocket); - } - - final MapPropertySource propertySource = new MapPropertySource("sockets", sockets); - - context.getEnvironment().getPropertySources().addLast(propertySource); - super.loadBeanDefinitions(context, mergedConfig); - } - -} diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 6710c65a8..c9e3a51ba 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -172,14 +172,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 0d7e20f60..01ec885e6 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -136,14 +136,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 750d8ff62..c26510b9b 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-M2 + 6.0.0-M3 import pom org.springframework.integration spring-integration-bom - 6.0.0-M1 + 6.0.0-M2 import pom From 470dadbbcb377a08d042079c057b7ab5d71ed8ec Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 25 Mar 2022 08:56:13 -0400 Subject: [PATCH 282/356] Upgrade PostgreSQL to fix vulnerabilities --- build.gradle | 2 +- intermediate/stored-procedures-postgresql/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7623b65a7..69e92c4dd 100644 --- a/build.gradle +++ b/build.gradle @@ -257,7 +257,7 @@ subprojects { subproject -> mongoDriverVersion = '4.4.1' openJpaVersion = '2.4.0' oracleDriverVersion = '19.3.0.0' - postgresVersion = '42.2.14' + postgresVersion = '42.3.3' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.0-SNAPSHOT' springIntegrationVersion = '6.0.0-M2' diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index c683150fe..5057aeed9 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -60,7 +60,7 @@ org.postgresql postgresql - 42.2.14 + 42.3.3 compile From 67677e210f05565974f23b94b6722869adf81886 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 7 Apr 2022 10:51:05 -0400 Subject: [PATCH 283/356] GH-320: update README for latest project state Fixes https://github.com/spring-projects/spring-integration-samples/issues/320 --- README.md | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 0bcec5d68..d57e81fc3 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,11 @@ Spring Integration Samples # Note -This (main) branch requires Spring Integration 5.0 or above. For samples running against earlier versions of Spring Integration, use the __SI4.3.x__ and other branches. +This (main) branch requires Spring Integration 6.0 or above. +For samples running against earlier versions of Spring Integration, use the __5.5.x__ and other branches. + +The project requires now Java 17 or above. +To open the project in the IDE, use its `import` option against a `build.gradle` file from the root project directory. # Introduction @@ -25,11 +29,6 @@ Inside of each category you'll find a **README.md** file, which will contain a m * [Spring Integration][] * [Spring Integration Extensions][] -* [Spring Integration Templates][] -* [Spring Integration Java Dsl][] -* [Spring Integration Dsl Groovy][] -* [Spring Integration Dsl Scala][] -* [Spring Integration Pattern Catalog][] ## Community Sample Projects @@ -133,11 +132,6 @@ For more information, please visit the Spring Integration website at: [https://p [Spring Integration]: https://github.com/spring-projects/spring-integration [Spring Integration Extensions]: https://github.com/spring-projects/spring-integration-extensions -[Spring Integration Templates]: https://github.com/spring-projects/spring-integration-templates/tree/master/si-sts-templates -[Spring Integration Java Dsl]: https://github.com/spring-projects/spring-integration-java-dsl -[Spring Integration Dsl Groovy]: https://github.com/spring-projects/spring-integration-dsl-groovy -[Spring Integration Dsl Scala]: https://github.com/spring-projects/spring-integration-dsl-scala -[Spring Integration Pattern Catalog]: https://github.com/spring-projects/spring-integration-pattern-catalog [message store reaper]: https://docs.spring.io/spring-integration/api/org/springframework/integration/store/MessageGroupStoreReaper.html From ff51f2271668fac4d0863e13712c178e13c20207 Mon Sep 17 00:00:00 2001 From: madoc <96628276+ipanimnim@users.noreply.github.com> Date: Sat, 9 Apr 2022 19:48:27 +0300 Subject: [PATCH 284/356] Move the Note message down on the README --- README.md | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index d57e81fc3..e3cbfd3a9 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,6 @@ Spring Integration Samples ========================== -# Note - -This (main) branch requires Spring Integration 6.0 or above. -For samples running against earlier versions of Spring Integration, use the __5.5.x__ and other branches. - -The project requires now Java 17 or above. -To open the project in the IDE, use its `import` option against a `build.gradle` file from the root project directory. - -# Introduction - Welcome to the **Spring Integration Samples** repository which provides **50+ samples** to help you learn [Spring Integration][]. To simplify your experience, the *Spring Integration* samples are split into 4 distinct categories: * Basic @@ -25,6 +15,14 @@ Inside of each category you'll find a **README.md** file, which will contain a m *Happy Integration!* +# Note + +This (main) branch requires Spring Integration 6.0 or above. +For samples running against earlier versions of Spring Integration, use the __5.5.x__ and other branches. + +The project requires now Java 17 or above. +To open the project in the IDE, use its `import` option against a `build.gradle` file from the root project directory. + ## Related GitHub projects * [Spring Integration][] From dff443ce9011f4852d93210e83bc75b9fc7f2895 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 13 May 2022 10:37:52 -0400 Subject: [PATCH 285/356] Fix compatibility with the latest Spring Boot --- .../samples/websocket/standard/ApplicationTests.java | 2 +- build.gradle | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java index 5696ac79c..201db3af6 100644 --- a/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java +++ b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java @@ -32,7 +32,7 @@ import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.DirectChannel; diff --git a/build.gradle b/build.gradle index 69e92c4dd..b1419e2e5 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ allprojects { maven { url 'https://repo.spring.io/release' } maven { url 'https://repo.spring.io/milestone' } maven { url 'https://repo.spring.io/snapshot' } - maven { url 'https://repo.spring.io/libs-staging-local' } +// maven { url 'https://repo.spring.io/libs-staging-local' } } } @@ -260,11 +260,11 @@ subprojects { subproject -> postgresVersion = '42.3.3' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.0-SNAPSHOT' - springIntegrationVersion = '6.0.0-M2' + springIntegrationVersion = '6.0.0-SNAPSHOT' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.0.0-M3' - springSecurityVersion = '6.0.0-M2' + springVersion = '6.0.0-SNAPSHOT' + springSecurityVersion = '6.0.0-SNAPSHOT' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.16.2' tilesJspVersion = '2.2.1' From cf742d3b86c3e00a51aa1610fd8fed003c436244 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 18 May 2022 16:37:08 -0400 Subject: [PATCH 286/356] Upgrade to SI-6.0.0-M3 --- advanced/advanced-testing-examples/pom.xml | 4 ++-- advanced/dynamic-ftp/pom.xml | 4 ++-- advanced/dynamic-tcp-client/pom.xml | 4 ++-- applications/cafe-scripted/pom.xml | 4 ++-- applications/cafe/cafe-amqp/pom.xml | 4 ++-- applications/cafe/cafe-jms/pom.xml | 4 ++-- applications/cafe/cafe-si/pom.xml | 4 ++-- applications/file-split-ftp/pom.xml | 4 ++-- applications/loan-broker/pom.xml | 4 ++-- applications/loanshark/pom.xml | 4 ++-- applications/stomp-chat/pom.xml | 4 ++-- basic/amqp/pom.xml | 4 ++-- basic/barrier/pom.xml | 4 ++-- basic/control-bus/pom.xml | 4 ++-- basic/enricher/pom.xml | 4 ++-- basic/feed/pom.xml | 4 ++-- basic/file/pom.xml | 4 ++-- basic/ftp/pom.xml | 4 ++-- basic/helloworld/pom.xml | 4 ++-- basic/http/pom.xml | 4 ++-- basic/jdbc/pom.xml | 4 ++-- basic/jms/pom.xml | 4 ++-- basic/jmx/pom.xml | 4 ++-- basic/jpa/pom.xml | 4 ++-- basic/kafka/pom.xml | 4 ++-- basic/mail/pom.xml | 4 ++-- basic/mongodb/pom.xml | 4 ++-- basic/mqtt/pom.xml | 4 ++-- basic/oddeven/pom.xml | 4 ++-- basic/quote/pom.xml | 4 ++-- basic/sftp/pom.xml | 4 ++-- basic/tcp-amqp/pom.xml | 4 ++-- basic/tcp-broadcast/pom.xml | 4 ++-- basic/tcp-client-server/pom.xml | 4 ++-- basic/tcp-with-headers/pom.xml | 4 ++-- basic/testing-examples/pom.xml | 4 ++-- basic/twitter/pom.xml | 4 ++-- basic/web-sockets/pom.xml | 4 ++-- basic/ws-inbound-gateway/pom.xml | 4 ++-- basic/ws-outbound-gateway/pom.xml | 4 ++-- basic/xml/pom.xml | 4 ++-- basic/xmpp/pom.xml | 4 ++-- build.gradle | 2 +- dsl/cafe-dsl/pom.xml | 4 ++-- dsl/kafka-dsl/pom.xml | 4 ++-- dsl/si4demo/pom.xml | 4 ++-- intermediate/async-gateway/pom.xml | 4 ++-- intermediate/dynamic-poller/pom.xml | 4 ++-- intermediate/errorhandling/pom.xml | 4 ++-- intermediate/file-processing/pom.xml | 4 ++-- intermediate/mail-attachments/pom.xml | 4 ++-- intermediate/monitoring/pom.xml | 4 ++-- intermediate/multipart-http/pom.xml | 4 ++-- intermediate/rest-http/pom.xml | 8 ++++---- intermediate/retry-and-more/pom.xml | 4 ++-- intermediate/splitter-aggregator-reaper/pom.xml | 4 ++-- intermediate/stored-procedures-derby/pom.xml | 4 ++-- intermediate/stored-procedures-ms/pom.xml | 4 ++-- intermediate/stored-procedures-oracle/pom.xml | 4 ++-- intermediate/stored-procedures-postgresql/pom.xml | 4 ++-- intermediate/tcp-async-bi-directional/pom.xml | 4 ++-- intermediate/tcp-client-server-multiplex/pom.xml | 4 ++-- intermediate/testcontainers-rabbitmq/pom.xml | 4 ++-- intermediate/travel/pom.xml | 4 ++-- intermediate/tx-synch/pom.xml | 4 ++-- 65 files changed, 131 insertions(+), 131 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index af4ab8422..fb0ade56e 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index e91bfd12d..704f0a26f 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 920d1935f..d46e60199 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index fb4bc5cd6..5ff3a53ba 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index bea8a960b..b592d65fa 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 612691f95..a07b29b5c 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -156,14 +156,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 018888119..3c05423a3 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 0c5a68135..b74b012c0 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 844375372..2a6fddd6a 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 0f4910927..2d874c886 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -325,14 +325,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index e35837a32..27fff7b35 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -148,14 +148,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 380eeb28d..984dd4fbb 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 30f06150b..7439c52c2 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -153,14 +153,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 027db46bd..08aadb038 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index e27e1c990..edd281310 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 6f4e7e11e..ccafa1ba7 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 0ad9aae0f..9225df8c7 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index f9b3403dd..4a5936832 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -150,14 +150,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index f94cd3f94..44438e3fe 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 0b70047e9..43ff12fd4 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 011b4d688..472eefbcf 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 52ac0c732..edcf5ef93 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 51d3ae272..8d5f6e59e 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index a93bfead7..562ca4c86 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 6aa9802ab..55d250d3a 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 0d47e3ec0..635eb9ab4 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index fcf9e4155..06e9386f7 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 0148da520..5b3afe3e0 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 5f59b2de4..b3162ed0b 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 13b4e6878..cb64697b4 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 9ea159bea..206eef1f9 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index d6f05e69c..e4e488f88 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index e3acd54c4..e7b18c1da 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index e16dd2a1e..0385363a2 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 5feb47ce2..a473ecf6a 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 46a69c392..6148f52f5 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -141,14 +141,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 232ea079f..dd74a6ffe 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -127,14 +127,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 86b2dfa11..6919651ac 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 2eae2d5bf..37fc813c1 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -168,14 +168,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 2995f49d2..700361619 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index b92e57a6f..e1f16c8cf 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 99c6c3a15..55accb13f 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/build.gradle b/build.gradle index b1419e2e5..8caa04b3e 100644 --- a/build.gradle +++ b/build.gradle @@ -260,7 +260,7 @@ subprojects { subproject -> postgresVersion = '42.3.3' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.0-SNAPSHOT' - springIntegrationVersion = '6.0.0-SNAPSHOT' + springIntegrationVersion = '6.0.0-M3' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' springVersion = '6.0.0-SNAPSHOT' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 01e88e71d..04fbea3ba 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -149,14 +149,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 37b9824a3..14867fa8c 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -149,14 +149,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 3307393e0..cac47b37f 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -171,14 +171,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 61811aa58..2a92dc573 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index fbc9dd26f..d0b27005e 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 9f8bd4f39..818dc0fc2 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 00c9bdf20..32f0ca873 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 35b6b2478..b14c452be 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index a66d0a2d2..d41c04d70 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index ee19baad2..4bc3275f3 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 5914fa71a..d2e7a0b4a 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -95,13 +95,13 @@ org.springframework.security spring-security-web - 6.0.0-M2 + 6.0.0-SNAPSHOT compile org.springframework.security spring-security-config - 6.0.0-M2 + 6.0.0-SNAPSHOT compile @@ -211,14 +211,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index bd7832ad2..355752357 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 60eb6a39f..6058a5e75 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 32f6f76b9..92a78442c 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 8e199c59f..853193857 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 7cc66717d..3af1e68c8 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 5057aeed9..c09b029e3 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -144,14 +144,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 53007fc96..7ac736cc8 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 057807b00..028c38252 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index c9e3a51ba..74f48375e 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -172,14 +172,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 01ec885e6..3cce93883 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -136,14 +136,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index c26510b9b..709b0be71 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.0.0-M2 + 6.0.0-M3 import pom From 9f4428153c7c95a7132c6e4c7611e24feb3f862d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scheibe?= Date: Wed, 8 Jun 2022 16:11:45 +0200 Subject: [PATCH 287/356] Fix various typos in the code & docs --- README.md | 2 +- applications/cafe/cafe-jms/README.md | 4 ++-- .../spring/integration/activemq/cafeDemo-amq-xml.xml | 2 +- .../samples/cafe/xml/CafeDemoAppUtilities.java | 2 +- applications/file-split-ftp/README.adoc | 2 +- .../integration/samples/enricher/service/UserService.java | 2 +- .../samples/enricher/service/UserServiceTest.java | 2 +- .../integration/samples/jpa/service/PersonService.java | 2 +- .../spring/integration/gmail-imap-idle-config.xml | 2 +- basic/mongodb/README.md | 2 +- .../mongodb/outbound/MongoDbOutboundAdapterDemo.java | 8 ++++---- .../samples/mongodb/outbound/mongodb-out-config.xml | 2 +- basic/sftp/README.md | 2 +- .../samples/tcpbroadcast/TcpBroadcastApplication.java | 2 +- .../tcpclientserver/CustomSerializerDeserializer.java | 4 ++-- basic/xmpp/README.md | 4 ++-- dsl/si4demo/README.md | 3 +-- .../samples/mailattachments/support/EmailParserUtils.java | 8 ++++---- .../java/org/springintegration/NotificationListener.java | 2 +- .../samples/rest/service/EmployeeSearchService.java | 4 +--- intermediate/retry-and-more/README.md | 4 ++-- .../integration/samples/storedprocedure/Main.java | 2 +- .../integration/CoffeeServiceStartupTest.java | 2 +- .../integration/samples/storedprocedure/Main.java | 2 +- .../integration/samples/StringConversionServiceTest.java | 2 +- intermediate/stored-procedures-oracle/README.md | 4 ++-- .../integration/samples/storedprocedure/Main.java | 2 +- .../integration/sts/StringConversionServiceTest.java | 2 +- .../spring/integration/transaction-synch-context.xml | 2 +- 29 files changed, 40 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index e3cbfd3a9..2f250e822 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ This is a good place to get started. The samples here are technically motivated * **mongodb** - Shows how to persist a Message payload to a **MongoDb** document store and how to read documents from **MongoDb** * **oddeven** - Example combining the functionality of **Inbound Channel Adapter**, **Filter**, **Router** and **Poller** * **jpa** - This sample illustrates how the JPA Components can be used -* **quote** - Example demoing core EIP support using **Channel Adapter (Inbound and Stdout)**, **Poller** with Interval Trigers, **Service Activator** +* **quote** - Example demoing core EIP support using **Channel Adapter (Inbound and Stdout)**, **Poller** with Interval Triggers, **Service Activator** * **sftp** - Demonstrating SFTP support using **SFTP Inbound / Outbound Channel Adapters** * **tcp-amqp** - Demonstrates basic functionality of bridging the **Spring Integration TCP Adapters** with **Spring Integration AMQP Adapters** * **tcp-broadcast** - Demonstrates broadcasting a message to multiple connected TCP clients. diff --git a/applications/cafe/cafe-jms/README.md b/applications/cafe/cafe-jms/README.md index 86444fb88..60cd05f71 100644 --- a/applications/cafe/cafe-jms/README.md +++ b/applications/cafe/cafe-jms/README.md @@ -24,8 +24,8 @@ To run this configuration, start an instance of ActiveMQ with the openwire/TCP c 1. **CafeDemoAppBaristaColdActiveMQ - starts the ColdDrink Barista 2. **CafeDemoAppBaristaHotActiveMQ - starts the HotDrink Barista 3. **CafeDemoAppOperationsActiveMQ - starts the Cafe Operations (order splitter, drink router, etc). - 4. **CafeDemoAppAcitveMQ - places the orders + 4. **CafeDemoAppActiveMQ - places the orders ### JMS backed components -See **CafeDemoActiveMQBackedChannels** for an example of how to use the JMS-backed channels. No need to start an external ActiveMQ because one is started internally \ No newline at end of file +See **CafeDemoActiveMQBackedChannels** for an example of how to use the JMS-backed channels. No need to start an external ActiveMQ because one is started internally diff --git a/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-xml.xml b/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-xml.xml index 16975da8d..304318671 100644 --- a/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-xml.xml +++ b/applications/cafe/cafe-jms/src/main/resources/META-INF/spring/integration/activemq/cafeDemo-amq-xml.xml @@ -24,7 +24,7 @@ + on the other side of the JMS queue to which the channel adapter is connected --> diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppUtilities.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppUtilities.java index 04bb21056..e814d8e45 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppUtilities.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/CafeDemoAppUtilities.java @@ -33,7 +33,7 @@ public class CafeDemoAppUtilities { /** * * @param path path to the file - * @param targetClass the class who's classloader we will use to laod the context file + * @param targetClass the class who's classloader we will use to load the context file * @param profile a profile name * @return the spring context */ diff --git a/applications/file-split-ftp/README.adoc b/applications/file-split-ftp/README.adoc index e4de80e23..6d150de77 100644 --- a/applications/file-split-ftp/README.adoc +++ b/applications/file-split-ftp/README.adoc @@ -8,7 +8,7 @@ - `marks` filters on EOF marker (drops SOF) - pubsub [flush files], [ftp (x3)], [email result] - Exceptions go to `tfrErrors` - sends failure email -- input file is renamed, based on final dispostion +- input file is renamed, based on final disposition Test cases are provided for happy path and failure scenarios diff --git a/basic/enricher/src/main/java/org/springframework/integration/samples/enricher/service/UserService.java b/basic/enricher/src/main/java/org/springframework/integration/samples/enricher/service/UserService.java index 377344cb6..db5a7f0c3 100644 --- a/basic/enricher/src/main/java/org/springframework/integration/samples/enricher/service/UserService.java +++ b/basic/enricher/src/main/java/org/springframework/integration/samples/enricher/service/UserService.java @@ -38,7 +38,7 @@ public interface UserService { /** * Retrieves a user based on the provided username that is provided as a Map - * entry using the mapkey 'username'. Map object is routed to the + * entry using the key 'username'. Map object is routed to the * "findUserWithMapChannel" channel. */ Map findUserWithUsernameInMap(Map userdata); diff --git a/basic/enricher/src/test/java/org/springframework/integration/samples/enricher/service/UserServiceTest.java b/basic/enricher/src/test/java/org/springframework/integration/samples/enricher/service/UserServiceTest.java index 5a5b3edda..89feda2cf 100644 --- a/basic/enricher/src/test/java/org/springframework/integration/samples/enricher/service/UserServiceTest.java +++ b/basic/enricher/src/test/java/org/springframework/integration/samples/enricher/service/UserServiceTest.java @@ -29,7 +29,7 @@ public class UserServiceTest { @Test - public void testStartupOfSpringInegrationContext() throws Exception { + public void testStartupOfSpringIntegrationContext() throws Exception { final ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "/META-INF/spring/integration/spring-integration-context.xml", UserServiceTest.class); Thread.sleep(2000); diff --git a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/service/PersonService.java b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/service/PersonService.java index 603c36b32..a1bd96927 100644 --- a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/service/PersonService.java +++ b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/service/PersonService.java @@ -33,7 +33,7 @@ public interface PersonService { /** * Creates a {@link Person} instance from the {@link Person} instance passed * - * @param person created person instance, it will contain the generated primary key and the formated name + * @param person created person instance, it will contain the generated primary key and the formatted name * @return The persisted Entity */ Person createPerson(Person person); diff --git a/basic/mail/src/main/resources/META-INF/spring/integration/gmail-imap-idle-config.xml b/basic/mail/src/main/resources/META-INF/spring/integration/gmail-imap-idle-config.xml index 019230c2b..b274e5697 100644 --- a/basic/mail/src/main/resources/META-INF/spring/integration/gmail-imap-idle-config.xml +++ b/basic/mail/src/main/resources/META-INF/spring/integration/gmail-imap-idle-config.xml @@ -12,7 +12,7 @@ + It will be initialized with the default instance of the **MongoDbFactory** (the default bean name is 'mongoDbFactory') otherwise you can provide its reference via **mongodb-factory** attribute. diff --git a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/MongoDbOutboundAdapterDemo.java b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/MongoDbOutboundAdapterDemo.java index 9fe994c85..7bb7dfd5c 100644 --- a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/MongoDbOutboundAdapterDemo.java +++ b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/MongoDbOutboundAdapterDemo.java @@ -32,9 +32,9 @@ public class MongoDbOutboundAdapterDemo { * @param args */ public static void main(String[] args) throws Exception { - DemoUtils.prepareMongoFactory(); // will clean up MOngoDb + DemoUtils.prepareMongoFactory(); // will clean up MongoDB new MongoDbOutboundAdapterDemo().runDefaultAdapter(); -// new MongoDbOutboundAdapterDemo().runAdapterWithConveter(); +// new MongoDbOutboundAdapterDemo().runAdapterWithConverter(); } public void runDefaultAdapter() throws Exception { @@ -43,13 +43,13 @@ public void runDefaultAdapter() throws Exception { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("mongodb-out-config.xml", MongoDbOutboundAdapterDemo.class); - MessageChannel messageChannel = context.getBean("deafultAdapter", MessageChannel.class); + MessageChannel messageChannel = context.getBean("defaultAdapter", MessageChannel.class); messageChannel.send(new GenericMessage(this.createPersonA())); messageChannel.send(new GenericMessage(this.createPersonB())); messageChannel.send(new GenericMessage(this.createPersonC())); } - public void runAdapterWithConveter() throws Exception { + public void runAdapterWithConverter() throws Exception { @SuppressWarnings("resource") ClassPathXmlApplicationContext context = diff --git a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/mongodb-out-config.xml b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/mongodb-out-config.xml index 61e40ff91..26d13ed5d 100644 --- a/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/mongodb-out-config.xml +++ b/basic/mongodb/src/main/java/org/springframework/integration/samples/mongodb/outbound/mongodb-out-config.xml @@ -12,7 +12,7 @@ - + diff --git a/basic/sftp/README.md b/basic/sftp/README.md index 711fdbd34..f4d938dfa 100644 --- a/basic/sftp/README.md +++ b/basic/sftp/README.md @@ -39,7 +39,7 @@ NOTE: You can see that we are using *SpEL* via the **remote-filename-generator-e ## OUTBOUND GATEWAY -Run the **FtpOutoundGateway** sample as a JUnit test; it creates 2 files, retrieves and removes them over ftp. It cleans up by removing the retrieved files. The test assumes full access to the filesystem via **/tmp** where the test files are created. Requires **sshd** to be running on localhost. +Run the **FtpOutboundGateway** sample as a JUnit test; it creates 2 files, retrieves and removes them over ftp. It cleans up by removing the retrieved files. The test assumes full access to the filesystem via **/tmp** where the test files are created. Requires **sshd** to be running on localhost. This sample uses a property **private.keyfile** to point to the location of your private key. Requires setting of **user**, **private.keyfile** and, optionally, **passphrase** in **user.properties**. diff --git a/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java b/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java index 8dd551a7a..3e18c70fb 100644 --- a/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java +++ b/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java @@ -108,7 +108,7 @@ public ThreadPoolTaskExecutor exec() { } /* - * Wait for server to start listenng and start 5 clients. + * Wait for server to start listening and start 5 clients. */ @Bean public ApplicationRunner runner(TaskExecutor exec, Broadcaster caster) { diff --git a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomSerializerDeserializer.java b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomSerializerDeserializer.java index df6d134a2..b51158ee8 100644 --- a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomSerializerDeserializer.java +++ b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomSerializerDeserializer.java @@ -75,8 +75,8 @@ public void serialize(CustomOrder object, OutputStream outputStream) throws IOEx byte[] senderName = object.getSender().getBytes(); outputStream.write(senderName); - String lenghtPadded = pad(6, object.getMessage().length()); - byte[] length = lenghtPadded.getBytes(); + String lengthPadded = pad(6, object.getMessage().length()); + byte[] length = lengthPadded.getBytes(); outputStream.write(length); outputStream.write(object.getMessage().getBytes()); diff --git a/basic/xmpp/README.md b/basic/xmpp/README.md index 5e85e6f0c..4fbb6125e 100644 --- a/basic/xmpp/README.md +++ b/basic/xmpp/README.md @@ -4,7 +4,7 @@ XMPP Sample This example was prepared for testing with [Google Talk][] and demonstrates the following aspects of the [Extensible Messaging and Presence Protocol][] (XMPP) support available with *Spring Integration*: 1. XMPP Inbound Channel Adapter - receive instant messages. -2. XMPP Outboud Channel Adapter - send instant messages. +2. XMPP Outbound Channel Adapter - send instant messages. In order to run this sample you need to provide correct values in **xmpp.properties**. Everything there was already preset. The only 3 properties you need to provide values for are: @@ -19,4 +19,4 @@ To test **SendInstantMessageSample.java**, first log on to the account identifie To test **ReceiveInstantMessageSample.java**, first log on to the account identified via **send.to.user** property. Then run the demo. Now any instant messages sent to your account appear in the console. [Google Talk]: https://www.google.com/talk/ -[Extensible Messaging and Presence Protocol]: https://en.wikipedia.org/wiki/Extensible_Messaging_and_Presence_Protocol \ No newline at end of file +[Extensible Messaging and Presence Protocol]: https://en.wikipedia.org/wiki/Extensible_Messaging_and_Presence_Protocol diff --git a/dsl/si4demo/README.md b/dsl/si4demo/README.md index c5c0ec07a..d3f042ff2 100644 --- a/dsl/si4demo/README.md +++ b/dsl/si4demo/README.md @@ -48,7 +48,7 @@ This example is pure XML - it's a simple flow... gateway -> transformer -> service-activator -The transformer concatentates the payload to itself (String), the service upper cases the payload. The result is returned to the gateway. "foo" becomes "FOOFOO". +The transformer concatenates the payload to itself (String), the service upper cases the payload. The result is returned to the gateway. "foo" becomes "FOOFOO". ## BXMLAndPojo @@ -79,4 +79,3 @@ This adds a recipient list router and sends a copy of the payload to an SMTP Ema ## GIMAP This is a separate application that demonstrates the DSL configuring an IMAP idle channel adapter, to receive emails sent by __FEmail__. - diff --git a/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailParserUtils.java b/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailParserUtils.java index da4d4ebdf..7667f16a9 100644 --- a/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailParserUtils.java +++ b/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailParserUtils.java @@ -75,7 +75,7 @@ public static void handleMessage(final File directory, final List emailFragments) { Assert.notNull(mailMessage, "The mail message to be parsed must not be null."); - Assert.notNull(emailFragments, "The collection of emailfragments must not be null."); + Assert.notNull(emailFragments, "The collection of email fragments must not be null."); final Object content; final String subject; @@ -135,7 +135,7 @@ public static void handleMultipart(File directory, Multipart multipart, jakarta. Assert.notNull(directory, "The directory must not be null."); Assert.notNull(multipart, "The multipart object to be parsed must not be null."); Assert.notNull(mailMessage, "The mail message to be parsed must not be null."); - Assert.notNull(emailFragments, "The collection of emailfragments must not be null."); + Assert.notNull(emailFragments, "The collection of email fragments must not be null."); final int count; @@ -189,7 +189,7 @@ public static void handleMultipart(File directory, Multipart multipart, jakarta. } if (Part.ATTACHMENT.equalsIgnoreCase(disposition)) { - LOGGER.info(String.format("Handdling attachment '%s', type: '%s'", filename, contentType)); + LOGGER.info(String.format("Handling attachment '%s', type: '%s'", filename, contentType)); } final Object content; @@ -208,7 +208,7 @@ public static void handleMultipart(File directory, Multipart multipart, jakarta. if (Part.ATTACHMENT.equalsIgnoreCase(disposition)) { emailFragments.add(new EmailFragment(directory, i + "-" + filename, content)); - LOGGER.info(String.format("Handdling attachment '%s', type: '%s'", filename, contentType)); + LOGGER.info(String.format("Handling attachment '%s', type: '%s'", filename, contentType)); } else { diff --git a/intermediate/monitoring/src/main/java/org/springintegration/NotificationListener.java b/intermediate/monitoring/src/main/java/org/springintegration/NotificationListener.java index fcf710a7d..d27d0c7af 100644 --- a/intermediate/monitoring/src/main/java/org/springintegration/NotificationListener.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/NotificationListener.java @@ -19,7 +19,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; /** - * This class demonstrates the use a Spring Integration jmx adadpers to receive + * This class demonstrates the use a Spring Integration jmx adapters to receive * notifications, poll attributes, and invoke operations on a Remote JMX MBeanServer. * * @author Gary Russell diff --git a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java index 54ae40eca..c875a4b02 100644 --- a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java +++ b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java @@ -83,7 +83,7 @@ else if (id.equals("0")) { } catch (Exception e) { setReturnStatusAndMessage("1", "System Error", employeeList, responseHeaderMap); - logger.error("System error occured :" + e); + logger.error("System error occurred :" + e); } Message message = new GenericMessage(employeeList, responseHeaderMap); return message; @@ -109,5 +109,3 @@ private void setReturnStatusAndMessage(String status, } } - - diff --git a/intermediate/retry-and-more/README.md b/intermediate/retry-and-more/README.md index 5b3dcfa43..3db386724 100644 --- a/intermediate/retry-and-more/README.md +++ b/intermediate/retry-and-more/README.md @@ -48,7 +48,7 @@ You can observe the function of the advice by entering a number of messages over `FileTransferRenameAfterFailureDemo` -These classes show how to configure expressions to be evaluated after either succes, or failure; the application context is defined in expression-advice-context-xml. +These classes show how to configure expressions to be evaluated after either success, or failure; the application context is defined in expression-advice-context-xml. It is a simulation of an application with a file inbound adapter -> ftp outbound adapter. @@ -63,4 +63,4 @@ In both cases simply add a file ending with .txt in ${java.io.tmpdir}/adviceDemo ## Running the Demos -In each case, run the main method in each of the demonstration classes. \ No newline at end of file +In each case, run the main method in each of the demonstration classes. diff --git a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index 7023a1870..534c31da9 100644 --- a/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java +++ b/intermediate/stored-procedures-derby/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -87,7 +87,7 @@ public static void main(final String... args) { String coffeeDescription = service.findCoffeeBeverage(Integer.valueOf(input)); System.out.println(String.format("Searched for '%s' - Found: '%s'.", input, coffeeDescription)); - System.out.print("To try again, please enter another coffee beaverage and press :\n\n"); + System.out.print("To try again, please enter another coffee beverage and press :\n\n"); } } diff --git a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceStartupTest.java b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceStartupTest.java index d3d765613..c7011491b 100644 --- a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceStartupTest.java +++ b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceStartupTest.java @@ -26,7 +26,7 @@ public class CoffeeServiceStartupTest { @Test - public void testStartupOfSpringInegrationContext() throws Exception{ + public void testStartupOfSpringIntegrationContext() throws Exception{ final ApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", CoffeeServiceStartupTest.class); diff --git a/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java b/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index e51cf9f77..7badbb958 100644 --- a/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java +++ b/intermediate/stored-procedures-ms/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -75,7 +75,7 @@ public static void main(final String... args) { while (!scanner.hasNext("q")) { String input = scanner.nextLine(); - System.out.println("Converting String to Uppcase using Stored Procedure..."); + System.out.println("Converting String to Uppercase using Stored Procedure..."); String inputUpperCase = service.convertToUpperCase(input); System.out.println("Retrieving Numeric value via Sql Function..."); diff --git a/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java b/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java index d0e44963f..6c1172574 100644 --- a/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java +++ b/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java @@ -30,7 +30,7 @@ public class StringConversionServiceTest { @Test - public void testStartupOfSpringInegrationContext() throws Exception{ + public void testStartupOfSpringIntegrationContext() throws Exception{ new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", StringConversionServiceTest.class); Thread.sleep(2000); diff --git a/intermediate/stored-procedures-oracle/README.md b/intermediate/stored-procedures-oracle/README.md index 978b7b7cf..38609eb59 100644 --- a/intermediate/stored-procedures-oracle/README.md +++ b/intermediate/stored-procedures-oracle/README.md @@ -135,7 +135,7 @@ You should see the following output: 2. Execute Sample 2 (Coffee Service) q. Quit the application -Select **Opion 1**. +Select **Option 1**. ========================================================= @@ -230,7 +230,7 @@ You should see the following output: 2. Execute Sample 2 (Coffee Service) q. Quit the application -Select **Opion 2**. +Select **Option 2**. This should result in the following output: diff --git a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java index b565ee1cb..581dc12e7 100644 --- a/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java +++ b/intermediate/stored-procedures-oracle/src/main/java/org/springframework/integration/samples/storedprocedure/Main.java @@ -112,7 +112,7 @@ private static void executeSample1() { while (!scanner.hasNext("q")) { String input = scanner.nextLine(); - System.out.println("Converting String to Uppcase using Stored Procedure..."); + System.out.println("Converting String to Uppercase using Stored Procedure..."); String inputUpperCase = service.convertToUpperCase(input); System.out.println("Retrieving Numeric value via Sql Function..."); diff --git a/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java b/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java index 804030dd7..baa941b25 100644 --- a/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java +++ b/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java @@ -30,7 +30,7 @@ public class StringConversionServiceTest { @Test - public void testStartupOfSpringInegrationContext() throws Exception{ + public void testStartupOfSpringIntegrationContext() throws Exception{ final ApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", StringConversionServiceTest.class); diff --git a/intermediate/tx-synch/src/main/resources/META-INF/spring/integration/transaction-synch-context.xml b/intermediate/tx-synch/src/main/resources/META-INF/spring/integration/transaction-synch-context.xml index 25415fefe..822d2621d 100755 --- a/intermediate/tx-synch/src/main/resources/META-INF/spring/integration/transaction-synch-context.xml +++ b/intermediate/tx-synch/src/main/resources/META-INF/spring/integration/transaction-synch-context.xml @@ -32,7 +32,7 @@ - From 80af14a2e6c7160eda8d3bd31c4074647b593f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scheibe?= Date: Wed, 8 Jun 2022 16:13:03 +0200 Subject: [PATCH 288/356] Make fields immutable (final) where possible --- .../integration/samples/cafe/Delivery.java | 7 ++----- .../integration/samples/cafe/Drink.java | 10 ++++------ .../integration/samples/cafe/Order.java | 6 +++--- .../integration/samples/cafe/Waiter.java | 2 +- .../samples/cafe/demo/ControlBusMain.java | 2 +- .../integration/samples/cafe/annotation/Barista.java | 2 +- .../integration/samples/cafe/xml/Barista.java | 2 +- .../samples/loanbroker/demo/LoanBrokerDemo.java | 2 +- .../loanbroker/demo/LoanBrokerSharkDetectorDemo.java | 2 +- .../samples/loanbroker/stubs/CreditBureauStub.java | 2 +- .../samples/ftp/support/TestUserManager.java | 4 ++-- .../samples/helloworld/HelloWorldApp.java | 2 +- .../integration/samples/http/HttpClientDemo.java | 2 +- .../integration/samples/jdbc/domain/Gender.java | 12 ++++++------ .../integration/samples/jdbc/domain/User.java | 6 +++--- .../imapidle/GmailInboundImapIdleAdapterTestApp.java | 2 +- .../imapidle/GmailInboundPop3AdapterTestApp.java | 2 +- .../integration/samples/mqtt/BrokerRunning.java | 4 ++-- .../integration/samples/oddeven/EvenLogger.java | 2 +- .../integration/samples/oddeven/OddLogger.java | 2 +- .../integration/samples/quote/Quote.java | 4 ++-- .../samples/tcpclientserver/CustomOrder.java | 4 ++-- .../samples/testing/externalgateway/Traffic.java | 8 ++++---- .../externalgateway/TrafficHttpConverter.java | 4 ++-- .../testing/externalgateway/WeatherMarshaller.java | 12 ++++++------ .../integration/samples/ws/InContainerTests.java | 2 +- .../integration/samples/xml/ExternalResupply.java | 2 +- .../integration/samples/xml/WarehouseDispatch.java | 2 +- .../samples/dsl/cafe/lambda/Application.java | 4 ++-- .../samples/async/gateway/ListenableFutureTest.java | 2 +- .../samples/async/gateway/MonoGatewayTests.java | 2 +- .../mailattachments/support/EmailFragment.java | 6 +++--- .../service/impl/DefaultTwitterService.java | 2 +- .../samples/multipart/MultipartReceiver.java | 2 +- .../MultipartClientForHttpOutboundClient.java | 6 +++--- .../samples/multipart/MultipartRestClient.java | 12 ++++++------ .../samples/rest/service/EmployeeSearchService.java | 3 ++- .../integration/samples/rest/RestHttpClientTest.java | 2 +- .../samples/splitteraggregator/CompositeResult.java | 2 +- .../integration/samples/travel/City.java | 8 ++++---- 40 files changed, 80 insertions(+), 84 deletions(-) diff --git a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Delivery.java b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Delivery.java index 7e9f9942e..436e34765 100644 --- a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Delivery.java +++ b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Delivery.java @@ -25,11 +25,9 @@ public class Delivery { private static final String SEPARATOR = "-----------------------"; + private final List deliveredDrinks; - private List deliveredDrinks; - - private int orderNumber; - + private final int orderNumber; public Delivery(List deliveredDrinks) { assert(deliveredDrinks.size() > 0); @@ -37,7 +35,6 @@ public Delivery(List deliveredDrinks) { this.orderNumber = deliveredDrinks.get(0).getOrderNumber(); } - public int getOrderNumber() { return orderNumber; } diff --git a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Drink.java b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Drink.java index bb4b0ab04..5abadb04f 100644 --- a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Drink.java +++ b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Drink.java @@ -21,15 +21,14 @@ */ public class Drink { - private boolean iced; + private final boolean iced; - private int shots; + private final int shots; - private DrinkType drinkType; + private final DrinkType drinkType; - private int orderNumber; + private final int orderNumber; - public Drink(int orderNumber, DrinkType drinkType, boolean hot, int shots) { this.orderNumber = orderNumber; this.drinkType = drinkType; @@ -37,7 +36,6 @@ public Drink(int orderNumber, DrinkType drinkType, boolean hot, int shots) { this.shots = shots; } - public int getOrderNumber() { return orderNumber; } diff --git a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Order.java b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Order.java index 4a279b745..e02c04532 100644 --- a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Order.java +++ b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Order.java @@ -25,9 +25,9 @@ */ public class Order { - private List orderItems = new ArrayList(); + private final List orderItems = new ArrayList(); - private int number; + private final int number; public Order(int number) { this.number = number; @@ -44,7 +44,7 @@ public int getNumber() { public List getItems() { return this.orderItems; } - + public String toString() { return "Order number " + number; } diff --git a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Waiter.java b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Waiter.java index 5e26cc6a9..ae3483e78 100644 --- a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Waiter.java +++ b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/Waiter.java @@ -31,7 +31,7 @@ @ManagedResource public class Waiter { - private AtomicInteger totalDeliveries = new AtomicInteger(); + private final AtomicInteger totalDeliveries = new AtomicInteger(); public Delivery prepareDelivery(List drinks) { totalDeliveries.getAndIncrement(); diff --git a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/ControlBusMain.java b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/ControlBusMain.java index 2b99f291e..00b83d201 100644 --- a/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/ControlBusMain.java +++ b/applications/cafe-scripted/src/main/java/org/springframework/integration/samples/cafe/demo/ControlBusMain.java @@ -30,7 +30,7 @@ * */ public class ControlBusMain { - private static Log logger = LogFactory.getLog(ControlBusMain.class); + private static final Log logger = LogFactory.getLog(ControlBusMain.class); public static void main(String[] args) { diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java index ad5d08c7b..850d7ecfa 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/annotation/Barista.java @@ -36,7 +36,7 @@ @Component public class Barista { - private static Log logger = LogFactory.getLog(Barista.class); + private static final Log logger = LogFactory.getLog(Barista.class); private long hotDrinkDelay = 5000; diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java index 57249abea..e49e91b7b 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/xml/Barista.java @@ -33,7 +33,7 @@ public class Barista { - private static Log logger = LogFactory.getLog(Barista.class); + private static final Log logger = LogFactory.getLog(Barista.class); private long hotDrinkDelay = 5000; diff --git a/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerDemo.java b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerDemo.java index fe424c517..88c72e35e 100644 --- a/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerDemo.java +++ b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerDemo.java @@ -33,7 +33,7 @@ */ public class LoanBrokerDemo { - private static Log logger = LogFactory.getLog(LoanBrokerDemo.class); + private static final Log logger = LogFactory.getLog(LoanBrokerDemo.class); public static void main(String[] args) { new LoanBrokerDemo().runDemo(); diff --git a/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerSharkDetectorDemo.java b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerSharkDetectorDemo.java index 34aadaf09..ce821bb75 100644 --- a/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerSharkDetectorDemo.java +++ b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/demo/LoanBrokerSharkDetectorDemo.java @@ -33,7 +33,7 @@ */ public class LoanBrokerSharkDetectorDemo { - private static Log logger = LogFactory.getLog(LoanBrokerSharkDetectorDemo.class); + private static final Log logger = LogFactory.getLog(LoanBrokerSharkDetectorDemo.class); public static void main(String[] args) { ConfigurableApplicationContext context = diff --git a/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/CreditBureauStub.java b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/CreditBureauStub.java index ab9852e27..eb0c1586b 100644 --- a/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/CreditBureauStub.java +++ b/applications/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/stubs/CreditBureauStub.java @@ -30,7 +30,7 @@ */ public class CreditBureauStub { - private static Log logger = LogFactory.getLog(CreditBureauStub.class); + private static final Log logger = LogFactory.getLog(CreditBureauStub.class); /** * @param loanRequest the loan request diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/support/TestUserManager.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/support/TestUserManager.java index ebcdde895..8e94aafea 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/support/TestUserManager.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/support/TestUserManager.java @@ -36,8 +36,8 @@ * */ public class TestUserManager extends AbstractUserManager { - private BaseUser testUser; - private BaseUser anonUser; + private final BaseUser testUser; + private final BaseUser anonUser; private static final String TEST_USERNAME = "demo"; private static final String TEST_PASSWORD = "demo"; diff --git a/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldApp.java b/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldApp.java index 42d4db188..5c4dd289a 100644 --- a/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldApp.java +++ b/basic/helloworld/src/main/java/org/springframework/integration/samples/helloworld/HelloWorldApp.java @@ -42,7 +42,7 @@ */ public class HelloWorldApp { - private static Log logger = LogFactory.getLog(HelloWorldApp.class); + private static final Log logger = LogFactory.getLog(HelloWorldApp.class); public static void main(String[] args) { AbstractApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/helloWorldDemo.xml", HelloWorldApp.class); diff --git a/basic/http/src/main/java/org/springframework/integration/samples/http/HttpClientDemo.java b/basic/http/src/main/java/org/springframework/integration/samples/http/HttpClientDemo.java index 9c5b2b848..ab4cb0c78 100644 --- a/basic/http/src/main/java/org/springframework/integration/samples/http/HttpClientDemo.java +++ b/basic/http/src/main/java/org/springframework/integration/samples/http/HttpClientDemo.java @@ -27,7 +27,7 @@ */ public class HttpClientDemo { - private static Log logger = LogFactory.getLog(HttpClientDemo.class); + private static final Log logger = LogFactory.getLog(HttpClientDemo.class); public static void main(String[] args) { ConfigurableApplicationContext context = new ClassPathXmlApplicationContext( diff --git a/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/domain/Gender.java b/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/domain/Gender.java index afe05f22f..87fb1a63b 100644 --- a/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/domain/Gender.java +++ b/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/domain/Gender.java @@ -27,9 +27,9 @@ public enum Gender { MALE("M"),FEMALE("F"); - private static Map map; - - private String identifier; + private static final Map map; + + private final String identifier; private Gender(String identifier) { this.identifier = identifier; @@ -37,12 +37,12 @@ private Gender(String identifier) { public String getIdentifier() { return identifier; - } - + } + public static Gender getGenderByIdentifier(String identifier) { return map.get(identifier); } - + static { map = new HashMap(); for(Gender gender:EnumSet.allOf(Gender.class)) { diff --git a/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/domain/User.java b/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/domain/User.java index e324563dc..5cf5546e2 100644 --- a/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/domain/User.java +++ b/basic/jdbc/src/main/java/org/springframework/integration/samples/jdbc/domain/User.java @@ -13,9 +13,9 @@ package org.springframework.integration.samples.jdbc.domain; public class User { - private String username; - private String password; - private String email; + private final String username; + private final String password; + private final String email; public User(String username, String password, String email) { super(); diff --git a/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTestApp.java b/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTestApp.java index 2da95d7c7..017b5063f 100644 --- a/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTestApp.java +++ b/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundImapIdleAdapterTestApp.java @@ -30,7 +30,7 @@ * */ public class GmailInboundImapIdleAdapterTestApp { - private static Log logger = LogFactory.getLog(GmailInboundImapIdleAdapterTestApp.class); + private static final Log logger = LogFactory.getLog(GmailInboundImapIdleAdapterTestApp.class); public static void main (String[] args) throws Exception { diff --git a/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundPop3AdapterTestApp.java b/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundPop3AdapterTestApp.java index baa5366d6..810ded529 100644 --- a/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundPop3AdapterTestApp.java +++ b/basic/mail/src/main/java/org/springframework/integration/samples/mail/imapidle/GmailInboundPop3AdapterTestApp.java @@ -32,7 +32,7 @@ */ public class GmailInboundPop3AdapterTestApp { - private static Log logger = LogFactory.getLog(GmailInboundPop3AdapterTestApp.class); + private static final Log logger = LogFactory.getLog(GmailInboundPop3AdapterTestApp.class); public static void main (String[] args) throws Exception { @SuppressWarnings("resource") diff --git a/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/BrokerRunning.java b/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/BrokerRunning.java index 05a9d4987..9880ff2c6 100644 --- a/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/BrokerRunning.java +++ b/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/BrokerRunning.java @@ -40,10 +40,10 @@ */ public class BrokerRunning extends TestWatcher { - private static Log logger = LogFactory.getLog(BrokerRunning.class); + private static final Log logger = LogFactory.getLog(BrokerRunning.class); // Static so that we only test once on failure: speeds up test suite - private static Map brokerOnline = new HashMap<>(); + private static final Map brokerOnline = new HashMap<>(); private final int port; diff --git a/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java b/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java index 4ac5e7067..ac1b7c46f 100644 --- a/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java +++ b/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/EvenLogger.java @@ -34,7 +34,7 @@ */ @MessageEndpoint public class EvenLogger { - private static Log logger = LogFactory.getLog(EvenLogger.class); + private static final Log logger = LogFactory.getLog(EvenLogger.class); @ServiceActivator public void log(int i) { diff --git a/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java b/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java index 4d4b0957a..dbb07b986 100644 --- a/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java +++ b/basic/oddeven/src/main/java/org/springframework/integration/samples/oddeven/OddLogger.java @@ -34,7 +34,7 @@ */ @MessageEndpoint public class OddLogger { - private static Log logger = LogFactory.getLog(OddLogger.class); + private static final Log logger = LogFactory.getLog(OddLogger.class); @ServiceActivator public void log(int i) { diff --git a/basic/quote/src/main/java/org/springframework/integration/samples/quote/Quote.java b/basic/quote/src/main/java/org/springframework/integration/samples/quote/Quote.java index 7d3ee16ca..52bf2062e 100644 --- a/basic/quote/src/main/java/org/springframework/integration/samples/quote/Quote.java +++ b/basic/quote/src/main/java/org/springframework/integration/samples/quote/Quote.java @@ -23,9 +23,9 @@ */ public class Quote { - private String ticker; + private final String ticker; - private BigDecimal price; + private final BigDecimal price; public Quote(String ticker, BigDecimal price) { this.ticker = ticker; diff --git a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomOrder.java b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomOrder.java index b2ad37471..f88a63244 100644 --- a/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomOrder.java +++ b/basic/tcp-client-server/src/main/java/org/springframework/integration/samples/tcpclientserver/CustomOrder.java @@ -25,9 +25,9 @@ */ public class CustomOrder { - private int number; + private final int number; - private String sender; + private final String sender; private String message; diff --git a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/Traffic.java b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/Traffic.java index 03c301df0..9e1833189 100644 --- a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/Traffic.java +++ b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/Traffic.java @@ -25,16 +25,16 @@ */ public class Traffic { - private Map incidents = new HashMap(); - + private final Map incidents = new HashMap(); + public void addIncident(String title, String description){ incidents.put(title, description); } - + public Map getIncidents(){ return incidents; } - + public String toString(){ return "Traffic: {" + incidents.keySet().toString() + "}"; } 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 c22429635..74777aa59 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 @@ -40,8 +40,8 @@ * @since SpringOne2GX - 2010, Chicago */ public class TrafficHttpConverter implements HttpMessageConverter { - private List supportedMediaTypes = Collections.emptyList(); - + private final List supportedMediaTypes = Collections.emptyList(); + public boolean canRead(Class clazz, MediaType mediaType) { return Traffic.class.equals(clazz); } diff --git a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java index ed39f32f4..23f190f77 100644 --- a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java +++ b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/externalgateway/WeatherMarshaller.java @@ -47,9 +47,9 @@ public class WeatherMarshaller implements Marshaller, Unmarshaller, Initializing private static final TransformerFactory transformerFactory = TransformerFactory.newInstance(); - private Map namespacePrefixes = new HashMap(); + private final Map namespacePrefixes = new HashMap(); - private String xpathPrefix = "/p:GetCityWeatherByZIPResponse/p:GetCityWeatherByZIPResult/"; + private static final String XPATH_PREFIX = "/p:GetCityWeatherByZIPResponse/p:GetCityWeatherByZIPResult/"; public Object unmarshal(Source source) throws IOException, XmlMappingException { @@ -63,16 +63,16 @@ public Object unmarshal(Source source) throws IOException, XmlMappingException { throw new MarshallingFailureException("Failed to unmarshal SOAP Response", e); } Weather weather = new Weather(); - String expression = xpathPrefix + "p:City"; + String expression = XPATH_PREFIX + "p:City"; String city = XPathExpressionFactory.createXPathExpression(expression, namespacePrefixes).evaluateAsString(result.getNode()); weather.setCity(city); - expression = xpathPrefix + "p:State"; + expression = XPATH_PREFIX + "p:State"; String state = XPathExpressionFactory.createXPathExpression(expression, namespacePrefixes).evaluateAsString(result.getNode()); weather.setState(state); - expression = xpathPrefix + "p:Temperature"; + expression = XPATH_PREFIX + "p:Temperature"; String temperature = XPathExpressionFactory.createXPathExpression(expression, namespacePrefixes).evaluateAsString(result.getNode()); weather.setTemperature(temperature); - expression = xpathPrefix + "p:Description"; + expression = XPATH_PREFIX + "p:Description"; String description = XPathExpressionFactory.createXPathExpression(expression, namespacePrefixes).evaluateAsString(result.getNode()); weather.setDescription(description); return weather; diff --git a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java index 7590b1e53..bd5b0ed20 100644 --- a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java +++ b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java @@ -41,7 +41,7 @@ */ public class InContainerTests { - private static Log logger = LogFactory.getLog(InContainerTests.class); + private static final Log logger = LogFactory.getLog(InContainerTests.class); private static final String WS_URI = "http://localhost:8080/ws-inbound-gateway/echoservice"; private final WebServiceTemplate template = new WebServiceTemplate(); diff --git a/basic/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java b/basic/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java index 3c9b87151..eaa1a95c7 100644 --- a/basic/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java +++ b/basic/xml/src/main/java/org/springframework/integration/samples/xml/ExternalResupply.java @@ -25,7 +25,7 @@ * @author Gary Russell */ public class ExternalResupply { - private static Log logger = LogFactory.getLog(ExternalResupply.class); + private static final Log logger = LogFactory.getLog(ExternalResupply.class); public void orderResupply(Document resupplyOrder) { logger.info("Placing resupply order: \n" + XmlUtil.docAsString(resupplyOrder)); diff --git a/basic/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java b/basic/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java index c2f2aadda..83f8932c1 100644 --- a/basic/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java +++ b/basic/xml/src/main/java/org/springframework/integration/samples/xml/WarehouseDispatch.java @@ -25,7 +25,7 @@ * @author Gary Russell */ public class WarehouseDispatch { - private static Log logger = LogFactory.getLog(WarehouseDispatch.class); + private static final Log logger = LogFactory.getLog(WarehouseDispatch.class); public void dispatch(Document orderItem){ logger.info("Warehouse dispatching orderItem: \n" + XmlUtil.docAsString(orderItem)); diff --git a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java index 1843b8f27..302e38e42 100644 --- a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java +++ b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java @@ -68,9 +68,9 @@ public interface Cafe { } - private AtomicInteger hotDrinkCounter = new AtomicInteger(); + private final AtomicInteger hotDrinkCounter = new AtomicInteger(); - private AtomicInteger coldDrinkCounter = new AtomicInteger(); + private final AtomicInteger coldDrinkCounter = new AtomicInteger(); @Bean(name = PollerMetadata.DEFAULT_POLLER) public PollerMetadata poller() { diff --git a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/ListenableFutureTest.java b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/ListenableFutureTest.java index ec8f1d25c..ca00e1df6 100644 --- a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/ListenableFutureTest.java +++ b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/ListenableFutureTest.java @@ -59,7 +59,7 @@ @DirtiesContext public class ListenableFutureTest { - private static Log logger = LogFactory.getLog(ListenableFutureTest.class); + private static final Log logger = LogFactory.getLog(ListenableFutureTest.class); @Autowired private MathGateway gateway; diff --git a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java index e6d5b9897..ef86913bf 100644 --- a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java +++ b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java @@ -58,7 +58,7 @@ @DirtiesContext public class MonoGatewayTests { - private static Log logger = LogFactory.getLog(MonoGatewayTests.class); + private static final Log logger = LogFactory.getLog(MonoGatewayTests.class); @Autowired private MathGateway gateway; diff --git a/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailFragment.java b/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailFragment.java index d6750a4b6..d2e0e9023 100644 --- a/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailFragment.java +++ b/intermediate/mail-attachments/src/main/java/org/springframework/integration/samples/mailattachments/support/EmailFragment.java @@ -32,11 +32,11 @@ */ public class EmailFragment { - private Object data; + private final Object data; - private String filename; + private final String filename; - private File directory; + private final File directory; /** * Constructor. diff --git a/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java b/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java index bf444389b..2342944cb 100644 --- a/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java @@ -44,7 +44,7 @@ public class DefaultTwitterService implements TwitterService { /** Holds a collection of polled Twitter messages */ - private Map twitterMessages; + private final Map twitterMessages; @Autowired private MessageChannel controlBusChannel; diff --git a/intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartReceiver.java b/intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartReceiver.java index 6481d1c3b..7043ece42 100644 --- a/intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartReceiver.java +++ b/intermediate/multipart-http/src/main/java/org/springframework/integration/samples/multipart/MultipartReceiver.java @@ -28,7 +28,7 @@ * */ public class MultipartReceiver { - private static Log logger = LogFactory.getLog(MultipartReceiver.class); + private static final Log logger = LogFactory.getLog(MultipartReceiver.class); @SuppressWarnings("rawtypes") public void receive(LinkedMultiValueMap multipartRequest){ diff --git a/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java b/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java index c95571674..600a1b619 100644 --- a/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java +++ b/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartClientForHttpOutboundClient.java @@ -32,13 +32,13 @@ */ public class MultipartClientForHttpOutboundClient { - private static Log logger = LogFactory.getLog(MultipartClientForHttpOutboundClient.class); - private static String resourcePath = "org/springframework/integration/samples/multipart/spring09_logo.png"; + private static final Log logger = LogFactory.getLog(MultipartClientForHttpOutboundClient.class); + private static final String RESOURCE_PATH = "org/springframework/integration/samples/multipart/spring09_logo.png"; public static void main(String[] args) throws Exception{ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "/META-INF/spring/integration/http-outbound-config.xml"); - Resource s2logo = new ClassPathResource(resourcePath); + Resource s2logo = new ClassPathResource(RESOURCE_PATH); Map multipartMap = new HashMap(); multipartMap.put("company", new String[]{"SpringSource", "VMWare"}); multipartMap.put("company-logo", s2logo); diff --git a/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java b/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java index 6491362e3..2a3df825a 100644 --- a/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java +++ b/intermediate/multipart-http/src/test/java/org/springframework/integration/samples/multipart/MultipartRestClient.java @@ -36,15 +36,15 @@ */ public class MultipartRestClient { - private static Log logger = LogFactory.getLog(MultipartRestClient.class); + private static final Log logger = LogFactory.getLog(MultipartRestClient.class); - private static String uri = "http://localhost:8080/multipart-http/inboundAdapter.htm"; + private static final String URI = "http://localhost:8080/multipart-http/inboundAdapter.htm"; - private static String resourcePath = "org/springframework/integration/samples/multipart/spring09_logo.png"; + private static final String RESOURCE_PATH = "org/springframework/integration/samples/multipart/spring09_logo.png"; public static void main(String[] args) throws Exception{ RestTemplate template = new RestTemplate(); - Resource s2logo = new ClassPathResource(resourcePath); + Resource s2logo = new ClassPathResource(RESOURCE_PATH); MultiValueMap multipartMap = new LinkedMultiValueMap(); multipartMap.add("company", "SpringSource"); multipartMap.add("company-logo", s2logo); @@ -52,8 +52,8 @@ public static void main(String[] args) throws Exception{ HttpHeaders headers = new HttpHeaders(); headers.setContentType(new MediaType("multipart", "form-data")); HttpEntity request = new HttpEntity(multipartMap, headers); - logger.info("Posting request to: " + uri); - ResponseEntity httpResponse = template.exchange(uri, HttpMethod.POST, request, Object.class); + logger.info("Posting request to: " + URI); + ResponseEntity httpResponse = template.exchange(URI, HttpMethod.POST, request, Object.class); if (!httpResponse.getStatusCode().equals(HttpStatus.OK)){ logger.error("Problems with the request. Http status: " + httpResponse.getStatusCode()); } diff --git a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java index c875a4b02..4cb429e19 100644 --- a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java +++ b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java @@ -37,7 +37,8 @@ @Service("employeeSearchService") public class EmployeeSearchService { - private static Log logger = LogFactory.getLog(EmployeeSearchService.class); + private static final Log logger = LogFactory.getLog(EmployeeSearchService.class); + /** * The API getEmployee() looks up the mapped in coming message header's id param * and fills the return object with the appropriate employee details. The return diff --git a/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java b/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java index 21437349a..fb34e2d72 100644 --- a/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java +++ b/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java @@ -68,7 +68,7 @@ public class RestHttpClientTest { private HttpMessageConverterExtractor responseExtractor; - private static Log logger = LogFactory.getLog(RestHttpClientTest.class); + private static final Log logger = LogFactory.getLog(RestHttpClientTest.class); @Autowired private Jaxb2Marshaller marshaller; diff --git a/intermediate/splitter-aggregator-reaper/src/main/java/org/springframework/integration/samples/splitteraggregator/CompositeResult.java b/intermediate/splitter-aggregator-reaper/src/main/java/org/springframework/integration/samples/splitteraggregator/CompositeResult.java index 9b2f200cd..5969bc1d5 100644 --- a/intermediate/splitter-aggregator-reaper/src/main/java/org/springframework/integration/samples/splitteraggregator/CompositeResult.java +++ b/intermediate/splitter-aggregator-reaper/src/main/java/org/springframework/integration/samples/splitteraggregator/CompositeResult.java @@ -25,7 +25,7 @@ * */ public class CompositeResult extends Result { - private Collection results = new ArrayList(); + private final Collection results = new ArrayList(); public Collection getResults() { return results; diff --git a/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/City.java b/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/City.java index a8a10ce9a..16d1a142e 100644 --- a/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/City.java +++ b/intermediate/travel/src/main/java/org/springframework/integration/samples/travel/City.java @@ -31,10 +31,10 @@ public enum City { BOSTON(2, "Boston", "02201", "42.636182,-71.651862,42.080413,-70.467446"), SAN_FRANCISCO(3, "San Francisco", "94102", "38.052886,-123.009856,37.497117,-121.82544"); - private Integer id; - private String name; - private String boundingBox; - private String postalCode; + private final Integer id; + private final String name; + private final String boundingBox; + private final String postalCode; private City(Integer id, String name, String postalCode, String boundingBox) { this.id = id; From 0b83398a9cdca60c6c5f00f39afc49aa1329b3f4 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 10 Jun 2022 15:42:03 -0400 Subject: [PATCH 289/356] Some JmsMockTests tweaks --- .../samples/advance/testing/jms/JmsMockTests-context.xml | 2 +- .../integration/samples/advance/testing/jms/JmsMockTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml index b5c83021c..70eadc0db 100644 --- a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml +++ b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml @@ -19,7 +19,7 @@ jms-template="jmsTemplate" channel="inputChannel" auto-startup="false"> - + diff --git a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java index 4e5ed368c..07a4d692f 100644 --- a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java +++ b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -162,7 +162,7 @@ protected void verifyMessage(Message message) { */ protected boolean verifyJmsMessageReceivedOnOutputChannel(Object obj, SubscribableChannel expectedOutputChannel, CountDownHandler handler) throws InterruptedException { - return verifyJmsMessageOnOutputChannel(obj, expectedOutputChannel, handler, 7000); + return verifyJmsMessageOnOutputChannel(obj, expectedOutputChannel, handler, 10000); } From ceeebd7be76733ea6015fe3f2597d40bc7d1fbc3 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 12 Jul 2022 17:25:34 -0400 Subject: [PATCH 290/356] Upgrade to the latest deps; fix compatibility --- advanced/advanced-testing-examples/pom.xml | 4 +- advanced/dynamic-ftp/pom.xml | 4 +- advanced/dynamic-tcp-client/pom.xml | 2 +- applications/cafe-scripted/pom.xml | 4 +- applications/cafe/cafe-amqp/pom.xml | 4 +- applications/cafe/cafe-jms/pom.xml | 4 +- applications/cafe/cafe-si/pom.xml | 4 +- applications/file-split-ftp/pom.xml | 2 +- .../samples/filesplit/Application.java | 2 +- applications/loan-broker/pom.xml | 4 +- applications/loanshark/pom.xml | 10 +- applications/stomp-chat/pom.xml | 2 +- basic/amqp/pom.xml | 4 +- basic/barrier/pom.xml | 2 +- basic/control-bus/pom.xml | 4 +- basic/enricher/pom.xml | 4 +- basic/feed/pom.xml | 4 +- basic/file/pom.xml | 4 +- basic/ftp/pom.xml | 4 +- basic/helloworld/pom.xml | 4 +- basic/http/pom.xml | 4 +- basic/jdbc/pom.xml | 4 +- basic/jms/pom.xml | 4 +- basic/jmx/pom.xml | 4 +- .../integration/samples/jmx/StopWatch.java | 12 +- basic/jpa/pom.xml | 2 +- basic/jpa/src/main/resources/schema.sql | 2 +- .../integration/samples/jpa/JpaTests.java | 7 +- basic/kafka/pom.xml | 4 +- basic/mail/pom.xml | 4 +- basic/mongodb/pom.xml | 6 +- basic/mqtt/pom.xml | 2 +- basic/oddeven/pom.xml | 4 +- basic/quote/pom.xml | 4 +- basic/sftp/pom.xml | 4 +- basic/tcp-amqp/pom.xml | 4 +- basic/tcp-broadcast/pom.xml | 2 +- basic/tcp-client-server/pom.xml | 4 +- basic/tcp-with-headers/pom.xml | 2 +- basic/testing-examples/pom.xml | 4 +- basic/twitter/pom.xml | 4 +- basic/web-sockets/pom.xml | 2 +- basic/ws-inbound-gateway/pom.xml | 4 +- basic/ws-outbound-gateway/pom.xml | 4 +- basic/xml/pom.xml | 4 +- basic/xmpp/pom.xml | 4 +- build.gradle | 11 +- dsl/cafe-dsl/pom.xml | 2 +- dsl/kafka-dsl/pom.xml | 4 +- dsl/si4demo/pom.xml | 2 +- intermediate/async-gateway/pom.xml | 4 +- intermediate/dynamic-poller/pom.xml | 4 +- .../poller/DynamicPeriodicTrigger.java | 159 ------------------ .../integration/samples/poller/Main.java | 9 +- .../spring-integration-context.xml | 4 +- intermediate/errorhandling/pom.xml | 4 +- intermediate/file-processing/pom.xml | 4 +- intermediate/mail-attachments/pom.xml | 4 +- intermediate/monitoring/pom.xml | 4 +- intermediate/multipart-http/pom.xml | 4 +- intermediate/rest-http/pom.xml | 4 +- intermediate/retry-and-more/pom.xml | 4 +- .../splitter-aggregator-reaper/pom.xml | 4 +- intermediate/stored-procedures-derby/pom.xml | 4 +- intermediate/stored-procedures-ms/pom.xml | 4 +- intermediate/stored-procedures-oracle/pom.xml | 4 +- .../stored-procedures-postgresql/pom.xml | 4 +- intermediate/tcp-async-bi-directional/pom.xml | 2 +- .../tcp-client-server-multiplex/pom.xml | 4 +- intermediate/testcontainers-rabbitmq/pom.xml | 2 +- intermediate/travel/pom.xml | 4 +- intermediate/tx-synch/pom.xml | 4 +- 72 files changed, 143 insertions(+), 301 deletions(-) delete mode 100644 intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/DynamicPeriodicTrigger.java diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index fb0ade56e..5ae68360e 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 704f0a26f..61cfa6fed 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index d46e60199..dbf3fd90c 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -145,7 +145,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 5ff3a53ba..98fc9b32e 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -93,7 +93,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -166,7 +166,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index b592d65fa..5291c084b 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index a07b29b5c..2e78641ff 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -90,7 +90,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -163,7 +163,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 3c05423a3..1cb6e579c 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -138,7 +138,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index b74b012c0..89fa73007 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java index 7555f4cb7..ec3bf54f3 100644 --- a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java +++ b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java @@ -66,7 +66,7 @@ public static void main(String[] args) { */ @Bean public IntegrationFlow fromFile() { - return IntegrationFlows.from( + return IntegrationFlow.from( Files.inboundAdapter(new File("/tmp/in")) .preventDuplicates(false) .patternFilter("*.txt"), e -> e.poller(Pollers.fixedDelay(5000) diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 2a6fddd6a..a76f05a29 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 2d874c886..1342e378d 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -165,9 +165,9 @@ compile - org.hibernate - hibernate-core-jakarta - 5.6.3.Final + org.hibernate.orm + hibernate-core + 6.1.1.Final compile @@ -217,7 +217,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 runtime @@ -332,7 +332,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 27fff7b35..1fc2d8982 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -155,7 +155,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 984dd4fbb..585529c68 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 7439c52c2..a72ea9b72 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 08aadb038..4a7b76ca8 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index edd281310..1484b7be1 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index ccafa1ba7..2e8e28b37 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 9225df8c7..57fc3aca0 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 4a5936832..ebb5ae42c 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -112,7 +112,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 test @@ -157,7 +157,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 44438e3fe..1e60ad46e 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 43ff12fd4..2d3bf78d0 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -88,7 +88,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -193,7 +193,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 472eefbcf..5fc58196f 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index edcf5ef93..1fc6a721e 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -89,7 +89,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -162,7 +162,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 8d5f6e59e..0430b5770 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -138,7 +138,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/jmx/src/main/java/org/springframework/integration/samples/jmx/StopWatch.java b/basic/jmx/src/main/java/org/springframework/integration/samples/jmx/StopWatch.java index f95258e31..e1bed775e 100644 --- a/basic/jmx/src/main/java/org/springframework/integration/samples/jmx/StopWatch.java +++ b/basic/jmx/src/main/java/org/springframework/integration/samples/jmx/StopWatch.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ package org.springframework.integration.samples.jmx; +import java.time.Duration; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; @@ -28,6 +29,8 @@ /** * @author Mark Fisher + * @author Artme Bilan + * * @since 2.0 */ @Component @@ -52,11 +55,8 @@ public void afterPropertiesSet() { @ManagedOperation public void start() { this.scheduler.initialize(); - this.future = this.scheduler.scheduleAtFixedRate(new Runnable() { - public void run() { - seconds.incrementAndGet(); - } - }, 1000); + this.future = + this.scheduler.scheduleAtFixedRate(seconds::incrementAndGet, Duration.ofSeconds(1)); } @ManagedOperation diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 562ca4c86..daf3192be 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -162,7 +162,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/jpa/src/main/resources/schema.sql b/basic/jpa/src/main/resources/schema.sql index 87a0eb53d..6daf8cd4b 100644 --- a/basic/jpa/src/main/resources/schema.sql +++ b/basic/jpa/src/main/resources/schema.sql @@ -2,4 +2,4 @@ drop table if EXISTS PEOPLE; CREATE TABLE PEOPLE (id BIGINT generated by default as identity, name VARCHAR(255), CREATED_DATE_TIME TIMESTAMP, PRIMARY KEY (id)); -CREATE SEQUENCE HIBERNATE_SEQUENCE START WITH 1 INCREMENT BY 1; +CREATE SEQUENCE PEOPLE_SEQ START WITH 1 INCREMENT BY 50; diff --git a/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java b/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java index 80e93e5c4..5eb8e756d 100644 --- a/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java +++ b/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.jpa; import static org.junit.Assert.assertEquals; @@ -21,15 +22,12 @@ import java.util.Calendar; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.integration.samples.jpa.domain.Person; import org.springframework.integration.samples.jpa.service.PersonService; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * @@ -37,7 +35,6 @@ * @author Artem Bilan * */ -@RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) public class JpaTests { diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 55d250d3a..edd0d7eef 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -77,7 +77,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -162,7 +162,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 635eb9ab4..5d60a39de 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 06e9386f7..d372658fd 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -60,13 +60,13 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile org.mongodb mongodb-driver-sync - 4.4.1 + 4.7.0-beta0 compile @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 5b3afe3e0..8e48f297c 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index b3162ed0b..315a7e46a 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index cb64697b4..531059fea 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 206eef1f9..9f66f62d6 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index e4e488f88..93931f4c7 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 runtime @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index e7b18c1da..bcaa24e02 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 0385363a2..470f89cc9 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index a473ecf6a..7da422bf5 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 6148f52f5..85de7860e 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -148,7 +148,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index dd74a6ffe..60d47baec 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -61,7 +61,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -134,7 +134,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 6919651ac..7e62a2c76 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -145,7 +145,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 37fc813c1..2b7e5c358 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -70,7 +70,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -175,7 +175,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 700361619..ef56d03f4 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -138,7 +138,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index e1f16c8cf..002d906c0 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 55accb13f..4a421b0d0 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/build.gradle b/build.gradle index 8caa04b3e..215d95165 100644 --- a/build.gradle +++ b/build.gradle @@ -232,7 +232,7 @@ subprojects { subproject -> c3p0Version = '0.9.5.5' derbyVersion = '10.14.2.0' hamcrestVersion = '2.2' - hibernateVersion = '5.6.3.Final' + hibernateVersion = '6.1.1.Final' hibernateValidatorVersion = '7.0.2.Final' ftpServerVersion = '1.1.2' flexjsonVersion = '2.0' @@ -252,15 +252,15 @@ subprojects { subproject -> junitVersion = '4.13.2' junitJupiterVersion = '5.8.2' jythonVersion = '2.7.2' - log4jVersion = '2.17.1' + log4jVersion = '2.17.2' mockitoVersion = '4.2.0' - mongoDriverVersion = '4.4.1' + mongoDriverVersion = '4.7.0-beta0' openJpaVersion = '2.4.0' oracleDriverVersion = '19.3.0.0' postgresVersion = '42.3.3' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.0-SNAPSHOT' - springIntegrationVersion = '6.0.0-M3' + springIntegrationVersion = '6.0.0-SNAPSHOT' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' springVersion = '6.0.0-SNAPSHOT' @@ -464,7 +464,7 @@ project('loanshark') { api "net.sf.flexjson:flexjson:$flexjsonVersion" api "org.hibernate:hibernate-validator:$hibernateValidatorVersion" api "org.eclipse.persistence:org.eclipse.persistence.jpa:$jpaApiVersion" - api "org.hibernate:hibernate-core-jakarta:$hibernateVersion" + api "org.hibernate.orm:hibernate-core:$hibernateVersion" api "org.springframework.webflow:spring-js:$springWebFlowVersion" api "org.slf4j:slf4j-api:$slf4jVersion" @@ -1565,4 +1565,3 @@ sonarqube { property 'sonar.links.scm_dev', linkScmDevConnection } } - diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 04fbea3ba..ad7cbef99 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -156,7 +156,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 14867fa8c..e6f003f48 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -156,7 +156,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index cac47b37f..063adda0a 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -178,7 +178,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 2a92dc573..6cb6d9557 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index d0b27005e..c3a0bfc5a 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/DynamicPeriodicTrigger.java b/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/DynamicPeriodicTrigger.java deleted file mode 100644 index f1053ce2a..000000000 --- a/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/DynamicPeriodicTrigger.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Copyright 2002-2012 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.integration.samples.poller; - -import java.util.Date; -import java.util.concurrent.TimeUnit; - -import org.springframework.scheduling.Trigger; -import org.springframework.scheduling.TriggerContext; -import org.springframework.scheduling.support.PeriodicTrigger; -import org.springframework.util.Assert; - - -/** - * This is a dynamically changeable {@link Trigger}. It is based on the - * {@link PeriodicTrigger} implementations. However, the fields of this dynamic - * trigger are not final and the properties can be inspected and set via - * explicit getters and setters. - * - * @author Gunnar Hillert - * - */ -public class DynamicPeriodicTrigger implements Trigger { - - private volatile long period; - - private volatile TimeUnit timeUnit; - - private volatile long initialDelay = 0; - - private volatile boolean fixedRate = false; - - /** - * Create a trigger with the given period in milliseconds. The underlying - * {@link TimeUnit} will be initialized to TimeUnit.MILLISECONDS. - * - * @param period Must not be negative - */ - public DynamicPeriodicTrigger(long period) { - this(period, TimeUnit.MILLISECONDS); - } - - /** - * Create a trigger with the given period and time unit. The time unit will - * apply not only to the period but also to any 'initialDelay' value, if - * configured on this Trigger later via {@link #setInitialDelay(long)}. - * - * @param period Must not be negative - * @param timeUnit Must not be null - * - */ - public DynamicPeriodicTrigger(long period, TimeUnit timeUnit) { - Assert.isTrue(period >= 0, "period must not be negative"); - Assert.notNull(timeUnit, "timeUnit must not be null"); - - this.timeUnit = timeUnit; - this.period = this.timeUnit.toMillis(period); - } - - /** - * Specify the delay for the initial execution. It will be evaluated in - * terms of this trigger's {@link TimeUnit}. If no time unit was explicitly - * provided upon instantiation, the default is milliseconds. - */ - public void setInitialDelay(long initialDelay) { - Assert.isTrue(initialDelay >= 0, "initialDelay must not be negative"); - this.initialDelay = this.timeUnit.toMillis(initialDelay); - } - - /** - * Specify whether the periodic interval should be measured between the - * scheduled start times rather than between actual completion times. - * The latter, "fixed delay" behavior, is the default. - */ - public void setFixedRate(boolean fixedRate) { - this.fixedRate = fixedRate; - } - - /** - * Returns the time after which a task should run again. - */ - public Date nextExecutionTime(TriggerContext triggerContext) { - if (triggerContext.lastScheduledExecutionTime() == null) { - return new Date(System.currentTimeMillis() + this.initialDelay); - } - else if (this.fixedRate) { - return new Date(triggerContext.lastScheduledExecutionTime().getTime() + this.period); - } - return new Date(triggerContext.lastCompletionTime().getTime() + this.period); - } - - public long getPeriod() { - return period; - } - - /** - * Specify the period of the trigger. It will be evaluated in - * terms of this trigger's {@link TimeUnit}. If no time unit was explicitly - * provided upon instantiation, the default is milliseconds. - * - * @param period Must not be negative - */ - public void setPeriod(long period) { - Assert.isTrue(period >= 0, "period must not be negative"); - this.period = this.timeUnit.toMillis(period); - } - - public TimeUnit getTimeUnit() { - return timeUnit; - } - - public void setTimeUnit(TimeUnit timeUnit) { - Assert.notNull(timeUnit, "timeUnit must not be null"); - this.timeUnit = timeUnit; - } - - public long getInitialDelay() { - return initialDelay; - } - - public boolean isFixedRate() { - return fixedRate; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof DynamicPeriodicTrigger)) { - return false; - } - DynamicPeriodicTrigger other = (DynamicPeriodicTrigger) obj; - return this.fixedRate == other.fixedRate - && this.initialDelay == other.initialDelay - && this.period == other.period; - } - - @Override - public int hashCode() { - return (this.fixedRate ? 14 : 41) + - (int) (38 * this.period) + - (int) (43 * this.initialDelay); - } - -} diff --git a/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/Main.java b/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/Main.java index a97be1a8d..5a27ed2b3 100644 --- a/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/Main.java +++ b/intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/Main.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.poller; +import java.time.Duration; import java.util.Scanner; import org.apache.commons.logging.Log; @@ -22,12 +24,15 @@ import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.util.DynamicPeriodicTrigger; /** * Starts the Spring Context and will initialize the Spring Integration routes. * * @author Gunnar Hillert * @author Gary Russell + * @author Artem Bilan + * * @version 1.0 * */ @@ -85,7 +90,7 @@ public static void main(final String... args) { System.out.println(String.format("Setting trigger period to '%s' ms", triggerPeriod)); - trigger.setPeriod(triggerPeriod); + trigger.setDuration(Duration.ofMillis(triggerPeriod)); } catch (Exception e) { diff --git a/intermediate/dynamic-poller/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/intermediate/dynamic-poller/src/main/resources/META-INF/spring/integration/spring-integration-context.xml index ac2de791b..0205d849c 100644 --- a/intermediate/dynamic-poller/src/main/resources/META-INF/spring/integration/spring-integration-context.xml +++ b/intermediate/dynamic-poller/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -14,8 +14,8 @@ - + class="org.springframework.integration.util.DynamicPeriodicTrigger"> + org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 32f0ca873..374817bf9 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index b14c452be..85ad4eeef 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -77,7 +77,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index d41c04d70..1d0788176 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -82,7 +82,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -187,7 +187,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 4bc3275f3..fab93cd02 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -82,7 +82,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -187,7 +187,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index d2e7a0b4a..0a53a8012 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -107,7 +107,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -218,7 +218,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 355752357..fa006d14d 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -93,7 +93,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -166,7 +166,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 6058a5e75..3b2750fde 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 92a78442c..8ae1d1206 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 853193857..48365ef65 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -72,7 +72,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -145,7 +145,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 3af1e68c8..02f635d4d 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index c09b029e3..34cbd4b3e 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -78,7 +78,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -151,7 +151,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 7ac736cc8..0a36696d2 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -145,7 +145,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 028c38252..322bde3a8 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 74f48375e..3555be721 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -179,7 +179,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 3cce93883..b8a3c4354 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -70,7 +70,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -143,7 +143,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 709b0be71..78f788809 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.17.1 + 2.17.2 compile @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M3 + 6.0.0-SNAPSHOT import pom From c5f2576eb48f8fe8b648ab3c7ae954e4131b201c Mon Sep 17 00:00:00 2001 From: Moritz Reiter Date: Thu, 21 Jul 2022 16:56:09 +0200 Subject: [PATCH 291/356] Remove duplicate item in readme The 'jpa' item is listed twice in the overview of the basic examples in the root readme. This commit removes the duplicate. --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 2f250e822..7c0345972 100644 --- a/README.md +++ b/README.md @@ -56,12 +56,11 @@ This is a good place to get started. The samples here are technically motivated * **jdbc** - Illustrates the usage of the Jdbc Adapters, including object persistence and retrieval * **jms** - Demonstrates **JMS** support available with Spring Integration * **jmx** - Demonstrates **JMX** support using a **JMX Attribute Polling Channel** and **JMX Operation Invoking Channel Adapter** -* **jpa** - Shows the usage of the JPA Components can be used +* **jpa** - Shows the usage of the JPA Components * **mail** - Example showing **IMAP** and **POP3** support * **mqtt** - Demonstrates the functionality of inbound and outbound **MQTT Adapters** * **mongodb** - Shows how to persist a Message payload to a **MongoDb** document store and how to read documents from **MongoDb** * **oddeven** - Example combining the functionality of **Inbound Channel Adapter**, **Filter**, **Router** and **Poller** -* **jpa** - This sample illustrates how the JPA Components can be used * **quote** - Example demoing core EIP support using **Channel Adapter (Inbound and Stdout)**, **Poller** with Interval Triggers, **Service Activator** * **sftp** - Demonstrating SFTP support using **SFTP Inbound / Outbound Channel Adapters** * **tcp-amqp** - Demonstrates basic functionality of bridging the **Spring Integration TCP Adapters** with **Spring Integration AMQP Adapters** From 833f55d662fb17edda6bcb000d952a3d00aa1dd8 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 22 Jul 2022 16:17:16 -0400 Subject: [PATCH 292/356] Upgrade to the latest dependencies * Fix deprecation warnings --- advanced/advanced-testing-examples/pom.xml | 2 +- advanced/dynamic-ftp/pom.xml | 2 +- advanced/dynamic-tcp-client/pom.xml | 2 +- applications/cafe-scripted/pom.xml | 2 +- applications/cafe/cafe-amqp/pom.xml | 2 +- applications/cafe/cafe-jms/pom.xml | 2 +- applications/cafe/cafe-si/pom.xml | 2 +- applications/file-split-ftp/pom.xml | 2 +- .../samples/filesplit/Application.java | 1 - applications/loan-broker/pom.xml | 2 +- applications/loanshark/pom.xml | 2 +- applications/stomp-chat/pom.xml | 2 +- basic/amqp/pom.xml | 2 +- basic/barrier/pom.xml | 2 +- basic/control-bus/pom.xml | 2 +- basic/enricher/pom.xml | 2 +- basic/feed/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/kafka/pom.xml | 2 +- .../samples/kafka/Application.java | 21 +++++----- basic/mail/pom.xml | 2 +- basic/mongodb/pom.xml | 2 +- basic/mqtt/pom.xml | 2 +- .../integration/samples/mqtt/Application.java | 40 +++++++++---------- basic/oddeven/pom.xml | 2 +- basic/quote/pom.xml | 2 +- basic/sftp/pom.xml | 2 +- basic/tcp-amqp/pom.xml | 2 +- basic/tcp-broadcast/pom.xml | 2 +- .../tcpbroadcast/TcpBroadcastApplication.java | 12 +++--- basic/tcp-client-server/pom.xml | 2 +- basic/tcp-with-headers/pom.xml | 2 +- .../tcpheaders/TcpWithHeadersApplication.java | 20 +++++----- basic/testing-examples/pom.xml | 2 +- basic/twitter/pom.xml | 2 +- basic/web-sockets/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 +- build.gradle | 2 +- dsl/cafe-dsl/pom.xml | 2 +- dsl/kafka-dsl/pom.xml | 2 +- .../samples/dsl/kafka/Application.java | 17 ++++---- dsl/si4demo/pom.xml | 2 +- .../samples/si4demo/dsl/Application.java | 8 ++-- .../samples/si4demo/springone/e/EDSL.java | 15 ++++--- .../samples/si4demo/springone/f/FMail.java | 25 ++++++------ .../samples/si4demo/springone/g/GIMAP.java | 15 ++++--- 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/rest-http/pom.xml | 2 +- intermediate/retry-and-more/pom.xml | 2 +- .../splitter-aggregator-reaper/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 +- intermediate/tcp-async-bi-directional/pom.xml | 2 +- .../TcpAsyncBiDirectionalApplication.java | 13 +++--- .../tcp-client-server-multiplex/pom.xml | 2 +- intermediate/testcontainers-rabbitmq/pom.xml | 2 +- intermediate/travel/pom.xml | 2 +- intermediate/tx-synch/pom.xml | 2 +- 76 files changed, 154 insertions(+), 163 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 5ae68360e..834e8f093 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 61cfa6fed..4bbbaaa64 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index dbf3fd90c..b7660accd 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -145,7 +145,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 98fc9b32e..e90f48bcf 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -166,7 +166,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 5291c084b..47b918e3e 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 2e78641ff..198ced869 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -163,7 +163,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 1cb6e579c..ebca7244c 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -138,7 +138,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 89fa73007..173346176 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java index ec3bf54f3..4cbe36f53 100644 --- a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java +++ b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java @@ -29,7 +29,6 @@ import org.springframework.boot.autoconfigure.mail.MailProperties; import org.springframework.context.annotation.Bean; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.dsl.Pollers; import org.springframework.integration.file.FileHeaders; import org.springframework.integration.file.FileWritingMessageHandler; diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index a76f05a29..be30a60f5 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 1342e378d..b5c29417c 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -332,7 +332,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 1fc2d8982..eacaba9bf 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -155,7 +155,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 585529c68..3fd26539c 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index a72ea9b72..246872bf1 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 4a7b76ca8..65510ef04 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 1484b7be1..2c15ec5ac 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 2e8e28b37..97a6a53f4 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 57fc3aca0..5322473e5 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index ebb5ae42c..c85f18db5 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -157,7 +157,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 1e60ad46e..0e8ddd62f 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 2d3bf78d0..0595860e7 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -193,7 +193,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 5fc58196f..e60c06504 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 1fc6a721e..55c8651d4 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -162,7 +162,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 0430b5770..90da9ed2e 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -138,7 +138,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index daf3192be..b2c2618cd 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -162,7 +162,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index edd0d7eef..e51cab3ce 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -162,7 +162,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java index 4fb71317f..37533990b 100644 --- a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java +++ b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java @@ -35,7 +35,6 @@ import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.dsl.context.IntegrationFlowContext; import org.springframework.integration.kafka.dsl.Kafka; import org.springframework.integration.kafka.inbound.KafkaMessageDrivenChannelAdapter; @@ -70,8 +69,8 @@ public class Application { public static void main(String[] args) throws Exception { ConfigurableApplicationContext context = new SpringApplicationBuilder(Application.class) - .web(WebApplicationType.NONE) - .run(args); + .web(WebApplicationType.NONE) + .run(args); context.getBean(Application.class).runDemo(context); context.close(); } @@ -96,12 +95,12 @@ private void runDemo(ConfigurableApplicationContext context) { addAnotherListenerForTopics(this.properties.getNewTopic()); headers = Collections.singletonMap(KafkaHeaders.TOPIC, this.properties.getNewTopic()); for (int i = 0; i < 10; i++) { - toKafka.send(new GenericMessage<>("bar" + i, headers)); + toKafka.send(new GenericMessage<>("bar" + i, headers)); } received = fromKafka.receive(10000); count = 0; while (received != null) { - System.out.println(received); + System.out.println(received); received = fromKafka.receive(++count < 10 ? 10000 : 1000); } } @@ -139,7 +138,7 @@ public KafkaMessageListenerContainer container( @Bean public KafkaMessageDrivenChannelAdapter - adapter(KafkaMessageListenerContainer container) { + adapter(KafkaMessageListenerContainer container) { KafkaMessageDrivenChannelAdapter kafkaMessageDrivenChannelAdapter = new KafkaMessageDrivenChannelAdapter<>(container); kafkaMessageDrivenChannelAdapter.setOutputChannel(fromKafka()); @@ -177,11 +176,11 @@ public void addAnotherListenerForTopics(String... topics) { consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, consumerProperties.get(ConsumerConfig.GROUP_ID_CONFIG) + "x"); IntegrationFlow flow = - IntegrationFlows - .from(Kafka.messageDrivenChannelAdapter( - new DefaultKafkaConsumerFactory(consumerProperties), topics)) - .channel("fromKafka") - .get(); + IntegrationFlow + .from(Kafka.messageDrivenChannelAdapter( + new DefaultKafkaConsumerFactory(consumerProperties), topics)) + .channel("fromKafka") + .get(); this.flowContext.registration(flow).register(); } diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 5d60a39de..447802aba 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index d372658fd..c4c7a221b 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 8e48f297c..d05febe4c 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java b/basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java index e7274aa07..d2e93459c 100644 --- a/basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java +++ b/basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.mqtt; import org.apache.commons.logging.Log; @@ -23,7 +24,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.dsl.Pollers; import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.integration.handler.LoggingHandler; @@ -54,24 +54,24 @@ public class Application { public static void main(final String... args) { LOGGER.info("\n=========================================================" - + "\n " - + "\n Welcome to Spring Integration! " - + "\n " - + "\n For more information please visit: " - + "\n https://spring.io/projects/spring-integration " - + "\n " - + "\n=========================================================" ); + + "\n " + + "\n Welcome to Spring Integration! " + + "\n " + + "\n For more information please visit: " + + "\n https://spring.io/projects/spring-integration " + + "\n " + + "\n========================================================="); LOGGER.info("\n=========================================================" - + "\n " - + "\n This is the MQTT Sample - " - + "\n " - + "\n Please enter some text and press return. The entered " - + "\n Message will be sent to the configured MQTT topic, " - + "\n then again immediately retrieved from the Message " - + "\n Broker and ultimately printed to the command line. " - + "\n " - + "\n=========================================================" ); + + "\n " + + "\n This is the MQTT Sample - " + + "\n " + + "\n Please enter some text and press return. The entered " + + "\n Message will be sent to the configured MQTT topic, " + + "\n then again immediately retrieved from the Message " + + "\n Broker and ultimately printed to the command line. " + + "\n " + + "\n========================================================="); SpringApplication.run(Application.class, args); } @@ -80,7 +80,7 @@ public static void main(final String... args) { public MqttPahoClientFactory mqttClientFactory() { DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory(); MqttConnectOptions options = new MqttConnectOptions(); - options.setServerURIs(new String[] { "tcp://localhost:1883" }); + options.setServerURIs(new String[]{ "tcp://localhost:1883" }); options.setUserName("guest"); options.setPassword("guest".toCharArray()); factory.setConnectionOptions(options); @@ -91,7 +91,7 @@ public MqttPahoClientFactory mqttClientFactory() { @Bean public IntegrationFlow mqttOutFlow() { - return IntegrationFlows.from(CharacterStreamReadingMessageSource.stdin(), + return IntegrationFlow.from(CharacterStreamReadingMessageSource.stdin(), e -> e.poller(Pollers.fixedDelay(1000))) .transform(p -> p + " sent to MQTT") .handle(mqttOutbound()) @@ -110,7 +110,7 @@ public MessageHandler mqttOutbound() { @Bean public IntegrationFlow mqttInFlow() { - return IntegrationFlows.from(mqttInbound()) + return IntegrationFlow.from(mqttInbound()) .transform(p -> p + ", received from MQTT") .handle(logger()) .get(); diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 315a7e46a..c2a099ace 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 531059fea..c33cac93c 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 9f66f62d6..2200c61d1 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 93931f4c7..7f300698c 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index bcaa24e02..6ae7f10db 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java b/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java index 3e18c70fb..1d21bab2c 100644 --- a/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java +++ b/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java @@ -36,7 +36,6 @@ import org.springframework.context.event.EventListener; import org.springframework.core.task.TaskExecutor; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.dsl.Tcp; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; @@ -73,7 +72,7 @@ public AbstractServerConnectionFactory serverFactory() { */ @Bean public IntegrationFlow tcpServer(AbstractServerConnectionFactory serverFactory) { - return IntegrationFlows.from(Tcp.inboundAdapter(serverFactory)) + return IntegrationFlow.from(Tcp.inboundAdapter(serverFactory)) .transform(p -> "connected!") .channel("toTcp.input") .get(); @@ -84,9 +83,9 @@ public IntegrationFlow tcpServer(AbstractServerConnectionFactory serverFactory) */ @Bean public IntegrationFlow gateway() { - return IntegrationFlows.from(Sender.class) - .channel("toTcp.input") - .get(); + return IntegrationFlow.from(Sender.class) + .channel("toTcp.input") + .get(); } /* @@ -155,6 +154,7 @@ public String broadcast(@PathVariable String what) { public void shutDown() { this.applicationContext.close(); } + } @Component @@ -188,7 +188,7 @@ public void run() { socket = SocketFactory.getDefault().createSocket("localhost", PORT); socket.getOutputStream().write("hello\r\n".getBytes()); InputStream is = socket.getInputStream(); - while(true) { + while (true) { System.out.println(new String(deserializer.deserialize(is)) + " from client# " + instance); } } diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 470f89cc9..421ed3865 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 7da422bf5..2b83cd445 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/tcp-with-headers/src/main/java/org/springframework/integration/samples/tcpheaders/TcpWithHeadersApplication.java b/basic/tcp-with-headers/src/main/java/org/springframework/integration/samples/tcpheaders/TcpWithHeadersApplication.java index 7f79ab496..6962c1caa 100644 --- a/basic/tcp-with-headers/src/main/java/org/springframework/integration/samples/tcpheaders/TcpWithHeadersApplication.java +++ b/basic/tcp-with-headers/src/main/java/org/springframework/integration/samples/tcpheaders/TcpWithHeadersApplication.java @@ -26,7 +26,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.DependsOn; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.handler.LoggingHandler.Level; import org.springframework.integration.ip.dsl.Tcp; import org.springframework.integration.ip.tcp.connection.MessageConvertingTcpMessageMapper; @@ -46,13 +45,13 @@ public static void main(String[] args) { public interface TcpExchanger { - public String exchange(String data, @Header("type") String type); + String exchange(String data, @Header("type") String type); } @Bean public IntegrationFlow client(@Value("${tcp.port:1234}") int port) { - return IntegrationFlows.from(TcpExchanger.class) + return IntegrationFlow.from(TcpExchanger.class) .handle(Tcp.outboundGateway(Tcp.netClient("localhost", port) .deserializer(jsonMapping()) .serializer(jsonMapping()) @@ -64,16 +63,16 @@ public IntegrationFlow client(@Value("${tcp.port:1234}") int port) { @Bean public IntegrationFlow server(@Value("${tcp.port:1234}") int port) { - return IntegrationFlows.from(Tcp.inboundGateway(Tcp.netServer(port) + return IntegrationFlow.from(Tcp.inboundGateway(Tcp.netServer(port) .deserializer(jsonMapping()) .serializer(jsonMapping()) .mapper(mapper()))) .log(Level.INFO, "exampleLogger", "'Received type header:' + headers['type']") .route("headers['type']", r -> r .subFlowMapping("upper", - subFlow -> subFlow.transform(String.class, p -> p.toUpperCase())) + subFlow -> subFlow.transform(String.class, String::toUpperCase)) .subFlowMapping("lower", - subFlow -> subFlow.transform(String.class, p -> p.toLowerCase()))) + subFlow -> subFlow.transform(String.class, String::toLowerCase))) .get(); } @@ -99,14 +98,15 @@ public ApplicationRunner runner(TcpExchanger exchanger, ConfigurableApplicationContext context) { return args -> { - System.out.println("Enter some text; if it starts with a lower case character,\n" - + "it will be uppercased by the server; otherwise it will be lowercased;\n" - + "enter 'quit' to end"); + System.out.println(""" + Enter some text; if it starts with a lower case character, + it will be upper-cased by the server; otherwise it will be lower-cased; + enter 'quit' to end"""); Scanner scanner = new Scanner(System.in); String request; if (scanner.hasNextLine()) { request = scanner.nextLine(); - while (!"quit".equals(request.toLowerCase())) { + while (!"quit".equalsIgnoreCase(request)) { if (StringUtils.hasText(request)) { String result = exchanger.exchange(request, Character.isLowerCase(request.charAt(0)) ? "upper" : "lower"); diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 85de7860e..6fdea688f 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -148,7 +148,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 60d47baec..eaae2e455 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -134,7 +134,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 7e62a2c76..05feb8d03 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -145,7 +145,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 2b7e5c358..cbc4af1df 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -175,7 +175,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index ef56d03f4..07829fd55 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -138,7 +138,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 002d906c0..1cda1f80e 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 4a421b0d0..668624dbd 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/build.gradle b/build.gradle index 215d95165..9a9e13a1d 100644 --- a/build.gradle +++ b/build.gradle @@ -260,7 +260,7 @@ subprojects { subproject -> postgresVersion = '42.3.3' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.0-SNAPSHOT' - springIntegrationVersion = '6.0.0-SNAPSHOT' + springIntegrationVersion = '6.0.0-M4' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' springVersion = '6.0.0-SNAPSHOT' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index ad7cbef99..2c62e20d6 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -156,7 +156,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index e6f003f48..e5055527c 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -156,7 +156,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java b/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java index f8329687f..65fab86a4 100644 --- a/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java +++ b/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java @@ -32,7 +32,6 @@ import org.springframework.integration.annotation.Gateway; import org.springframework.integration.annotation.MessagingGateway; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.dsl.context.IntegrationFlowContext; import org.springframework.integration.kafka.dsl.Kafka; import org.springframework.kafka.core.ConsumerFactory; @@ -54,8 +53,8 @@ public class Application { public static void main(String[] args) throws Exception { ConfigurableApplicationContext context = new SpringApplicationBuilder(Application.class) - .web(WebApplicationType.NONE) - .run(args); + .web(WebApplicationType.NONE) + .run(args); context.getBean(Application.class).runDemo(context); context.close(); } @@ -110,7 +109,7 @@ public IntegrationFlow toKafka(KafkaTemplate kafkaTemplate) { @Bean public IntegrationFlow fromKafkaFlow(ConsumerFactory consumerFactory) { - return IntegrationFlows + return IntegrationFlow .from(Kafka.messageDrivenChannelAdapter(consumerFactory, this.properties.getTopic())) .channel(c -> c.queue("fromKafka")) .get(); @@ -142,11 +141,11 @@ public void addAnotherListenerForTopics(String... topics) { consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, consumerProperties.get(ConsumerConfig.GROUP_ID_CONFIG) + "x"); IntegrationFlow flow = - IntegrationFlows - .from(Kafka.messageDrivenChannelAdapter( - new DefaultKafkaConsumerFactory(consumerProperties), topics)) - .channel("fromKafka") - .get(); + IntegrationFlow + .from(Kafka.messageDrivenChannelAdapter( + new DefaultKafkaConsumerFactory(consumerProperties), topics)) + .channel("fromKafka") + .get(); this.flowContext.registration(flow).register(); } diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 063adda0a..535d75efc 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -178,7 +178,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java index 0eea40b47..b82d5c850 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java @@ -32,7 +32,6 @@ import org.springframework.integration.annotation.MessagingGateway; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.http.inbound.HttpRequestHandlingMessagingGateway; import org.springframework.integration.http.inbound.RequestMapping; import org.springframework.integration.ip.tcp.TcpInboundGateway; @@ -129,7 +128,7 @@ public MessageChannel requestChannel() { @Bean @DependsOn("errorFlow") public IntegrationFlow flow() { - return IntegrationFlows.from("requestChannel") + return IntegrationFlow.from("requestChannel") .transform(new ObjectToStringTransformer()) .filter((String p) -> p.startsWith("#spring"), f -> f.discardChannel("rejected")) @@ -141,15 +140,14 @@ public IntegrationFlow flow() { @Bean public IntegrationFlow errorFlow() { - return IntegrationFlows.from("rejected") + return IntegrationFlow.from("rejected") .transform("'Error: hashtag must start with #spring; got' + payload") .get(); } @Bean public TwitterSearchOutboundGateway twitterGate() { - TwitterSearchOutboundGateway gateway = new TwitterSearchOutboundGateway(twitter()); - return gateway; + return new TwitterSearchOutboundGateway(twitter()); } @Bean diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java index d8f1de0b3..c55851f6d 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java @@ -26,7 +26,6 @@ import org.springframework.integration.annotation.MessagingGateway; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.messaging.MessageChannel; /** @@ -42,13 +41,13 @@ public class EDSL { public static void main(String[] args) throws Exception { ConfigurableApplicationContext ctx = new SpringApplicationBuilder(EDSL.class) - .web(WebApplicationType.NONE) - .run(args); + .web(WebApplicationType.NONE) + .run(args); System.out.println(ctx.getBean(FooService.class).foo("foo")); ctx.close(); } - @MessagingGateway(defaultRequestChannel="foo") + @MessagingGateway(defaultRequestChannel = "foo") public static interface FooService { String foo(String request); @@ -62,10 +61,10 @@ public MessageChannel foo() { @Bean IntegrationFlow flow() { - return IntegrationFlows.from(foo()) - .transform("payload + payload") - .handle(String.class, (p, h) -> p.toUpperCase()) - .get(); + return IntegrationFlow.from(foo()) + .transform("payload + payload") + .handle(String.class, (p, h) -> p.toUpperCase()) + .get(); } } diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java index 2dac41584..9aba04cc7 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java @@ -29,7 +29,6 @@ import org.springframework.integration.annotation.MessagingGateway; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.mail.dsl.Mail; import org.springframework.integration.samples.si4demo.springone.GMailProperties; import org.springframework.messaging.MessageChannel; @@ -57,7 +56,7 @@ public static void main(String[] args) throws Exception { ctx.close(); } - @MessagingGateway(defaultRequestChannel="foo.input") + @MessagingGateway(defaultRequestChannel = "foo.input") public static interface FooService { String foo(String request); @@ -67,11 +66,11 @@ public static interface FooService { @Bean IntegrationFlow foo() { return f -> f - .transform("payload + payload") - .handle(String.class, (p, h) -> p.toUpperCase()) - .routeToRecipients(r -> - r.recipient("bridgeToNowhere", "true") - .recipient("smtpChannel", "true")); + .transform("payload + payload") + .handle(String.class, (p, h) -> p.toUpperCase()) + .routeToRecipients(r -> + r.recipient("bridgeToNowhere", "true") + .recipient("smtpChannel", "true")); } @BridgeTo @@ -87,17 +86,17 @@ public MessageChannel smtpChannel() { @Bean IntegrationFlow smtp() { - return IntegrationFlows.from(smtpChannel()) + return IntegrationFlow.from(smtpChannel()) .enrichHeaders(Mail.headers() .subject("SpringOne 2014") .to("sispringone@gmail.com") .from("sispringone@gmail.com")) .handle(Mail.outboundAdapter("smtp.gmail.com") - .port(465) - .protocol("smtps") - .credentials(gmail.getUser(), gmail.getPassword()) - .javaMailProperties(p -> - p.put("mail.debug", "false")) + .port(465) + .protocol("smtps") + .credentials(gmail.getUser(), gmail.getPassword()) + .javaMailProperties(p -> + p.put("mail.debug", "false")) , e -> e.id("smtpOut")) .get(); } diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java index b3b225dcd..0c6131b2f 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java @@ -25,7 +25,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.mail.MailHeaders; import org.springframework.integration.mail.dsl.Mail; import org.springframework.integration.samples.si4demo.springone.GMailProperties; @@ -56,16 +55,16 @@ public static void main(String[] args) throws Exception { @Bean IntegrationFlow imapIdle() { - return IntegrationFlows.from(Mail.imapIdleAdapter( - "imaps://" - + gmail.getUser().replaceAll("@", "%40") - + ":" - + gmail.getPassword() - + "@imap.gmail.com:993/INBOX") + return IntegrationFlow.from(Mail.imapIdleAdapter( + "imaps://" + + gmail.getUser().replaceAll("@", "%40") + + ":" + + gmail.getPassword() + + "@imap.gmail.com:993/INBOX") .id("imapIn") .autoStartup(true) .javaMailProperties(p -> - p.put("mail.debug", "false"))) + p.put("mail.debug", "false"))) .enrichHeaders(s -> s.headerExpressions(h -> h .put(MailHeaders.SUBJECT, "payload.subject") .put(MailHeaders.FROM, "payload.from[0].toString()"))) diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 6cb6d9557..f75b4fbe0 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index c3a0bfc5a..fc3a3198f 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 1237f4e0b..4e21eb7c2 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 374817bf9..6c25cb3c3 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 85ad4eeef..723263714 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 1d0788176..e44680f0e 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -187,7 +187,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index fab93cd02..fd064e8a7 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -187,7 +187,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 0a53a8012..67c6ac068 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -218,7 +218,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index fa006d14d..929dae2ac 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -166,7 +166,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 3b2750fde..f6ffb7797 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 8ae1d1206..318f7c2d7 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 48365ef65..cb2b636fd 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -145,7 +145,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 02f635d4d..f5672588a 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 34cbd4b3e..47728617d 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -151,7 +151,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 0a36696d2..b7cf0b94c 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -145,7 +145,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java b/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java index 4674a7f10..41ab7fb3e 100644 --- a/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java +++ b/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java @@ -26,7 +26,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.event.EventListener; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.dsl.Pollers; import org.springframework.integration.dsl.Transformers; import org.springframework.integration.ip.IpHeaders; @@ -66,7 +65,7 @@ public AbstractClientConnectionFactory client1(SampleProperties properties) { @Bean public IntegrationFlow client1Out(AbstractClientConnectionFactory client1) { - return IntegrationFlows.fromSupplier(() -> "Hello from client1", e -> e.id("client1Adapter") + return IntegrationFlow.fromSupplier(() -> "Hello from client1", e -> e.id("client1Adapter") .poller(Pollers.fixedDelay(3000))) .handle(Tcp.outboundAdapter(client1)) .get(); @@ -74,7 +73,7 @@ public IntegrationFlow client1Out(AbstractClientConnectionFactory client1) { @Bean public IntegrationFlow client1In(AbstractClientConnectionFactory client1) { - return IntegrationFlows.from(Tcp.inboundAdapter(client1)) + return IntegrationFlow.from(Tcp.inboundAdapter(client1)) .transform(Transformers.objectToString()) .log(msg -> "client1: " + msg.getPayload()) .get(); @@ -87,7 +86,7 @@ public AbstractClientConnectionFactory client2(SampleProperties properties) { @Bean public IntegrationFlow client2Out(AbstractClientConnectionFactory client2) { - return IntegrationFlows.fromSupplier(() -> "Hello from client2", e -> e.id("client2Adapter") + return IntegrationFlow.fromSupplier(() -> "Hello from client2", e -> e.id("client2Adapter") .poller(Pollers.fixedDelay(2000))) .handle(Tcp.outboundAdapter(client2)) .get(); @@ -95,7 +94,7 @@ public IntegrationFlow client2Out(AbstractClientConnectionFactory client2) { @Bean public IntegrationFlow client2In(AbstractClientConnectionFactory client2) { - return IntegrationFlows.from(Tcp.inboundAdapter(client2)) + return IntegrationFlow.from(Tcp.inboundAdapter(client2)) .transform(Transformers.objectToString()) .log(msg -> "client2: " + msg.getPayload()) .get(); @@ -115,7 +114,7 @@ public AbstractServerConnectionFactory server(SampleProperties properties) { @Bean public IntegrationFlow serverIn(AbstractServerConnectionFactory server) { - return IntegrationFlows.from(Tcp.inboundAdapter(server)) + return IntegrationFlow.from(Tcp.inboundAdapter(server)) .transform(Transformers.objectToString()) .log(msg -> "server: " + msg.getPayload()) .get(); @@ -123,7 +122,7 @@ public IntegrationFlow serverIn(AbstractServerConnectionFactory server) { @Bean public IntegrationFlow serverOut(AbstractServerConnectionFactory server) { - return IntegrationFlows.fromSupplier(() -> "seed", e -> e.poller(Pollers.fixedDelay(5000))) + return IntegrationFlow.fromSupplier(() -> "seed", e -> e.poller(Pollers.fixedDelay(5000))) .split(this.clients, "iterator") .enrichHeaders(h -> h.headerExpression(IpHeaders.CONNECTION_ID, "payload")) .transform(p -> "Hello from server") diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 322bde3a8..82a26275d 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 3555be721..7d941b490 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -179,7 +179,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index b8a3c4354..2e048756e 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -143,7 +143,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 78f788809..fe9bc5e54 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom From 396e453a428f8b783f1b8e8ffb3b6a10ff803e52 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 26 Jul 2022 09:22:34 -0400 Subject: [PATCH 293/356] Back to SI SNAPSHOT for SF compatibility --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9a9e13a1d..215d95165 100644 --- a/build.gradle +++ b/build.gradle @@ -260,7 +260,7 @@ subprojects { subproject -> postgresVersion = '42.3.3' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.0-SNAPSHOT' - springIntegrationVersion = '6.0.0-M4' + springIntegrationVersion = '6.0.0-SNAPSHOT' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' springVersion = '6.0.0-SNAPSHOT' From c46c184f23a6f1b06b3683a451169bef028447a5 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 2 Aug 2022 12:27:11 -0400 Subject: [PATCH 294/356] Fix project for latest deps compatibility * Add `set('spring-integration.version', "$springIntegrationVersion")` into Gradle build file to override dependency for Spring Boot to pull the fix for WebSockets in Spring Integration * Fix `ListenableFutureTest` to the `CompletableFutureTest` to solve deprecation warnings. --- build.gradle | 1 + ...reTest.java => CompletableFutureTest.java} | 54 ++++++++----------- 2 files changed, 24 insertions(+), 31 deletions(-) rename intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/{ListenableFutureTest.java => CompletableFutureTest.java} (70%) diff --git a/build.gradle b/build.gradle index 215d95165..00ec5853d 100644 --- a/build.gradle +++ b/build.gradle @@ -261,6 +261,7 @@ subprojects { subproject -> slf4jVersion = '1.7.30' springCloudVersion = '2022.0.0-SNAPSHOT' springIntegrationVersion = '6.0.0-SNAPSHOT' + set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' springVersion = '6.0.0-SNAPSHOT' diff --git a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/ListenableFutureTest.java b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/CompletableFutureTest.java similarity index 70% rename from intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/ListenableFutureTest.java rename to intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/CompletableFutureTest.java index ca00e1df6..d06a9416d 100644 --- a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/ListenableFutureTest.java +++ b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/CompletableFutureTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.async.gateway; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; import java.util.Random; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -44,28 +44,25 @@ import org.springframework.integration.config.EnableIntegration; import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.util.concurrent.ListenableFuture; -import org.springframework.util.concurrent.ListenableFutureCallback; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; /** * @author Oleg Zhurakousky * @author Gary Russell + * @author Artem Bilan * */ -@ContextConfiguration(classes = ListenableFutureTest.TestConfig.class) -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig @DirtiesContext -public class ListenableFutureTest { +public class CompletableFutureTest { - private static final Log logger = LogFactory.getLog(ListenableFutureTest.class); + private static final Log logger = LogFactory.getLog(CompletableFutureTest.class); @Autowired private MathGateway gateway; @Test - public void testAsyncGateway() throws Exception{ + public void testAsyncGateway() throws Exception { Random random = new Random(); int[] numbers = new int[100]; int expectedResults = 0; @@ -79,26 +76,21 @@ public void testAsyncGateway() throws Exception{ final AtomicInteger failures = new AtomicInteger(); for (int i = 0; i < 100; i++) { final int number = numbers[i]; - ListenableFuture result = gateway.multiplyByTwo(number); - ListenableFutureCallback callback = new ListenableFutureCallback() { + CompletableFuture result = gateway.multiplyByTwo(number); - @Override - public void onSuccess(Integer result) { + result.whenComplete((integer, throwable) -> { + if (throwable == null) { logger.info("Result of multiplication of " + number + " by 2 is " + result); - latch.countDown(); } - - @Override - public void onFailure(Throwable t) { + else { failures.incrementAndGet(); - logger.error("Unexpected exception for " + number, t); - latch.countDown(); + logger.error("Unexpected exception for " + number, throwable); } - }; - result.addCallback(callback); + latch.countDown(); + }); } - assertTrue(latch.await(60, TimeUnit.SECONDS)); - assertEquals(0, failures.get()); + assertThat(latch.await(60, TimeUnit.SECONDS)).isTrue(); + assertThat(failures.get()).isEqualTo(0); logger.info("Finished"); } @@ -114,7 +106,7 @@ public MessageChannel gatewayChannel() { } @Bean - @ServiceActivator(inputChannel="mathServiceChannel") + @ServiceActivator(inputChannel = "mathServiceChannel") public MathService mathService() { return new MathService(); } @@ -132,14 +124,14 @@ public AsyncTaskExecutor exec() { public interface MathGateway { @Gateway(requestChannel = "gatewayChannel") - ListenableFuture multiplyByTwo(int number); + CompletableFuture multiplyByTwo(int number); } @MessageEndpoint public static class Gt100Filter { - @Filter(inputChannel="gatewayChannel", outputChannel="mathServiceChannel") + @Filter(inputChannel = "gatewayChannel", outputChannel = "mathServiceChannel") public boolean filter(int i) { return i > 100; } From 70ad0efa9264c77f5077a05983d24436d0dceadf Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 9 Aug 2022 12:44:56 -0400 Subject: [PATCH 295/356] Upgrade to the latest PostgreSQL driver * Bring back Spring Integration dependency as `SNAPSHOT` --- advanced/advanced-testing-examples/pom.xml | 2 +- advanced/dynamic-ftp/pom.xml | 2 +- advanced/dynamic-tcp-client/pom.xml | 197 +++++++++++++++++- applications/cafe-scripted/pom.xml | 2 +- applications/cafe/cafe-amqp/pom.xml | 2 +- applications/cafe/cafe-jms/pom.xml | 2 +- applications/cafe/cafe-si/pom.xml | 2 +- applications/file-split-ftp/pom.xml | 197 +++++++++++++++++- applications/loan-broker/pom.xml | 2 +- applications/loanshark/pom.xml | 2 +- applications/stomp-chat/pom.xml | 197 +++++++++++++++++- basic/amqp/pom.xml | 2 +- basic/barrier/pom.xml | 197 +++++++++++++++++- basic/control-bus/pom.xml | 2 +- basic/enricher/pom.xml | 2 +- basic/feed/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 | 197 +++++++++++++++++- basic/kafka/pom.xml | 197 +++++++++++++++++- basic/mail/pom.xml | 2 +- basic/mongodb/pom.xml | 2 +- basic/mqtt/pom.xml | 197 +++++++++++++++++- basic/oddeven/pom.xml | 2 +- basic/quote/pom.xml | 2 +- basic/sftp/pom.xml | 2 +- basic/tcp-amqp/pom.xml | 2 +- basic/tcp-broadcast/pom.xml | 197 +++++++++++++++++- basic/tcp-client-server/pom.xml | 2 +- basic/tcp-with-headers/pom.xml | 197 +++++++++++++++++- basic/testing-examples/pom.xml | 2 +- basic/twitter/pom.xml | 2 +- basic/web-sockets/pom.xml | 197 +++++++++++++++++- basic/ws-inbound-gateway/pom.xml | 2 +- basic/ws-outbound-gateway/pom.xml | 2 +- basic/xml/pom.xml | 2 +- basic/xmpp/pom.xml | 2 +- build.gradle | 2 +- dsl/cafe-dsl/pom.xml | 197 +++++++++++++++++- dsl/kafka-dsl/pom.xml | 197 +++++++++++++++++- dsl/si4demo/pom.xml | 197 +++++++++++++++++- 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/rest-http/pom.xml | 2 +- intermediate/retry-and-more/pom.xml | 2 +- .../splitter-aggregator-reaper/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 | 4 +- intermediate/tcp-async-bi-directional/pom.xml | 197 +++++++++++++++++- .../tcp-client-server-multiplex/pom.xml | 2 +- intermediate/testcontainers-rabbitmq/pom.xml | 197 +++++++++++++++++- intermediate/travel/pom.xml | 2 +- intermediate/tx-synch/pom.xml | 2 +- 65 files changed, 2991 insertions(+), 66 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 834e8f093..5ae68360e 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 4bbbaaa64..61cfa6fed 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index b7660accd..bc5bd9d10 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -114,6 +114,201 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-security + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.0.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies @@ -145,7 +340,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index e90f48bcf..98fc9b32e 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -166,7 +166,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 47b918e3e..5291c084b 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 198ced869..2e78641ff 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -163,7 +163,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index ebca7244c..1cb6e579c 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -138,7 +138,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 173346176..c6ddab503 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -141,6 +141,201 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-security + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.0.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies @@ -172,7 +367,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index be30a60f5..a76f05a29 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index b5c29417c..1342e378d 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -332,7 +332,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index eacaba9bf..c53252b8b 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -124,6 +124,201 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-security + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.0.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies @@ -155,7 +350,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 3fd26539c..585529c68 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 246872bf1..c929c8b83 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -129,6 +129,201 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-security + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.0.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies @@ -160,7 +355,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 65510ef04..4a7b76ca8 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 2c15ec5ac..1484b7be1 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 97a6a53f4..2e8e28b37 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 5322473e5..57fc3aca0 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index c85f18db5..ebb5ae42c 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -157,7 +157,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 0e8ddd62f..1e60ad46e 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 0595860e7..2d3bf78d0 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -193,7 +193,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index e60c06504..5fc58196f 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 55c8651d4..1fc6a721e 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -162,7 +162,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 90da9ed2e..0430b5770 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -138,7 +138,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index b2c2618cd..fa829997e 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -131,6 +131,201 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-security + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.0.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies @@ -162,7 +357,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index e51cab3ce..b46888776 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -131,6 +131,201 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-security + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.0.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies @@ -162,7 +357,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 447802aba..5d60a39de 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index c4c7a221b..d372658fd 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index d05febe4c..91811ce2e 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -119,6 +119,201 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-security + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.0.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies @@ -150,7 +345,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index c2a099ace..315a7e46a 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index c33cac93c..531059fea 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 2200c61d1..9f66f62d6 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 7f300698c..93931f4c7 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 6ae7f10db..65e4f364e 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -119,6 +119,201 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-security + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.0.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies @@ -150,7 +345,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 421ed3865..470f89cc9 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 2b83cd445..98d0567a4 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -119,6 +119,201 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-security + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.0.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies @@ -150,7 +345,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 6fdea688f..85de7860e 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -148,7 +148,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index eaae2e455..60d47baec 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -134,7 +134,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 05feb8d03..6e97291a0 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -114,6 +114,201 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-security + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.0.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies @@ -145,7 +340,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index cbc4af1df..2b7e5c358 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -175,7 +175,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 07829fd55..ef56d03f4 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -138,7 +138,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 1cda1f80e..002d906c0 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 668624dbd..4a421b0d0 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/build.gradle b/build.gradle index 00ec5853d..1ef2ada5e 100644 --- a/build.gradle +++ b/build.gradle @@ -257,7 +257,7 @@ subprojects { subproject -> mongoDriverVersion = '4.7.0-beta0' openJpaVersion = '2.4.0' oracleDriverVersion = '19.3.0.0' - postgresVersion = '42.3.3' + postgresVersion = '42.4.1' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.0-SNAPSHOT' springIntegrationVersion = '6.0.0-SNAPSHOT' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 2c62e20d6..7e9289a73 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -125,6 +125,201 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-security + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.0.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies @@ -156,7 +351,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index e5055527c..9a7189df6 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -125,6 +125,201 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-security + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.0.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies @@ -156,7 +351,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 535d75efc..3a684c81e 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -147,6 +147,201 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-security + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.0.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies @@ -178,7 +373,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index f75b4fbe0..6cb6d9557 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index fc3a3198f..c3a0bfc5a 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 4e21eb7c2..1237f4e0b 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 6c25cb3c3..374817bf9 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 723263714..85ad4eeef 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index e44680f0e..1d0788176 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -187,7 +187,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index fd064e8a7..fab93cd02 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -187,7 +187,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 67c6ac068..0a53a8012 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -218,7 +218,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 929dae2ac..fa006d14d 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -166,7 +166,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index f6ffb7797..3b2750fde 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 318f7c2d7..8ae1d1206 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index cb2b636fd..48365ef65 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -145,7 +145,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index f5672588a..02f635d4d 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 47728617d..02173709b 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -60,7 +60,7 @@ org.postgresql postgresql - 42.3.3 + 42.4.1 compile @@ -151,7 +151,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index b7cf0b94c..fdceab850 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -114,6 +114,201 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-security + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.0.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies @@ -145,7 +340,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 82a26275d..322bde3a8 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 7d941b490..4613c0963 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -141,6 +141,201 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-security + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.0.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.0.0-SNAPSHOT + org.springframework.cloud spring-cloud-dependencies @@ -179,7 +374,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 2e048756e..b8a3c4354 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -143,7 +143,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index fe9bc5e54..78f788809 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-M4 + 6.0.0-SNAPSHOT import pom From 3688be38bfa4a6becaaecd2c8f9705a203b75991 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Sun, 28 Aug 2022 10:14:06 -0400 Subject: [PATCH 296/356] Fix TcpClientServerAnnDemoTest for latest SI --- .../TcpClientServerAnnotationDemoTest.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerAnnotationDemoTest.java b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerAnnotationDemoTest.java index 1674fd3da..08139490f 100644 --- a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerAnnotationDemoTest.java +++ b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerAnnotationDemoTest.java @@ -18,10 +18,8 @@ import static org.junit.Assert.assertEquals; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -47,6 +45,7 @@ import org.springframework.messaging.MessageHandler; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -65,8 +64,7 @@ * @author Artem Bilan * */ -@ContextConfiguration(classes = TcpClientServerAnnotationDemoTest.Config.class) -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig @DirtiesContext @SpringIntegrationTest(noAutoStartup = "*tcpOutGate*") public class TcpClientServerAnnotationDemoTest { @@ -81,10 +79,10 @@ public class TcpClientServerAnnotationDemoTest { AbstractClientConnectionFactory client; @Autowired - @Qualifier("tcpClientServerAnnotationDemoTest.Config.tcpOutGate.serviceActivator") + @Qualifier("tcpOutGate.serviceActivator") AbstractEndpoint outGateway; - @Before + @BeforeEach public void setup() { if (!this.outGateway.isRunning()) { TestingUtilities.waitListening(this.crLfServer, 10000L); From 2e98ec568e8754cdcf0f26bfdb11b3287323f696 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Aug 2022 20:50:52 +0000 Subject: [PATCH 297/356] Bump artemis-server from 2.20.0 to 2.24.0 in /applications/cafe/cafe-jms Bumps [artemis-server](https://github.com/apache/activemq-artemis) from 2.20.0 to 2.24.0. - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.20.0...2.24.0) --- updated-dependencies: - dependency-name: org.apache.activemq:artemis-server dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- applications/cafe/cafe-jms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 2e78641ff..83ebfb2e3 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -61,7 +61,7 @@ org.apache.activemq artemis-server - 2.20.0 + 2.24.0 compile From c633575cd821f3ef580dc85ab2e42ab2e12f9093 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Aug 2022 20:50:37 +0000 Subject: [PATCH 298/356] Bump artemis-server from 2.20.0 to 2.24.0 in /basic/jms Bumps [artemis-server](https://github.com/apache/activemq-artemis) from 2.20.0 to 2.24.0. - [Release notes](https://github.com/apache/activemq-artemis/releases) - [Commits](https://github.com/apache/activemq-artemis/compare/2.20.0...2.24.0) --- updated-dependencies: - dependency-name: org.apache.activemq:artemis-server dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- basic/jms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 1fc6a721e..16f522a51 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -71,7 +71,7 @@ org.apache.activemq artemis-server - 2.20.0 + 2.24.0 compile From d2bbc7c89fa3bd4e105e92abc7c81372fe065725 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 31 Aug 2022 10:33:20 -0400 Subject: [PATCH 299/356] Upgrade to Apache Artemis 2.24.0 --- advanced/dynamic-tcp-client/pom.xml | 195 ------------------ applications/cafe/cafe-jms/pom.xml | 2 +- applications/file-split-ftp/pom.xml | 195 ------------------ applications/stomp-chat/pom.xml | 195 ------------------ basic/barrier/pom.xml | 195 ------------------ basic/jms/pom.xml | 2 +- basic/jpa/pom.xml | 195 ------------------ basic/kafka/pom.xml | 195 ------------------ basic/mqtt/pom.xml | 195 ------------------ basic/tcp-broadcast/pom.xml | 195 ------------------ basic/tcp-with-headers/pom.xml | 195 ------------------ basic/web-sockets/pom.xml | 195 ------------------ build.gradle | 2 +- dsl/cafe-dsl/pom.xml | 195 ------------------ dsl/kafka-dsl/pom.xml | 195 ------------------ dsl/si4demo/pom.xml | 195 ------------------ intermediate/tcp-async-bi-directional/pom.xml | 195 ------------------ intermediate/testcontainers-rabbitmq/pom.xml | 195 ------------------ 18 files changed, 3 insertions(+), 2928 deletions(-) diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index bc5bd9d10..dbf3fd90c 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -114,201 +114,6 @@ - - org.springframework.integration - spring-integration-file - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-gemfire - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-security - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.0.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 83ebfb2e3..cc5c5ef17 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -73,7 +73,7 @@ org.apache.activemq artemis-jakarta-client - 2.20.0 + 2.24.0 compile diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index c6ddab503..89fa73007 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -141,201 +141,6 @@ - - org.springframework.integration - spring-integration-file - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-gemfire - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-security - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.0.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index c53252b8b..1fc2d8982 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -124,201 +124,6 @@ - - org.springframework.integration - spring-integration-file - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-gemfire - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-security - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.0.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index c929c8b83..a72ea9b72 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -129,201 +129,6 @@ - - org.springframework.integration - spring-integration-file - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-gemfire - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-security - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.0.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 16f522a51..ed3d13087 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -83,7 +83,7 @@ org.apache.activemq artemis-jakarta-client - 2.20.0 + 2.24.0 compile diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index fa829997e..daf3192be 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -131,201 +131,6 @@ - - org.springframework.integration - spring-integration-file - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-gemfire - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-security - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.0.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index b46888776..edd0d7eef 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -131,201 +131,6 @@ - - org.springframework.integration - spring-integration-file - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-gemfire - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-security - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.0.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 91811ce2e..8e48f297c 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -119,201 +119,6 @@ - - org.springframework.integration - spring-integration-file - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-gemfire - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-security - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.0.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 65e4f364e..bcaa24e02 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -119,201 +119,6 @@ - - org.springframework.integration - spring-integration-file - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-gemfire - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-security - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.0.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 98d0567a4..7da422bf5 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -119,201 +119,6 @@ - - org.springframework.integration - spring-integration-file - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-gemfire - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-security - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.0.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 6e97291a0..7e62a2c76 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -114,201 +114,6 @@ - - org.springframework.integration - spring-integration-file - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-gemfire - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-security - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.0.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies diff --git a/build.gradle b/build.gradle index 1ef2ada5e..4e757e99e 100644 --- a/build.gradle +++ b/build.gradle @@ -221,7 +221,7 @@ subprojects { subproject -> ext { apacheSshdVersion = '2.8.0' - artemisVersion = '2.20.0' + artemisVersion = '2.24.0' aspectjVersion = '1.9.8.RC3' commonsDigesterVersion = '2.1' commonsDbcpVersion = '2.9.0' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 7e9289a73..ad7cbef99 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -125,201 +125,6 @@ - - org.springframework.integration - spring-integration-file - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-gemfire - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-security - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.0.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 9a7189df6..e6f003f48 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -125,201 +125,6 @@ - - org.springframework.integration - spring-integration-file - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-gemfire - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-security - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.0.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 3a684c81e..063adda0a 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -147,201 +147,6 @@ - - org.springframework.integration - spring-integration-file - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-gemfire - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-security - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.0.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index fdceab850..0a36696d2 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -114,201 +114,6 @@ - - org.springframework.integration - spring-integration-file - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-gemfire - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-security - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.0.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 4613c0963..3555be721 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -141,201 +141,6 @@ - - org.springframework.integration - spring-integration-file - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-gemfire - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-security - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.0.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.0.0-SNAPSHOT - org.springframework.cloud spring-cloud-dependencies From 021186e79ca78f98cbb0a990c07c9e4a628002ee Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 20 Sep 2022 21:01:40 -0400 Subject: [PATCH 300/356] Upgrade to Spring Integration 6.0.0-M5 --- advanced/advanced-testing-examples/pom.xml | 4 +- advanced/dynamic-ftp/pom.xml | 4 +- advanced/dynamic-tcp-client/pom.xml | 204 ++++++++++++++++- applications/cafe-scripted/pom.xml | 6 +- applications/cafe/cafe-amqp/pom.xml | 4 +- applications/cafe/cafe-jms/pom.xml | 8 +- applications/cafe/cafe-si/pom.xml | 4 +- applications/file-split-ftp/pom.xml | 204 ++++++++++++++++- applications/loan-broker/pom.xml | 4 +- applications/loanshark/pom.xml | 8 +- applications/stomp-chat/pom.xml | 204 ++++++++++++++++- basic/amqp/pom.xml | 4 +- basic/barrier/pom.xml | 204 ++++++++++++++++- basic/control-bus/pom.xml | 4 +- basic/enricher/pom.xml | 6 +- basic/feed/pom.xml | 4 +- basic/file/pom.xml | 4 +- basic/ftp/pom.xml | 4 +- basic/helloworld/pom.xml | 4 +- basic/http/pom.xml | 4 +- basic/jdbc/pom.xml | 6 +- basic/jms/pom.xml | 8 +- .../jms/ActiveMQMultiContextTests.java | 4 +- basic/jmx/pom.xml | 4 +- basic/jpa/pom.xml | 206 +++++++++++++++++- basic/kafka/pom.xml | 204 ++++++++++++++++- basic/mail/pom.xml | 4 +- basic/mongodb/pom.xml | 6 +- basic/mqtt/pom.xml | 204 ++++++++++++++++- basic/oddeven/pom.xml | 4 +- basic/quote/pom.xml | 4 +- basic/sftp/pom.xml | 6 +- basic/tcp-amqp/pom.xml | 4 +- basic/tcp-broadcast/pom.xml | 204 ++++++++++++++++- basic/tcp-client-server/pom.xml | 4 +- basic/tcp-with-headers/pom.xml | 204 ++++++++++++++++- basic/testing-examples/pom.xml | 4 +- basic/twitter/pom.xml | 4 +- basic/web-sockets/pom.xml | 204 ++++++++++++++++- basic/ws-inbound-gateway/pom.xml | 4 +- basic/ws-outbound-gateway/pom.xml | 4 +- basic/xml/pom.xml | 4 +- basic/xmpp/pom.xml | 4 +- build.gradle | 20 +- dsl/cafe-dsl/pom.xml | 204 ++++++++++++++++- dsl/kafka-dsl/pom.xml | 204 ++++++++++++++++- dsl/si4demo/pom.xml | 204 ++++++++++++++++- intermediate/async-gateway/pom.xml | 4 +- intermediate/dynamic-poller/pom.xml | 4 +- intermediate/errorhandling/pom.xml | 4 +- intermediate/file-processing/pom.xml | 4 +- intermediate/mail-attachments/pom.xml | 4 +- intermediate/monitoring/pom.xml | 4 +- intermediate/multipart-http/pom.xml | 4 +- intermediate/rest-http/pom.xml | 4 +- intermediate/retry-and-more/pom.xml | 4 +- .../splitter-aggregator-reaper/pom.xml | 4 +- intermediate/stored-procedures-derby/pom.xml | 4 +- intermediate/stored-procedures-ms/pom.xml | 4 +- intermediate/stored-procedures-oracle/pom.xml | 4 +- .../stored-procedures-postgresql/pom.xml | 4 +- intermediate/tcp-async-bi-directional/pom.xml | 204 ++++++++++++++++- .../tcp-client-server-multiplex/pom.xml | 4 +- intermediate/testcontainers-rabbitmq/pom.xml | 206 +++++++++++++++++- intermediate/travel/pom.xml | 4 +- intermediate/tx-synch/pom.xml | 6 +- 66 files changed, 3154 insertions(+), 154 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 5ae68360e..2f7cc2bf1 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -130,7 +130,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 61cfa6fed..2d5ff0d92 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -119,7 +119,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index dbf3fd90c..01689de49 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -114,6 +114,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-M5 + + + org.springframework.integration + spring-integration-syslog + 6.0.0-M5 + + + org.springframework.integration + spring-integration-smb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jmx + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ws + 6.0.0-M5 + + + org.springframework.integration + spring-integration-redis + 6.0.0-M5 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-webflux + 6.0.0-M5 + + + org.springframework.integration + spring-integration-sftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-M5 + + + org.springframework.integration + spring-integration-event + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-M5 + + + org.springframework.integration + spring-integration-kafka + 6.0.0-M5 + + + org.springframework.integration + spring-integration-groovy + 6.0.0-M5 + + + org.springframework.integration + spring-integration-scripting + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-websocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-graphql + 6.0.0-M5 + + + org.springframework.integration + spring-integration-feed + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jpa + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-M5 + + + org.springframework.integration + spring-integration-http + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ip + 6.0.0-M5 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test-support + 6.0.0-M5 + + + org.springframework.integration + spring-integration-amqp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mail + 6.0.0-M5 + + + org.springframework.integration + spring-integration-security + 6.0.0-M5 + + + org.springframework.integration + spring-integration-camel + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xml + 6.0.0-M5 + + + org.springframework.integration + spring-integration-core + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jms + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stream + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stomp + 6.0.0-M5 + org.springframework.boot spring-boot-dependencies @@ -131,7 +331,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -145,7 +345,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 98fc9b32e..e4ab4f68d 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -87,7 +87,7 @@ org.codehaus.groovy groovy-all - 3.0.9 + 3.0.13 compile @@ -152,7 +152,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -166,7 +166,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 5291c084b..ad56fff24 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -125,7 +125,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index cc5c5ef17..c95f25696 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -61,7 +61,7 @@ org.apache.activemq artemis-server - 2.24.0 + 2.25.0 compile @@ -73,7 +73,7 @@ org.apache.activemq artemis-jakarta-client - 2.24.0 + 2.25.0 compile @@ -149,7 +149,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -163,7 +163,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 1cb6e579c..877a661b2 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -124,7 +124,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -138,7 +138,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 89fa73007..21de76b40 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -141,6 +141,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-M5 + + + org.springframework.integration + spring-integration-syslog + 6.0.0-M5 + + + org.springframework.integration + spring-integration-smb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jmx + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ws + 6.0.0-M5 + + + org.springframework.integration + spring-integration-redis + 6.0.0-M5 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-webflux + 6.0.0-M5 + + + org.springframework.integration + spring-integration-sftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-M5 + + + org.springframework.integration + spring-integration-event + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-M5 + + + org.springframework.integration + spring-integration-kafka + 6.0.0-M5 + + + org.springframework.integration + spring-integration-groovy + 6.0.0-M5 + + + org.springframework.integration + spring-integration-scripting + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-websocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-graphql + 6.0.0-M5 + + + org.springframework.integration + spring-integration-feed + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jpa + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-M5 + + + org.springframework.integration + spring-integration-http + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ip + 6.0.0-M5 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test-support + 6.0.0-M5 + + + org.springframework.integration + spring-integration-amqp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mail + 6.0.0-M5 + + + org.springframework.integration + spring-integration-security + 6.0.0-M5 + + + org.springframework.integration + spring-integration-camel + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xml + 6.0.0-M5 + + + org.springframework.integration + spring-integration-core + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jms + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stream + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stomp + 6.0.0-M5 + org.springframework.boot spring-boot-dependencies @@ -158,7 +358,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -172,7 +372,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index a76f05a29..98faf8d5f 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -119,7 +119,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 1342e378d..534d96604 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -80,7 +80,7 @@ org.aspectj aspectjtools - 1.9.8.RC3 + 1.9.9.1 compile @@ -167,7 +167,7 @@ org.hibernate.orm hibernate-core - 6.1.1.Final + 6.1.3.Final compile @@ -318,7 +318,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -332,7 +332,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 1fc2d8982..c6ec54607 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -124,6 +124,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-M5 + + + org.springframework.integration + spring-integration-syslog + 6.0.0-M5 + + + org.springframework.integration + spring-integration-smb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jmx + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ws + 6.0.0-M5 + + + org.springframework.integration + spring-integration-redis + 6.0.0-M5 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-webflux + 6.0.0-M5 + + + org.springframework.integration + spring-integration-sftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-M5 + + + org.springframework.integration + spring-integration-event + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-M5 + + + org.springframework.integration + spring-integration-kafka + 6.0.0-M5 + + + org.springframework.integration + spring-integration-groovy + 6.0.0-M5 + + + org.springframework.integration + spring-integration-scripting + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-websocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-graphql + 6.0.0-M5 + + + org.springframework.integration + spring-integration-feed + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jpa + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-M5 + + + org.springframework.integration + spring-integration-http + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ip + 6.0.0-M5 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test-support + 6.0.0-M5 + + + org.springframework.integration + spring-integration-amqp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mail + 6.0.0-M5 + + + org.springframework.integration + spring-integration-security + 6.0.0-M5 + + + org.springframework.integration + spring-integration-camel + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xml + 6.0.0-M5 + + + org.springframework.integration + spring-integration-core + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jms + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stream + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stomp + 6.0.0-M5 + org.springframework.boot spring-boot-dependencies @@ -141,7 +341,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -155,7 +355,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 585529c68..3e37c1c0b 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -130,7 +130,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index a72ea9b72..76d2f2da1 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -129,6 +129,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-M5 + + + org.springframework.integration + spring-integration-syslog + 6.0.0-M5 + + + org.springframework.integration + spring-integration-smb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jmx + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ws + 6.0.0-M5 + + + org.springframework.integration + spring-integration-redis + 6.0.0-M5 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-webflux + 6.0.0-M5 + + + org.springframework.integration + spring-integration-sftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-M5 + + + org.springframework.integration + spring-integration-event + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-M5 + + + org.springframework.integration + spring-integration-kafka + 6.0.0-M5 + + + org.springframework.integration + spring-integration-groovy + 6.0.0-M5 + + + org.springframework.integration + spring-integration-scripting + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-websocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-graphql + 6.0.0-M5 + + + org.springframework.integration + spring-integration-feed + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jpa + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-M5 + + + org.springframework.integration + spring-integration-http + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ip + 6.0.0-M5 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test-support + 6.0.0-M5 + + + org.springframework.integration + spring-integration-amqp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mail + 6.0.0-M5 + + + org.springframework.integration + spring-integration-security + 6.0.0-M5 + + + org.springframework.integration + spring-integration-camel + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xml + 6.0.0-M5 + + + org.springframework.integration + spring-integration-core + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jms + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stream + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stomp + 6.0.0-M5 + org.springframework.boot spring-boot-dependencies @@ -146,7 +346,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -160,7 +360,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 4a7b76ca8..30d3bd74c 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -119,7 +119,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 1484b7be1..c9b99b02d 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -60,7 +60,7 @@ com.h2database h2 - 2.1.210 + 2.1.214 compile @@ -125,7 +125,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 2e8e28b37..296ee287f 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -119,7 +119,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 57fc3aca0..a76a09eef 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -119,7 +119,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index ebb5ae42c..af0f6aa25 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -143,7 +143,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -157,7 +157,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 1e60ad46e..4ca099d0d 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -119,7 +119,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 2d3bf78d0..d13bbc754 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -179,7 +179,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -193,7 +193,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 5fc58196f..8ac7b8cf2 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -60,7 +60,7 @@ com.h2database h2 - 2.1.210 + 2.1.214 compile @@ -125,7 +125,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index ed3d13087..c16976e52 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -71,7 +71,7 @@ org.apache.activemq artemis-server - 2.24.0 + 2.25.0 compile @@ -83,7 +83,7 @@ org.apache.activemq artemis-jakarta-client - 2.24.0 + 2.25.0 compile @@ -148,7 +148,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -162,7 +162,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java index 40bc9efef..7c0472b67 100644 --- a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java +++ b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,7 +63,7 @@ public static void startUp() throws Exception { .setJMXManagementEnabled(false) .setJournalDatasync(false) .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())) - .addAddressesSetting("#", + .addAddressSetting("#", new AddressSettings() .setDeadLetterAddress(SimpleString.toSimpleString("dla")) .setExpiryAddress(SimpleString.toSimpleString("expiry"))); diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 0430b5770..d57284acf 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -124,7 +124,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -138,7 +138,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index daf3192be..d209b36ce 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -66,7 +66,7 @@ com.h2database h2 - 2.1.210 + 2.1.214 compile @@ -131,6 +131,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-M5 + + + org.springframework.integration + spring-integration-syslog + 6.0.0-M5 + + + org.springframework.integration + spring-integration-smb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jmx + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ws + 6.0.0-M5 + + + org.springframework.integration + spring-integration-redis + 6.0.0-M5 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-webflux + 6.0.0-M5 + + + org.springframework.integration + spring-integration-sftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-M5 + + + org.springframework.integration + spring-integration-event + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-M5 + + + org.springframework.integration + spring-integration-kafka + 6.0.0-M5 + + + org.springframework.integration + spring-integration-groovy + 6.0.0-M5 + + + org.springframework.integration + spring-integration-scripting + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-websocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-graphql + 6.0.0-M5 + + + org.springframework.integration + spring-integration-feed + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jpa + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-M5 + + + org.springframework.integration + spring-integration-http + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ip + 6.0.0-M5 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test-support + 6.0.0-M5 + + + org.springframework.integration + spring-integration-amqp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mail + 6.0.0-M5 + + + org.springframework.integration + spring-integration-security + 6.0.0-M5 + + + org.springframework.integration + spring-integration-camel + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xml + 6.0.0-M5 + + + org.springframework.integration + spring-integration-core + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jms + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stream + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stomp + 6.0.0-M5 + org.springframework.boot spring-boot-dependencies @@ -148,7 +348,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -162,7 +362,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index edd0d7eef..d2d78565a 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -131,6 +131,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-M5 + + + org.springframework.integration + spring-integration-syslog + 6.0.0-M5 + + + org.springframework.integration + spring-integration-smb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jmx + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ws + 6.0.0-M5 + + + org.springframework.integration + spring-integration-redis + 6.0.0-M5 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-webflux + 6.0.0-M5 + + + org.springframework.integration + spring-integration-sftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-M5 + + + org.springframework.integration + spring-integration-event + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-M5 + + + org.springframework.integration + spring-integration-kafka + 6.0.0-M5 + + + org.springframework.integration + spring-integration-groovy + 6.0.0-M5 + + + org.springframework.integration + spring-integration-scripting + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-websocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-graphql + 6.0.0-M5 + + + org.springframework.integration + spring-integration-feed + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jpa + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-M5 + + + org.springframework.integration + spring-integration-http + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ip + 6.0.0-M5 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test-support + 6.0.0-M5 + + + org.springframework.integration + spring-integration-amqp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mail + 6.0.0-M5 + + + org.springframework.integration + spring-integration-security + 6.0.0-M5 + + + org.springframework.integration + spring-integration-camel + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xml + 6.0.0-M5 + + + org.springframework.integration + spring-integration-core + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jms + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stream + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stomp + 6.0.0-M5 + org.springframework.boot spring-boot-dependencies @@ -148,7 +348,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -162,7 +362,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 5d60a39de..050f9156a 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -130,7 +130,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index d372658fd..75cec6363 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -66,7 +66,7 @@ org.mongodb mongodb-driver-sync - 4.7.0-beta0 + 4.7.1 compile @@ -125,7 +125,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 8e48f297c..766589141 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -119,6 +119,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-M5 + + + org.springframework.integration + spring-integration-syslog + 6.0.0-M5 + + + org.springframework.integration + spring-integration-smb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jmx + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ws + 6.0.0-M5 + + + org.springframework.integration + spring-integration-redis + 6.0.0-M5 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-webflux + 6.0.0-M5 + + + org.springframework.integration + spring-integration-sftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-M5 + + + org.springframework.integration + spring-integration-event + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-M5 + + + org.springframework.integration + spring-integration-kafka + 6.0.0-M5 + + + org.springframework.integration + spring-integration-groovy + 6.0.0-M5 + + + org.springframework.integration + spring-integration-scripting + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-websocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-graphql + 6.0.0-M5 + + + org.springframework.integration + spring-integration-feed + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jpa + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-M5 + + + org.springframework.integration + spring-integration-http + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ip + 6.0.0-M5 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test-support + 6.0.0-M5 + + + org.springframework.integration + spring-integration-amqp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mail + 6.0.0-M5 + + + org.springframework.integration + spring-integration-security + 6.0.0-M5 + + + org.springframework.integration + spring-integration-camel + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xml + 6.0.0-M5 + + + org.springframework.integration + spring-integration-core + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jms + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stream + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stomp + 6.0.0-M5 + org.springframework.boot spring-boot-dependencies @@ -136,7 +336,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -150,7 +350,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 315a7e46a..4cd82707f 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -119,7 +119,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 531059fea..3b2ae7601 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -119,7 +119,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 9f66f62d6..ac241395d 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -94,7 +94,7 @@ org.apache.sshd sshd-sftp - 2.8.0 + 2.9.1 test @@ -125,7 +125,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 93931f4c7..944310479 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -136,7 +136,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index bcaa24e02..34456d587 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -119,6 +119,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-M5 + + + org.springframework.integration + spring-integration-syslog + 6.0.0-M5 + + + org.springframework.integration + spring-integration-smb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jmx + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ws + 6.0.0-M5 + + + org.springframework.integration + spring-integration-redis + 6.0.0-M5 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-webflux + 6.0.0-M5 + + + org.springframework.integration + spring-integration-sftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-M5 + + + org.springframework.integration + spring-integration-event + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-M5 + + + org.springframework.integration + spring-integration-kafka + 6.0.0-M5 + + + org.springframework.integration + spring-integration-groovy + 6.0.0-M5 + + + org.springframework.integration + spring-integration-scripting + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-websocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-graphql + 6.0.0-M5 + + + org.springframework.integration + spring-integration-feed + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jpa + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-M5 + + + org.springframework.integration + spring-integration-http + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ip + 6.0.0-M5 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test-support + 6.0.0-M5 + + + org.springframework.integration + spring-integration-amqp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mail + 6.0.0-M5 + + + org.springframework.integration + spring-integration-security + 6.0.0-M5 + + + org.springframework.integration + spring-integration-camel + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xml + 6.0.0-M5 + + + org.springframework.integration + spring-integration-core + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jms + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stream + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stomp + 6.0.0-M5 + org.springframework.boot spring-boot-dependencies @@ -136,7 +336,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -150,7 +350,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 470f89cc9..3802ab1e4 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -130,7 +130,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 7da422bf5..0796e256e 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -119,6 +119,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-M5 + + + org.springframework.integration + spring-integration-syslog + 6.0.0-M5 + + + org.springframework.integration + spring-integration-smb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jmx + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ws + 6.0.0-M5 + + + org.springframework.integration + spring-integration-redis + 6.0.0-M5 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-webflux + 6.0.0-M5 + + + org.springframework.integration + spring-integration-sftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-M5 + + + org.springframework.integration + spring-integration-event + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-M5 + + + org.springframework.integration + spring-integration-kafka + 6.0.0-M5 + + + org.springframework.integration + spring-integration-groovy + 6.0.0-M5 + + + org.springframework.integration + spring-integration-scripting + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-websocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-graphql + 6.0.0-M5 + + + org.springframework.integration + spring-integration-feed + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jpa + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-M5 + + + org.springframework.integration + spring-integration-http + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ip + 6.0.0-M5 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test-support + 6.0.0-M5 + + + org.springframework.integration + spring-integration-amqp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mail + 6.0.0-M5 + + + org.springframework.integration + spring-integration-security + 6.0.0-M5 + + + org.springframework.integration + spring-integration-camel + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xml + 6.0.0-M5 + + + org.springframework.integration + spring-integration-core + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jms + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stream + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stomp + 6.0.0-M5 + org.springframework.boot spring-boot-dependencies @@ -136,7 +336,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -150,7 +350,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 85de7860e..66631da2c 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -134,7 +134,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -148,7 +148,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 60d47baec..f1827c156 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -120,7 +120,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -134,7 +134,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 7e62a2c76..2077120d2 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -114,6 +114,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-M5 + + + org.springframework.integration + spring-integration-syslog + 6.0.0-M5 + + + org.springframework.integration + spring-integration-smb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jmx + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ws + 6.0.0-M5 + + + org.springframework.integration + spring-integration-redis + 6.0.0-M5 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-webflux + 6.0.0-M5 + + + org.springframework.integration + spring-integration-sftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-M5 + + + org.springframework.integration + spring-integration-event + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-M5 + + + org.springframework.integration + spring-integration-kafka + 6.0.0-M5 + + + org.springframework.integration + spring-integration-groovy + 6.0.0-M5 + + + org.springframework.integration + spring-integration-scripting + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-websocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-graphql + 6.0.0-M5 + + + org.springframework.integration + spring-integration-feed + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jpa + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-M5 + + + org.springframework.integration + spring-integration-http + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ip + 6.0.0-M5 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test-support + 6.0.0-M5 + + + org.springframework.integration + spring-integration-amqp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mail + 6.0.0-M5 + + + org.springframework.integration + spring-integration-security + 6.0.0-M5 + + + org.springframework.integration + spring-integration-camel + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xml + 6.0.0-M5 + + + org.springframework.integration + spring-integration-core + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jms + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stream + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stomp + 6.0.0-M5 + org.springframework.boot spring-boot-dependencies @@ -131,7 +331,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -145,7 +345,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 2b7e5c358..b7c0e0c62 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -161,7 +161,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -175,7 +175,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index ef56d03f4..f3aba9b96 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -124,7 +124,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -138,7 +138,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 002d906c0..955030211 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -119,7 +119,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 4a421b0d0..37b233b5a 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -119,7 +119,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/build.gradle b/build.gradle index 4e757e99e..bc5036aac 100644 --- a/build.gradle +++ b/build.gradle @@ -220,9 +220,9 @@ subprojects { subproject -> } ext { - apacheSshdVersion = '2.8.0' - artemisVersion = '2.24.0' - aspectjVersion = '1.9.8.RC3' + apacheSshdVersion = '2.9.1' + artemisVersion = '2.25.0' + aspectjVersion = '1.9.9.1' commonsDigesterVersion = '2.1' commonsDbcpVersion = '2.9.0' commonsFileUploadVersion = '1.4' @@ -232,14 +232,14 @@ subprojects { subproject -> c3p0Version = '0.9.5.5' derbyVersion = '10.14.2.0' hamcrestVersion = '2.2' - hibernateVersion = '6.1.1.Final' + hibernateVersion = '6.1.3.Final' hibernateValidatorVersion = '7.0.2.Final' ftpServerVersion = '1.1.2' flexjsonVersion = '2.0' - groovyVersion = '3.0.9' + groovyVersion = '3.0.13' hsqldbVersion = '2.6.1' - h2Version = '2.1.210' - jacksonVersion = '2.13.1' + h2Version = '2.1.214' + jacksonVersion = '2.13.4' mailVersion = '2.0.1' jaxbVersion = '2.3.3' jodaTimeVersion = '1.6' @@ -254,20 +254,20 @@ subprojects { subproject -> jythonVersion = '2.7.2' log4jVersion = '2.17.2' mockitoVersion = '4.2.0' - mongoDriverVersion = '4.7.0-beta0' + mongoDriverVersion = '4.7.1' openJpaVersion = '2.4.0' oracleDriverVersion = '19.3.0.0' postgresVersion = '42.4.1' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.0-SNAPSHOT' - springIntegrationVersion = '6.0.0-SNAPSHOT' + springIntegrationVersion = '6.0.0-M5' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' springVersion = '6.0.0-SNAPSHOT' springSecurityVersion = '6.0.0-SNAPSHOT' springWebFlowVersion = '2.3.3.RELEASE' - testcontainersVersion = '1.16.2' + testcontainersVersion = '1.17.3' tilesJspVersion = '2.2.1' } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index ad7cbef99..e2fee4464 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -125,6 +125,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-M5 + + + org.springframework.integration + spring-integration-syslog + 6.0.0-M5 + + + org.springframework.integration + spring-integration-smb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jmx + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ws + 6.0.0-M5 + + + org.springframework.integration + spring-integration-redis + 6.0.0-M5 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-webflux + 6.0.0-M5 + + + org.springframework.integration + spring-integration-sftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-M5 + + + org.springframework.integration + spring-integration-event + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-M5 + + + org.springframework.integration + spring-integration-kafka + 6.0.0-M5 + + + org.springframework.integration + spring-integration-groovy + 6.0.0-M5 + + + org.springframework.integration + spring-integration-scripting + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-websocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-graphql + 6.0.0-M5 + + + org.springframework.integration + spring-integration-feed + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jpa + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-M5 + + + org.springframework.integration + spring-integration-http + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ip + 6.0.0-M5 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test-support + 6.0.0-M5 + + + org.springframework.integration + spring-integration-amqp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mail + 6.0.0-M5 + + + org.springframework.integration + spring-integration-security + 6.0.0-M5 + + + org.springframework.integration + spring-integration-camel + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xml + 6.0.0-M5 + + + org.springframework.integration + spring-integration-core + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jms + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stream + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stomp + 6.0.0-M5 + org.springframework.boot spring-boot-dependencies @@ -142,7 +342,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -156,7 +356,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index e6f003f48..4dfc02c08 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -125,6 +125,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-M5 + + + org.springframework.integration + spring-integration-syslog + 6.0.0-M5 + + + org.springframework.integration + spring-integration-smb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jmx + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ws + 6.0.0-M5 + + + org.springframework.integration + spring-integration-redis + 6.0.0-M5 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-webflux + 6.0.0-M5 + + + org.springframework.integration + spring-integration-sftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-M5 + + + org.springframework.integration + spring-integration-event + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-M5 + + + org.springframework.integration + spring-integration-kafka + 6.0.0-M5 + + + org.springframework.integration + spring-integration-groovy + 6.0.0-M5 + + + org.springframework.integration + spring-integration-scripting + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-websocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-graphql + 6.0.0-M5 + + + org.springframework.integration + spring-integration-feed + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jpa + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-M5 + + + org.springframework.integration + spring-integration-http + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ip + 6.0.0-M5 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test-support + 6.0.0-M5 + + + org.springframework.integration + spring-integration-amqp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mail + 6.0.0-M5 + + + org.springframework.integration + spring-integration-security + 6.0.0-M5 + + + org.springframework.integration + spring-integration-camel + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xml + 6.0.0-M5 + + + org.springframework.integration + spring-integration-core + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jms + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stream + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stomp + 6.0.0-M5 + org.springframework.boot spring-boot-dependencies @@ -142,7 +342,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -156,7 +356,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 063adda0a..46dabd4ea 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -147,6 +147,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-M5 + + + org.springframework.integration + spring-integration-syslog + 6.0.0-M5 + + + org.springframework.integration + spring-integration-smb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jmx + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ws + 6.0.0-M5 + + + org.springframework.integration + spring-integration-redis + 6.0.0-M5 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-webflux + 6.0.0-M5 + + + org.springframework.integration + spring-integration-sftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-M5 + + + org.springframework.integration + spring-integration-event + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-M5 + + + org.springframework.integration + spring-integration-kafka + 6.0.0-M5 + + + org.springframework.integration + spring-integration-groovy + 6.0.0-M5 + + + org.springframework.integration + spring-integration-scripting + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-websocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-graphql + 6.0.0-M5 + + + org.springframework.integration + spring-integration-feed + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jpa + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-M5 + + + org.springframework.integration + spring-integration-http + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ip + 6.0.0-M5 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test-support + 6.0.0-M5 + + + org.springframework.integration + spring-integration-amqp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mail + 6.0.0-M5 + + + org.springframework.integration + spring-integration-security + 6.0.0-M5 + + + org.springframework.integration + spring-integration-camel + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xml + 6.0.0-M5 + + + org.springframework.integration + spring-integration-core + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jms + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stream + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stomp + 6.0.0-M5 + org.springframework.boot spring-boot-dependencies @@ -164,7 +364,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -178,7 +378,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 6cb6d9557..0215b09c4 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -119,7 +119,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index c3a0bfc5a..9f8a8211f 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -119,7 +119,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 1237f4e0b..88dca4179 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -119,7 +119,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 374817bf9..83f0c03f5 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -119,7 +119,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 85ad4eeef..2b6c27aba 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -136,7 +136,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 1d0788176..3182c5b71 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -173,7 +173,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -187,7 +187,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index fab93cd02..1934fc26a 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -173,7 +173,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -187,7 +187,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 0a53a8012..8903efd5a 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -204,7 +204,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -218,7 +218,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index fa006d14d..42a662617 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -152,7 +152,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -166,7 +166,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 3b2750fde..35b123aa5 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -119,7 +119,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 8ae1d1206..2eca9a8af 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -125,7 +125,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 48365ef65..24596e58e 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -131,7 +131,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -145,7 +145,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 02f635d4d..3fec8b137 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -125,7 +125,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 02173709b..1461774ba 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -137,7 +137,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -151,7 +151,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 0a36696d2..01f3cec24 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -114,6 +114,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-M5 + + + org.springframework.integration + spring-integration-syslog + 6.0.0-M5 + + + org.springframework.integration + spring-integration-smb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jmx + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ws + 6.0.0-M5 + + + org.springframework.integration + spring-integration-redis + 6.0.0-M5 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-webflux + 6.0.0-M5 + + + org.springframework.integration + spring-integration-sftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-M5 + + + org.springframework.integration + spring-integration-event + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-M5 + + + org.springframework.integration + spring-integration-kafka + 6.0.0-M5 + + + org.springframework.integration + spring-integration-groovy + 6.0.0-M5 + + + org.springframework.integration + spring-integration-scripting + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-websocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-graphql + 6.0.0-M5 + + + org.springframework.integration + spring-integration-feed + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jpa + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-M5 + + + org.springframework.integration + spring-integration-http + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ip + 6.0.0-M5 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test-support + 6.0.0-M5 + + + org.springframework.integration + spring-integration-amqp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mail + 6.0.0-M5 + + + org.springframework.integration + spring-integration-security + 6.0.0-M5 + + + org.springframework.integration + spring-integration-camel + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xml + 6.0.0-M5 + + + org.springframework.integration + spring-integration-core + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jms + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stream + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stomp + 6.0.0-M5 + org.springframework.boot spring-boot-dependencies @@ -131,7 +331,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -145,7 +345,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 322bde3a8..70ddbf39a 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -119,7 +119,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 3555be721..a042548a3 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -114,7 +114,7 @@ org.testcontainers junit-jupiter - 1.16.2 + 1.17.3 test @@ -141,6 +141,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.0-M5 + + + org.springframework.integration + spring-integration-syslog + 6.0.0-M5 + + + org.springframework.integration + spring-integration-smb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jdbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jmx + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ws + 6.0.0-M5 + + + org.springframework.integration + spring-integration-redis + 6.0.0-M5 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.0-M5 + + + org.springframework.integration + spring-integration-webflux + 6.0.0-M5 + + + org.springframework.integration + spring-integration-sftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-rsocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mqtt + 6.0.0-M5 + + + org.springframework.integration + spring-integration-event + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ftp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-gemfire + 6.0.0-M5 + + + org.springframework.integration + spring-integration-kafka + 6.0.0-M5 + + + org.springframework.integration + spring-integration-groovy + 6.0.0-M5 + + + org.springframework.integration + spring-integration-scripting + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xmpp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-websocket + 6.0.0-M5 + + + org.springframework.integration + spring-integration-graphql + 6.0.0-M5 + + + org.springframework.integration + spring-integration-feed + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jpa + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zeromq + 6.0.0-M5 + + + org.springframework.integration + spring-integration-http + 6.0.0-M5 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.0-M5 + + + org.springframework.integration + spring-integration-ip + 6.0.0-M5 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.0-M5 + + + org.springframework.integration + spring-integration-test-support + 6.0.0-M5 + + + org.springframework.integration + spring-integration-amqp + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mail + 6.0.0-M5 + + + org.springframework.integration + spring-integration-security + 6.0.0-M5 + + + org.springframework.integration + spring-integration-camel + 6.0.0-M5 + + + org.springframework.integration + spring-integration-xml + 6.0.0-M5 + + + org.springframework.integration + spring-integration-core + 6.0.0-M5 + + + org.springframework.integration + spring-integration-jms + 6.0.0-M5 + + + org.springframework.integration + spring-integration-mongodb + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stream + 6.0.0-M5 + + + org.springframework.integration + spring-integration-stomp + 6.0.0-M5 + org.springframework.cloud spring-cloud-dependencies @@ -165,7 +365,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -179,7 +379,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index b8a3c4354..d29042bfc 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -129,7 +129,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -143,7 +143,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 78f788809..77cce8b30 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -65,7 +65,7 @@ com.h2database h2 - 2.1.210 + 2.1.214 compile @@ -130,7 +130,7 @@ com.fasterxml.jackson jackson-bom - 2.13.1 + 2.13.4 import pom @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M5 import pom From 62319c8e5b1a517910ed0578d1960a39afd1f1c3 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 18 Oct 2022 16:07:32 -0400 Subject: [PATCH 301/356] Upgrade to Spring Integration 6.0.0-RC1 * Also upgrade other deps to more actual * Fix failing tests due to changed API --- advanced/advanced-testing-examples/pom.xml | 10 +- advanced/dynamic-ftp/pom.xml | 10 +- advanced/dynamic-tcp-client/pom.xml | 94 +++++++++--------- applications/cafe-scripted/pom.xml | 18 ++-- applications/cafe/cafe-amqp/pom.xml | 10 +- applications/cafe/cafe-jms/pom.xml | 14 +-- applications/cafe/cafe-si/pom.xml | 10 +- applications/file-split-ftp/pom.xml | 94 +++++++++--------- applications/loan-broker/pom.xml | 10 +- applications/loanshark/pom.xml | 14 +-- applications/stomp-chat/pom.xml | 94 +++++++++--------- basic/amqp/pom.xml | 10 +- basic/barrier/pom.xml | 94 +++++++++--------- basic/control-bus/pom.xml | 10 +- basic/enricher/pom.xml | 10 +- basic/feed/pom.xml | 10 +- basic/file/pom.xml | 10 +- basic/ftp/pom.xml | 10 +- basic/helloworld/pom.xml | 10 +- basic/http/pom.xml | 10 +- basic/jdbc/pom.xml | 10 +- basic/jms/pom.xml | 14 +-- basic/jmx/pom.xml | 10 +- basic/jpa/pom.xml | 94 +++++++++--------- basic/kafka/pom.xml | 96 +++++++++---------- basic/mail/pom.xml | 10 +- basic/mongodb/pom.xml | 12 +-- basic/mqtt/pom.xml | 94 +++++++++--------- basic/oddeven/pom.xml | 10 +- basic/quote/pom.xml | 10 +- basic/sftp/pom.xml | 10 +- .../sftp/SftpInboundReceiveSample.java | 14 +-- .../sftp/SftpOutboundGatewaySample.java | 19 ++-- .../sftp/SftpOutboundTransferSample.java | 17 ++-- .../samples/sftp/SftpTestUtils.java | 32 +++---- basic/tcp-amqp/pom.xml | 10 +- basic/tcp-broadcast/pom.xml | 94 +++++++++--------- basic/tcp-client-server/pom.xml | 10 +- basic/tcp-with-headers/pom.xml | 94 +++++++++--------- basic/testing-examples/pom.xml | 10 +- basic/twitter/pom.xml | 10 +- basic/web-sockets/pom.xml | 94 +++++++++--------- basic/ws-inbound-gateway/pom.xml | 10 +- basic/ws-outbound-gateway/pom.xml | 10 +- basic/xml/pom.xml | 10 +- basic/xmpp/pom.xml | 10 +- build.gradle | 33 +++---- dsl/cafe-dsl/pom.xml | 94 +++++++++--------- dsl/kafka-dsl/pom.xml | 96 +++++++++---------- dsl/si4demo/pom.xml | 94 +++++++++--------- intermediate/async-gateway/pom.xml | 10 +- intermediate/dynamic-poller/pom.xml | 10 +- intermediate/errorhandling/pom.xml | 10 +- intermediate/file-processing/pom.xml | 10 +- intermediate/mail-attachments/pom.xml | 10 +- intermediate/monitoring/pom.xml | 10 +- intermediate/multipart-http/pom.xml | 10 +- intermediate/rest-http/pom.xml | 14 +-- intermediate/retry-and-more/pom.xml | 12 +-- .../splitter-aggregator-reaper/pom.xml | 10 +- intermediate/stored-procedures-derby/pom.xml | 18 ++-- intermediate/stored-procedures-ms/pom.xml | 10 +- intermediate/stored-procedures-oracle/pom.xml | 10 +- .../stored-procedures-postgresql/pom.xml | 12 +-- intermediate/tcp-async-bi-directional/pom.xml | 94 +++++++++--------- .../tcp-client-server-multiplex/pom.xml | 10 +- intermediate/testcontainers-rabbitmq/pom.xml | 96 +++++++++---------- intermediate/travel/pom.xml | 10 +- intermediate/tx-synch/pom.xml | 10 +- 69 files changed, 1031 insertions(+), 1028 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 2f7cc2bf1..bbfcb5e04 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -123,7 +123,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 2d5ff0d92..e30d808e0 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 01689de49..32a0490df 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -117,202 +117,202 @@ org.springframework.integration spring-integration-file - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-syslog - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-smb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jdbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jmx - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ws - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-redis - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-r2dbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-webflux - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-sftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-rsocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mqtt - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-event - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration - spring-integration-gemfire - 6.0.0-M5 + spring-integration-kafka + 6.0.0-RC1 org.springframework.integration - spring-integration-kafka - 6.0.0-M5 + spring-integration-groovy + 6.0.0-RC1 org.springframework.integration - spring-integration-groovy - 6.0.0-M5 + spring-integration-cassandra + 6.0.0-RC1 org.springframework.integration spring-integration-scripting - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xmpp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-websocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-graphql - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-feed - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jpa - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zeromq - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-http - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zookeeper - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ip - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-hazelcast - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test-support - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-amqp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mail - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-security - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-camel - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xml - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-core - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jms - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mongodb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stream - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stomp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.boot @@ -324,7 +324,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -338,14 +338,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index e4ab4f68d..401ab0f8e 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -81,19 +81,19 @@ org.python jython-standalone - 2.7.2 + 2.7.3 compile - org.codehaus.groovy - groovy-all - 3.0.13 + org.apache.groovy + groovy-jsr223 + 4.0.6 compile org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -111,7 +111,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -145,7 +145,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index ad56fff24..6de29ba84 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -118,7 +118,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index c95f25696..368f69cc7 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -61,7 +61,7 @@ org.apache.activemq artemis-server - 2.25.0 + 2.26.0 compile @@ -73,7 +73,7 @@ org.apache.activemq artemis-jakarta-client - 2.25.0 + 2.26.0 compile @@ -90,7 +90,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -108,7 +108,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -142,7 +142,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -156,14 +156,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 877a661b2..afe8e3580 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -117,7 +117,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 21de76b40..85de34e1e 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -99,7 +99,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -144,202 +144,202 @@ org.springframework.integration spring-integration-file - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-syslog - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-smb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jdbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jmx - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ws - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-redis - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-r2dbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-webflux - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-sftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-rsocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mqtt - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-event - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration - spring-integration-gemfire - 6.0.0-M5 + spring-integration-kafka + 6.0.0-RC1 org.springframework.integration - spring-integration-kafka - 6.0.0-M5 + spring-integration-groovy + 6.0.0-RC1 org.springframework.integration - spring-integration-groovy - 6.0.0-M5 + spring-integration-cassandra + 6.0.0-RC1 org.springframework.integration spring-integration-scripting - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xmpp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-websocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-graphql - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-feed - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jpa - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zeromq - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-http - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zookeeper - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ip - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-hazelcast - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test-support - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-amqp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mail - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-security - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-camel - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xml - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-core - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jms - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mongodb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stream - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stomp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.boot @@ -351,7 +351,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -365,14 +365,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 98faf8d5f..40a31330a 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 534d96604..ac19b0380 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -143,7 +143,7 @@ org.hsqldb hsqldb - 2.6.1 + 2.7.0 compile @@ -167,7 +167,7 @@ org.hibernate.orm hibernate-core - 6.1.3.Final + 6.1.4.Final compile @@ -217,7 +217,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 runtime @@ -277,7 +277,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -311,7 +311,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -325,14 +325,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index c6ec54607..5203f81fc 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -88,7 +88,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -127,202 +127,202 @@ org.springframework.integration spring-integration-file - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-syslog - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-smb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jdbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jmx - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ws - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-redis - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-r2dbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-webflux - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-sftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-rsocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mqtt - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-event - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration - spring-integration-gemfire - 6.0.0-M5 + spring-integration-kafka + 6.0.0-RC1 org.springframework.integration - spring-integration-kafka - 6.0.0-M5 + spring-integration-groovy + 6.0.0-RC1 org.springframework.integration - spring-integration-groovy - 6.0.0-M5 + spring-integration-cassandra + 6.0.0-RC1 org.springframework.integration spring-integration-scripting - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xmpp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-websocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-graphql - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-feed - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jpa - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zeromq - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-http - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zookeeper - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ip - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-hazelcast - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test-support - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-amqp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mail - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-security - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-camel - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xml - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-core - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jms - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mongodb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stream - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stomp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.boot @@ -334,7 +334,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -348,14 +348,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 3e37c1c0b..11af4cc8c 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -123,7 +123,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 76d2f2da1..2a5a66c5b 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -93,7 +93,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -132,202 +132,202 @@ org.springframework.integration spring-integration-file - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-syslog - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-smb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jdbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jmx - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ws - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-redis - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-r2dbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-webflux - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-sftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-rsocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mqtt - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-event - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration - spring-integration-gemfire - 6.0.0-M5 + spring-integration-kafka + 6.0.0-RC1 org.springframework.integration - spring-integration-kafka - 6.0.0-M5 + spring-integration-groovy + 6.0.0-RC1 org.springframework.integration - spring-integration-groovy - 6.0.0-M5 + spring-integration-cassandra + 6.0.0-RC1 org.springframework.integration spring-integration-scripting - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xmpp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-websocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-graphql - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-feed - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jpa - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zeromq - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-http - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zookeeper - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ip - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-hazelcast - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test-support - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-amqp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mail - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-security - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-camel - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xml - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-core - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jms - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mongodb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stream - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stomp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.boot @@ -339,7 +339,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -353,14 +353,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 30d3bd74c..e528f51a7 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index c9b99b02d..5aa7e7ab2 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -118,7 +118,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 296ee287f..6e1a7ddcb 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index a76a09eef..e32e60456 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index af0f6aa25..00042572f 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -96,7 +96,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 test @@ -136,7 +136,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -150,14 +150,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 4ca099d0d..a75663777 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index d13bbc754..5fb7cff03 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -88,7 +88,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -138,7 +138,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -172,7 +172,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 8ac7b8cf2..e6c5883e9 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -118,7 +118,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index c16976e52..b0f1ae2f5 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -71,7 +71,7 @@ org.apache.activemq artemis-server - 2.25.0 + 2.26.0 compile @@ -83,13 +83,13 @@ org.apache.activemq artemis-jakarta-client - 2.25.0 + 2.26.0 compile org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -107,7 +107,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -141,7 +141,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index d57284acf..7e3eaf9af 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -117,7 +117,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index d209b36ce..5eb2e1d21 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -95,7 +95,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -134,202 +134,202 @@ org.springframework.integration spring-integration-file - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-syslog - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-smb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jdbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jmx - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ws - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-redis - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-r2dbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-webflux - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-sftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-rsocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mqtt - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-event - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration - spring-integration-gemfire - 6.0.0-M5 + spring-integration-kafka + 6.0.0-RC1 org.springframework.integration - spring-integration-kafka - 6.0.0-M5 + spring-integration-groovy + 6.0.0-RC1 org.springframework.integration - spring-integration-groovy - 6.0.0-M5 + spring-integration-cassandra + 6.0.0-RC1 org.springframework.integration spring-integration-scripting - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xmpp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-websocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-graphql - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-feed - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jpa - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zeromq - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-http - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zookeeper - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ip - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-hazelcast - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test-support - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-amqp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mail - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-security - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-camel - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xml - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-core - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jms - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mongodb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stream - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stomp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.boot @@ -341,7 +341,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -355,14 +355,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index d2d78565a..596eac4c1 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -77,7 +77,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -95,7 +95,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -134,202 +134,202 @@ org.springframework.integration spring-integration-file - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-syslog - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-smb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jdbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jmx - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ws - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-redis - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-r2dbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-webflux - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-sftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-rsocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mqtt - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-event - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration - spring-integration-gemfire - 6.0.0-M5 + spring-integration-kafka + 6.0.0-RC1 org.springframework.integration - spring-integration-kafka - 6.0.0-M5 + spring-integration-groovy + 6.0.0-RC1 org.springframework.integration - spring-integration-groovy - 6.0.0-M5 + spring-integration-cassandra + 6.0.0-RC1 org.springframework.integration spring-integration-scripting - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xmpp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-websocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-graphql - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-feed - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jpa - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zeromq - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-http - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zookeeper - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ip - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-hazelcast - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test-support - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-amqp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mail - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-security - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-camel - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xml - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-core - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jms - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mongodb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stream - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stomp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.boot @@ -341,7 +341,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -355,14 +355,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 050f9156a..983696239 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -123,7 +123,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 75cec6363..9a1dff520 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -60,13 +60,13 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile org.mongodb mongodb-driver-sync - 4.7.1 + 4.7.2 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -118,7 +118,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 766589141..ebe2971d6 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -122,202 +122,202 @@ org.springframework.integration spring-integration-file - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-syslog - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-smb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jdbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jmx - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ws - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-redis - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-r2dbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-webflux - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-sftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-rsocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mqtt - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-event - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration - spring-integration-gemfire - 6.0.0-M5 + spring-integration-kafka + 6.0.0-RC1 org.springframework.integration - spring-integration-kafka - 6.0.0-M5 + spring-integration-groovy + 6.0.0-RC1 org.springframework.integration - spring-integration-groovy - 6.0.0-M5 + spring-integration-cassandra + 6.0.0-RC1 org.springframework.integration spring-integration-scripting - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xmpp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-websocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-graphql - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-feed - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jpa - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zeromq - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-http - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zookeeper - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ip - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-hazelcast - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test-support - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-amqp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mail - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-security - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-camel - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xml - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-core - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jms - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mongodb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stream - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stomp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.boot @@ -329,7 +329,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 4cd82707f..cc964a194 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 3b2ae7601..01d8c9784 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index ac241395d..8c47b4910 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -118,7 +118,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSample.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSample.java index 433979fda..71073bfe5 100644 --- a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSample.java +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSample.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.sftp; import static org.junit.Assert.assertNotNull; @@ -21,7 +22,8 @@ import java.io.File; -import org.junit.Test; +import org.apache.sshd.sftp.client.SftpClient; +import org.junit.jupiter.api.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -32,8 +34,6 @@ import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel; -import com.jcraft.jsch.ChannelSftp.LsEntry; - /** * @author Oleg Zhurakousky * @author Gary Russell @@ -42,10 +42,10 @@ public class SftpInboundReceiveSample { @Test - public void runDemo(){ + public void runDemo() { ConfigurableApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/SftpInboundReceiveSample-context.xml", this.getClass()); - RemoteFileTemplate template = null; + RemoteFileTemplate template = null; String file1 = "a.txt"; String file2 = "b.txt"; String file3 = "c.bar"; @@ -54,8 +54,8 @@ public void runDemo(){ try { PollableChannel localFileChannel = context.getBean("receiveChannel", PollableChannel.class); @SuppressWarnings("unchecked") - SessionFactory sessionFactory = context.getBean(CachingSessionFactory.class); - template = new RemoteFileTemplate(sessionFactory); + SessionFactory sessionFactory = context.getBean(CachingSessionFactory.class); + template = new RemoteFileTemplate<>(sessionFactory); SftpTestUtils.createTestFiles(template, file1, file2, file3); SourcePollingChannelAdapter adapter = context.getBean(SourcePollingChannelAdapter.class); diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundGatewaySample.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundGatewaySample.java index 30542c5c2..34183a0ed 100644 --- a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundGatewaySample.java +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundGatewaySample.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.sftp; import static org.junit.Assert.assertEquals; @@ -21,7 +22,8 @@ import java.io.File; import java.util.List; -import org.junit.Test; +import org.apache.sshd.sftp.client.SftpClient; +import org.junit.jupiter.api.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -29,23 +31,23 @@ import org.springframework.integration.file.remote.session.CachingSessionFactory; import org.springframework.integration.file.remote.session.SessionFactory; -import com.jcraft.jsch.ChannelSftp.LsEntry; - /** * Demonstrates use of the outbound gateway to use ls, get and rm. * Creates a temporary directory with 2 files; retrieves and removes them. + * * @author Gary Russell + * * @since 2.1 * */ public class SftpOutboundGatewaySample { @Test - public void testLsGetRm() throws Exception { + public void testLsGetRm() { ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext( "classpath:/META-INF/spring/integration/SftpOutboundGatewaySample-context.xml"); ToSftpFlowGateway toFtpFlow = ctx.getBean(ToSftpFlowGateway.class); - RemoteFileTemplate template = null; + RemoteFileTemplate template = null; String file1 = "1.ftptest"; String file2 = "2.ftptest"; File tmpDir = new File(System.getProperty("java.io.tmpdir")); @@ -56,8 +58,8 @@ public void testLsGetRm() throws Exception { new File(tmpDir, file2).delete(); @SuppressWarnings("unchecked") - SessionFactory sessionFactory = ctx.getBean(CachingSessionFactory.class); - template = new RemoteFileTemplate(sessionFactory); + SessionFactory sessionFactory = ctx.getBean(CachingSessionFactory.class); + template = new RemoteFileTemplate<>(sessionFactory); SftpTestUtils.createTestFiles(template, file1, file2); // execute the flow (ls, get, rm, aggregate results) @@ -80,6 +82,3 @@ public void testLsGetRm() throws Exception { } } - - - diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSample.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSample.java index f54d2b408..1d7f5584c 100644 --- a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSample.java +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSample.java @@ -18,7 +18,8 @@ import java.io.File; -import org.junit.Test; +import org.apache.sshd.sftp.client.SftpClient; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.file.remote.RemoteFileTemplate; @@ -29,8 +30,6 @@ import org.springframework.messaging.MessageChannel; import org.springframework.util.Assert; -import com.jcraft.jsch.ChannelSftp.LsEntry; - /** * * @author Oleg Zhurakousky @@ -41,17 +40,17 @@ public class SftpOutboundTransferSample { @Test - public void testOutbound() throws Exception{ + public void testOutbound() throws Exception { final String sourceFileName = "README.md"; - final String destinationFileName = sourceFileName +"_foo"; + final String destinationFileName = sourceFileName + "_foo"; final ClassPathXmlApplicationContext ac = - new ClassPathXmlApplicationContext("/META-INF/spring/integration/SftpOutboundTransferSample-context.xml", - SftpOutboundTransferSample.class); + new ClassPathXmlApplicationContext("/META-INF/spring/integration/SftpOutboundTransferSample-context.xml", + SftpOutboundTransferSample.class); @SuppressWarnings("unchecked") - SessionFactory sessionFactory = ac.getBean(CachingSessionFactory.class); - RemoteFileTemplate template = new RemoteFileTemplate(sessionFactory); + SessionFactory sessionFactory = ac.getBean(CachingSessionFactory.class); + RemoteFileTemplate template = new RemoteFileTemplate<>(sessionFactory); SftpTestUtils.createTestFiles(template); // Just the directory try { diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpTestUtils.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpTestUtils.java index bbaef959f..4aab6b724 100644 --- a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpTestUtils.java +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpTestUtils.java @@ -22,14 +22,11 @@ import java.io.ByteArrayInputStream; import java.io.IOException; +import org.apache.sshd.sftp.client.SftpClient; + import org.springframework.integration.file.remote.RemoteFileTemplate; import org.springframework.integration.file.remote.SessionCallback; -import com.jcraft.jsch.ChannelSftp; -import com.jcraft.jsch.ChannelSftp.LsEntry; -import com.jcraft.jsch.SftpATTRS; -import com.jcraft.jsch.SftpException; - /** * @author Gary Russell * @author Artem Bilan @@ -39,10 +36,10 @@ */ public class SftpTestUtils { - public static void createTestFiles(RemoteFileTemplate template, final String... fileNames) { + public static void createTestFiles(RemoteFileTemplate template, final String... fileNames) { if (template != null) { final ByteArrayInputStream stream = new ByteArrayInputStream("foo".getBytes()); - template.execute((SessionCallback) session -> { + template.execute((SessionCallback) session -> { try { session.mkdir("si.sftp.sample"); } @@ -58,14 +55,15 @@ public static void createTestFiles(RemoteFileTemplate template, final S } } - public static void cleanUp(RemoteFileTemplate template, final String... fileNames) { + public static void cleanUp(RemoteFileTemplate template, final String... fileNames) { if (template != null) { - template.execute((SessionCallback) session -> { + template.execute((SessionCallback) session -> { for (int i = 0; i < fileNames.length; i++) { try { session.remove("si.sftp.sample/" + fileNames[i]); } - catch (IOException e) {} + catch (IOException e) { + } } // should be empty @@ -75,20 +73,20 @@ public static void cleanUp(RemoteFileTemplate template, final String... } } - public static boolean fileExists(RemoteFileTemplate template, final String... fileNames) { + public static boolean fileExists(RemoteFileTemplate template, final String... fileNames) { if (template != null) { return template.execute(session -> { - ChannelSftp channel = (ChannelSftp) session.getClientInstance(); - for (int i = 0; i < fileNames.length; i++) { + SftpClient channel = (SftpClient) session.getClientInstance(); + for (String fileName : fileNames) { try { - SftpATTRS stat = channel.stat("si.sftp.sample/" + fileNames[i]); + var stat = channel.stat("si.sftp.sample/" + fileName); if (stat == null) { - System.out.println("stat returned null for " + fileNames[i]); + System.out.println("stat returned null for " + fileName); return false; } } - catch (SftpException e) { - System.out.println("Remote file not present: " + e.getMessage() + ": " + fileNames[i]); + catch (IOException e) { + System.out.println("Remote file not present: " + e.getMessage() + ": " + fileName); return false; } } diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 944310479..4f44cfd61 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 runtime @@ -95,7 +95,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -129,7 +129,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 34456d587..cc345779d 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -122,202 +122,202 @@ org.springframework.integration spring-integration-file - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-syslog - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-smb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jdbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jmx - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ws - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-redis - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-r2dbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-webflux - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-sftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-rsocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mqtt - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-event - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration - spring-integration-gemfire - 6.0.0-M5 + spring-integration-kafka + 6.0.0-RC1 org.springframework.integration - spring-integration-kafka - 6.0.0-M5 + spring-integration-groovy + 6.0.0-RC1 org.springframework.integration - spring-integration-groovy - 6.0.0-M5 + spring-integration-cassandra + 6.0.0-RC1 org.springframework.integration spring-integration-scripting - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xmpp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-websocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-graphql - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-feed - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jpa - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zeromq - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-http - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zookeeper - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ip - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-hazelcast - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test-support - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-amqp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mail - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-security - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-camel - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xml - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-core - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jms - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mongodb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stream - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stomp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.boot @@ -329,7 +329,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 3802ab1e4..1eff3229b 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -123,7 +123,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 0796e256e..0d807d490 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -122,202 +122,202 @@ org.springframework.integration spring-integration-file - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-syslog - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-smb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jdbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jmx - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ws - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-redis - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-r2dbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-webflux - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-sftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-rsocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mqtt - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-event - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration - spring-integration-gemfire - 6.0.0-M5 + spring-integration-kafka + 6.0.0-RC1 org.springframework.integration - spring-integration-kafka - 6.0.0-M5 + spring-integration-groovy + 6.0.0-RC1 org.springframework.integration - spring-integration-groovy - 6.0.0-M5 + spring-integration-cassandra + 6.0.0-RC1 org.springframework.integration spring-integration-scripting - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xmpp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-websocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-graphql - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-feed - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jpa - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zeromq - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-http - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zookeeper - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ip - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-hazelcast - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test-support - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-amqp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mail - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-security - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-camel - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xml - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-core - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jms - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mongodb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stream - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stomp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.boot @@ -329,7 +329,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 66631da2c..d12227d5f 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -93,7 +93,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -127,7 +127,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -141,14 +141,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index f1827c156..bfdd135db 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -61,7 +61,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -79,7 +79,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -113,7 +113,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -127,14 +127,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 2077120d2..e491278d0 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -117,202 +117,202 @@ org.springframework.integration spring-integration-file - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-syslog - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-smb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jdbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jmx - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ws - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-redis - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-r2dbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-webflux - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-sftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-rsocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mqtt - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-event - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration - spring-integration-gemfire - 6.0.0-M5 + spring-integration-kafka + 6.0.0-RC1 org.springframework.integration - spring-integration-kafka - 6.0.0-M5 + spring-integration-groovy + 6.0.0-RC1 org.springframework.integration - spring-integration-groovy - 6.0.0-M5 + spring-integration-cassandra + 6.0.0-RC1 org.springframework.integration spring-integration-scripting - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xmpp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-websocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-graphql - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-feed - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jpa - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zeromq - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-http - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zookeeper - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ip - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-hazelcast - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test-support - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-amqp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mail - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-security - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-camel - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xml - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-core - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jms - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mongodb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stream - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stomp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.boot @@ -324,7 +324,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -338,14 +338,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index b7c0e0c62..5f61ad0b7 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -70,7 +70,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -120,7 +120,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -154,7 +154,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -168,14 +168,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index f3aba9b96..7397379b5 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -117,7 +117,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 955030211..cbdb350fa 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 37b233b5a..e55174641 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/build.gradle b/build.gradle index bc5036aac..ef1697f2f 100644 --- a/build.gradle +++ b/build.gradle @@ -221,7 +221,7 @@ subprojects { subproject -> ext { apacheSshdVersion = '2.9.1' - artemisVersion = '2.25.0' + artemisVersion = '2.26.0' aspectjVersion = '1.9.9.1' commonsDigesterVersion = '2.1' commonsDbcpVersion = '2.9.0' @@ -230,14 +230,14 @@ subprojects { subproject -> commonsLangVersion = '3.12.0' commonsPoolVersion = '2.11.1' c3p0Version = '0.9.5.5' - derbyVersion = '10.14.2.0' + derbyVersion = '10.16.1.1' hamcrestVersion = '2.2' - hibernateVersion = '6.1.3.Final' + hibernateVersion = '6.1.4.Final' hibernateValidatorVersion = '7.0.2.Final' ftpServerVersion = '1.1.2' flexjsonVersion = '2.0' - groovyVersion = '3.0.13' - hsqldbVersion = '2.6.1' + groovyVersion = '4.0.6' + hsqldbVersion = '2.7.0' h2Version = '2.1.214' jacksonVersion = '2.13.4' mailVersion = '2.0.1' @@ -250,24 +250,24 @@ subprojects { subproject -> jpaApiVersion = '3.0.2' jstlVersion = '1.2' junitVersion = '4.13.2' - junitJupiterVersion = '5.8.2' - jythonVersion = '2.7.2' - log4jVersion = '2.17.2' - mockitoVersion = '4.2.0' - mongoDriverVersion = '4.7.1' + junitJupiterVersion = '5.9.1' + jythonVersion = '2.7.3' + log4jVersion = '2.19.0' + mockitoVersion = '4.8.0' + mongoDriverVersion = '4.7.2' openJpaVersion = '2.4.0' oracleDriverVersion = '19.3.0.0' - postgresVersion = '42.4.1' + postgresVersion = '42.5.0' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.0-SNAPSHOT' - springIntegrationVersion = '6.0.0-M5' + springIntegrationVersion = '6.0.0-RC1' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.0.0-SNAPSHOT' - springSecurityVersion = '6.0.0-SNAPSHOT' + springVersion = '6.0.0-RC1' + springSecurityVersion = '6.0.0-RC1' springWebFlowVersion = '2.3.3.RELEASE' - testcontainersVersion = '1.17.3' + testcontainersVersion = '1.17.5' tilesJspVersion = '2.2.1' } @@ -402,7 +402,7 @@ project('cafe-scripted') { api 'org.springframework.integration:spring-integration-rsocket' api "org.jruby:jruby-complete:$jrubyVersion" api "org.python:jython-standalone:$jythonVersion" - api "org.codehaus.groovy:groovy-all:$groovyVersion" + api "org.apache.groovy:groovy-jsr223:$groovyVersion" api "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1283,6 +1283,7 @@ project('stored-procedures-derby') { dependencies { api 'org.springframework.integration:spring-integration-jdbc' api "org.apache.derby:derby:$derbyVersion" + api "org.apache.derby:derbytools:$derbyVersion" api "org.apache.logging.log4j:log4j-core:$log4jVersion" } } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index e2fee4464..8da38db80 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -128,202 +128,202 @@ org.springframework.integration spring-integration-file - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-syslog - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-smb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jdbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jmx - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ws - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-redis - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-r2dbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-webflux - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-sftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-rsocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mqtt - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-event - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration - spring-integration-gemfire - 6.0.0-M5 + spring-integration-kafka + 6.0.0-RC1 org.springframework.integration - spring-integration-kafka - 6.0.0-M5 + spring-integration-groovy + 6.0.0-RC1 org.springframework.integration - spring-integration-groovy - 6.0.0-M5 + spring-integration-cassandra + 6.0.0-RC1 org.springframework.integration spring-integration-scripting - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xmpp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-websocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-graphql - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-feed - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jpa - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zeromq - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-http - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zookeeper - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ip - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-hazelcast - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test-support - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-amqp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mail - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-security - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-camel - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xml - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-core - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jms - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mongodb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stream - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stomp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.boot @@ -335,7 +335,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -349,14 +349,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 4dfc02c08..75857a31c 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -128,202 +128,202 @@ org.springframework.integration spring-integration-file - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-syslog - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-smb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jdbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jmx - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ws - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-redis - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-r2dbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-webflux - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-sftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-rsocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mqtt - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-event - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration - spring-integration-gemfire - 6.0.0-M5 + spring-integration-kafka + 6.0.0-RC1 org.springframework.integration - spring-integration-kafka - 6.0.0-M5 + spring-integration-groovy + 6.0.0-RC1 org.springframework.integration - spring-integration-groovy - 6.0.0-M5 + spring-integration-cassandra + 6.0.0-RC1 org.springframework.integration spring-integration-scripting - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xmpp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-websocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-graphql - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-feed - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jpa - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zeromq - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-http - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zookeeper - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ip - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-hazelcast - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test-support - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-amqp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mail - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-security - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-camel - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xml - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-core - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jms - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mongodb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stream - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stomp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.boot @@ -335,7 +335,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -349,14 +349,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 46dabd4ea..c5d8cfa16 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -111,7 +111,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -150,202 +150,202 @@ org.springframework.integration spring-integration-file - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-syslog - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-smb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jdbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jmx - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ws - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-redis - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-r2dbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-webflux - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-sftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-rsocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mqtt - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-event - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration - spring-integration-gemfire - 6.0.0-M5 + spring-integration-kafka + 6.0.0-RC1 org.springframework.integration - spring-integration-kafka - 6.0.0-M5 + spring-integration-groovy + 6.0.0-RC1 org.springframework.integration - spring-integration-groovy - 6.0.0-M5 + spring-integration-cassandra + 6.0.0-RC1 org.springframework.integration spring-integration-scripting - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xmpp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-websocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-graphql - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-feed - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jpa - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zeromq - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-http - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zookeeper - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ip - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-hazelcast - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test-support - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-amqp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mail - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-security - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-camel - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xml - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-core - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jms - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mongodb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stream - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stomp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.boot @@ -357,7 +357,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -371,14 +371,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 0215b09c4..b387f63ad 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 9f8a8211f..7d63e4a0f 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 88dca4179..e6c5e67be 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 83f0c03f5..129d657cc 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 2b6c27aba..7baa5f31a 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -77,7 +77,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -95,7 +95,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -129,7 +129,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 3182c5b71..49592df99 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -82,7 +82,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -132,7 +132,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -166,7 +166,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 1934fc26a..fecf00180 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -82,7 +82,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -132,7 +132,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -166,7 +166,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 8903efd5a..db93fb783 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -95,19 +95,19 @@ org.springframework.security spring-security-web - 6.0.0-SNAPSHOT + 6.0.0-RC1 compile org.springframework.security spring-security-config - 6.0.0-SNAPSHOT + 6.0.0-RC1 compile org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -163,7 +163,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -197,7 +197,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -211,14 +211,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 42a662617..d811cb3ae 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -75,7 +75,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 compile @@ -93,7 +93,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -111,7 +111,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -145,7 +145,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 35b123aa5..4d2ad15b6 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 2eca9a8af..aa58dca88 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -60,13 +60,19 @@ org.apache.derby derby - 10.14.2.0 + 10.16.1.1 + compile + + + org.apache.derby + derbytools + 10.16.1.1 compile org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -84,7 +90,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -118,7 +124,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -132,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 24596e58e..f5d3eb54a 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -72,7 +72,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -90,7 +90,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -124,7 +124,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 3fec8b137..fbbadae48 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -118,7 +118,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 1461774ba..8e6521c34 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -60,7 +60,7 @@ org.postgresql postgresql - 42.4.1 + 42.5.0 compile @@ -78,7 +78,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -96,7 +96,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -130,7 +130,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -144,14 +144,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 01f3cec24..833f00519 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -117,202 +117,202 @@ org.springframework.integration spring-integration-file - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-syslog - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-smb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jdbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jmx - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ws - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-redis - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-r2dbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-webflux - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-sftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-rsocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mqtt - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-event - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration - spring-integration-gemfire - 6.0.0-M5 + spring-integration-kafka + 6.0.0-RC1 org.springframework.integration - spring-integration-kafka - 6.0.0-M5 + spring-integration-groovy + 6.0.0-RC1 org.springframework.integration - spring-integration-groovy - 6.0.0-M5 + spring-integration-cassandra + 6.0.0-RC1 org.springframework.integration spring-integration-scripting - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xmpp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-websocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-graphql - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-feed - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jpa - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zeromq - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-http - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zookeeper - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ip - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-hazelcast - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test-support - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-amqp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mail - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-security - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-camel - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xml - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-core - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jms - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mongodb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stream - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stomp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.boot @@ -324,7 +324,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -338,14 +338,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 70ddbf39a..de2818007 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -112,7 +112,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index a042548a3..4ea819163 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -114,7 +114,7 @@ org.testcontainers junit-jupiter - 1.17.3 + 1.17.5 test @@ -144,202 +144,202 @@ org.springframework.integration spring-integration-file - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-syslog - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-smb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jdbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jmx - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ws - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-redis - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-r2dbc - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-webflux - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-sftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-rsocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mqtt - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-event - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ftp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration - spring-integration-gemfire - 6.0.0-M5 + spring-integration-kafka + 6.0.0-RC1 org.springframework.integration - spring-integration-kafka - 6.0.0-M5 + spring-integration-groovy + 6.0.0-RC1 org.springframework.integration - spring-integration-groovy - 6.0.0-M5 + spring-integration-cassandra + 6.0.0-RC1 org.springframework.integration spring-integration-scripting - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xmpp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-websocket - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-graphql - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-feed - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jpa - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zeromq - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-http - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-zookeeper - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-ip - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-hazelcast - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-test-support - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-amqp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mail - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-security - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-camel - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-xml - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-core - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-jms - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-mongodb - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stream - 6.0.0-M5 + 6.0.0-RC1 org.springframework.integration spring-integration-stomp - 6.0.0-M5 + 6.0.0-RC1 org.springframework.cloud @@ -358,7 +358,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -372,14 +372,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index d29042bfc..627c722db 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -70,7 +70,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -88,7 +88,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -122,7 +122,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -136,14 +136,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 77cce8b30..b6eb341e2 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.17.2 + 2.19.0 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.2.0 + 4.8.0 test @@ -123,7 +123,7 @@ org.junit junit-bom - 5.8.2 + 5.9.1 import pom @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-SNAPSHOT + 6.0.0-RC1 import pom org.springframework.integration spring-integration-bom - 6.0.0-M5 + 6.0.0-RC1 import pom From 6f9871f6d1d00bb1156b022a66bdc178d980cf6d Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 1 Nov 2022 11:19:07 -0400 Subject: [PATCH 302/356] Upgrade hsqldb to 2.7.1 --- applications/loanshark/pom.xml | 2 +- build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index ac19b0380..155deae2c 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -143,7 +143,7 @@ org.hsqldb hsqldb - 2.7.0 + 2.7.1 compile diff --git a/build.gradle b/build.gradle index ef1697f2f..54330d6b8 100644 --- a/build.gradle +++ b/build.gradle @@ -237,7 +237,7 @@ subprojects { subproject -> ftpServerVersion = '1.1.2' flexjsonVersion = '2.0' groovyVersion = '4.0.6' - hsqldbVersion = '2.7.0' + hsqldbVersion = '2.7.1' h2Version = '2.1.214' jacksonVersion = '2.13.4' mailVersion = '2.0.1' From df78f0665b9bbe772d506a4ae01c4dfb3748b652 Mon Sep 17 00:00:00 2001 From: artembilan Date: Tue, 8 Nov 2022 16:10:20 -0500 Subject: [PATCH 303/356] Upgrade to Spring Integration 6.0.0-RC2 --- advanced/advanced-testing-examples/pom.xml | 4 +- advanced/dynamic-ftp/pom.xml | 4 +- advanced/dynamic-tcp-client/pom.xml | 84 ++++----- applications/cafe-scripted/pom.xml | 4 +- applications/cafe/cafe-amqp/pom.xml | 4 +- applications/cafe/cafe-jms/pom.xml | 4 +- applications/cafe/cafe-si/pom.xml | 4 +- applications/file-split-ftp/pom.xml | 84 ++++----- applications/loan-broker/pom.xml | 4 +- applications/loanshark/pom.xml | 4 +- applications/stomp-chat/pom.xml | 84 ++++----- basic/amqp/pom.xml | 4 +- basic/barrier/pom.xml | 84 ++++----- basic/control-bus/pom.xml | 4 +- basic/enricher/pom.xml | 4 +- basic/feed/pom.xml | 4 +- basic/file/pom.xml | 4 +- basic/ftp/pom.xml | 4 +- basic/helloworld/pom.xml | 4 +- basic/http/pom.xml | 4 +- basic/jdbc/pom.xml | 4 +- basic/jms/pom.xml | 4 +- basic/jmx/pom.xml | 4 +- basic/jpa/pom.xml | 84 ++++----- basic/kafka/pom.xml | 84 ++++----- basic/mail/pom.xml | 4 +- basic/mongodb/pom.xml | 4 +- basic/mqtt/pom.xml | 84 ++++----- basic/oddeven/pom.xml | 4 +- basic/quote/pom.xml | 4 +- basic/sftp/pom.xml | 4 +- basic/tcp-amqp/pom.xml | 4 +- basic/tcp-broadcast/pom.xml | 84 ++++----- basic/tcp-client-server/pom.xml | 4 +- basic/tcp-with-headers/pom.xml | 84 ++++----- basic/testing-examples/pom.xml | 4 +- basic/twitter/pom.xml | 4 +- basic/web-sockets/pom.xml | 84 ++++----- basic/ws-inbound-gateway/pom.xml | 4 +- basic/ws-outbound-gateway/pom.xml | 4 +- basic/xml/pom.xml | 4 +- basic/xmpp/pom.xml | 4 +- build.gradle | 4 +- dsl/cafe-dsl/pom.xml | 84 ++++----- dsl/kafka-dsl/pom.xml | 84 ++++----- dsl/si4demo/pom.xml | 84 ++++----- intermediate/async-gateway/pom.xml | 4 +- intermediate/dynamic-poller/pom.xml | 4 +- intermediate/errorhandling/pom.xml | 4 +- intermediate/file-processing/pom.xml | 4 +- intermediate/mail-attachments/pom.xml | 4 +- intermediate/monitoring/pom.xml | 4 +- intermediate/multipart-http/pom.xml | 4 +- intermediate/rest-http/pom.xml | 4 +- intermediate/retry-and-more/pom.xml | 4 +- .../splitter-aggregator-reaper/pom.xml | 4 +- intermediate/stored-procedures-derby/pom.xml | 4 +- intermediate/stored-procedures-ms/pom.xml | 4 +- intermediate/stored-procedures-oracle/pom.xml | 4 +- .../stored-procedures-postgresql/pom.xml | 4 +- intermediate/tcp-async-bi-directional/pom.xml | 84 ++++----- .../tcp-client-server-multiplex/pom.xml | 4 +- intermediate/testcontainers-rabbitmq/pom.xml | 164 +++++++++--------- intermediate/travel/pom.xml | 4 +- intermediate/tx-synch/pom.xml | 4 +- 65 files changed, 770 insertions(+), 770 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index bbfcb5e04..e367a36f4 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index e30d808e0..86823a707 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 32a0490df..501595bf2 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -117,202 +117,202 @@ org.springframework.integration spring-integration-file - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-syslog - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-smb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jdbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jmx - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ws - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-redis - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-webflux - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-sftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-rsocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mqtt - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-event - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-kafka - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-groovy - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-cassandra - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-scripting - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xmpp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-websocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-graphql - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-feed - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jpa - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zeromq - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-http - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ip - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test-support - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-amqp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mail - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-security - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-camel - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xml - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-core - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jms - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mongodb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stream - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stomp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.boot @@ -338,14 +338,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 401ab0f8e..3e3ef85cc 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 6de29ba84..5767970d8 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 368f69cc7..7174d749d 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -156,14 +156,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index afe8e3580..36851b2d2 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 85de34e1e..fa9e622a4 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -144,202 +144,202 @@ org.springframework.integration spring-integration-file - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-syslog - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-smb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jdbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jmx - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ws - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-redis - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-webflux - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-sftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-rsocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mqtt - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-event - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-kafka - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-groovy - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-cassandra - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-scripting - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xmpp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-websocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-graphql - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-feed - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jpa - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zeromq - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-http - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ip - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test-support - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-amqp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mail - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-security - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-camel - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xml - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-core - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jms - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mongodb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stream - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stomp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.boot @@ -365,14 +365,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 40a31330a..0302507f9 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 155deae2c..27488b959 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -325,14 +325,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 5203f81fc..8902cae57 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -127,202 +127,202 @@ org.springframework.integration spring-integration-file - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-syslog - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-smb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jdbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jmx - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ws - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-redis - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-webflux - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-sftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-rsocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mqtt - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-event - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-kafka - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-groovy - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-cassandra - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-scripting - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xmpp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-websocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-graphql - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-feed - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jpa - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zeromq - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-http - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ip - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test-support - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-amqp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mail - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-security - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-camel - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xml - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-core - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jms - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mongodb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stream - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stomp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.boot @@ -348,14 +348,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 11af4cc8c..2af5fb51c 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 2a5a66c5b..b39d1b5ad 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -132,202 +132,202 @@ org.springframework.integration spring-integration-file - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-syslog - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-smb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jdbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jmx - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ws - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-redis - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-webflux - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-sftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-rsocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mqtt - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-event - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-kafka - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-groovy - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-cassandra - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-scripting - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xmpp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-websocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-graphql - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-feed - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jpa - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zeromq - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-http - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ip - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test-support - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-amqp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mail - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-security - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-camel - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xml - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-core - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jms - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mongodb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stream - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stomp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.boot @@ -353,14 +353,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index e528f51a7..f41c8364e 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 5aa7e7ab2..2439cb603 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 6e1a7ddcb..c99972a6d 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index e32e60456..b15d2f4b6 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 00042572f..a483c9084 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -150,14 +150,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index a75663777..51912fba1 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 5fb7cff03..b62ba2b5d 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index e6c5883e9..d2c223f51 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index b0f1ae2f5..f3ddc1373 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 7e3eaf9af..0e3e307d8 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 5eb2e1d21..f36e9b7ff 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -134,202 +134,202 @@ org.springframework.integration spring-integration-file - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-syslog - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-smb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jdbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jmx - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ws - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-redis - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-webflux - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-sftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-rsocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mqtt - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-event - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-kafka - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-groovy - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-cassandra - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-scripting - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xmpp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-websocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-graphql - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-feed - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jpa - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zeromq - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-http - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ip - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test-support - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-amqp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mail - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-security - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-camel - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xml - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-core - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jms - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mongodb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stream - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stomp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.boot @@ -355,14 +355,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 596eac4c1..528b3c482 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -134,202 +134,202 @@ org.springframework.integration spring-integration-file - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-syslog - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-smb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jdbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jmx - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ws - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-redis - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-webflux - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-sftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-rsocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mqtt - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-event - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-kafka - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-groovy - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-cassandra - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-scripting - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xmpp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-websocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-graphql - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-feed - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jpa - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zeromq - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-http - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ip - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test-support - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-amqp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mail - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-security - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-camel - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xml - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-core - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jms - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mongodb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stream - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stomp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.boot @@ -355,14 +355,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 983696239..ab1ad3572 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 9a1dff520..44aef058e 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index ebe2971d6..62b980c5d 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -122,202 +122,202 @@ org.springframework.integration spring-integration-file - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-syslog - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-smb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jdbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jmx - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ws - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-redis - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-webflux - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-sftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-rsocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mqtt - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-event - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-kafka - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-groovy - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-cassandra - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-scripting - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xmpp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-websocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-graphql - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-feed - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jpa - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zeromq - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-http - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ip - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test-support - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-amqp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mail - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-security - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-camel - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xml - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-core - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jms - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mongodb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stream - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stomp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.boot @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index cc964a194..e4c32171e 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 01d8c9784..9263bb87d 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 8c47b4910..3d4be5de3 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 4f44cfd61..64e08a46b 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index cc345779d..b62ce7b04 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -122,202 +122,202 @@ org.springframework.integration spring-integration-file - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-syslog - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-smb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jdbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jmx - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ws - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-redis - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-webflux - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-sftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-rsocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mqtt - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-event - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-kafka - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-groovy - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-cassandra - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-scripting - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xmpp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-websocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-graphql - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-feed - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jpa - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zeromq - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-http - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ip - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test-support - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-amqp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mail - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-security - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-camel - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xml - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-core - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jms - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mongodb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stream - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stomp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.boot @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 1eff3229b..6bab7840b 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 0d807d490..95f461b07 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -122,202 +122,202 @@ org.springframework.integration spring-integration-file - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-syslog - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-smb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jdbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jmx - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ws - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-redis - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-webflux - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-sftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-rsocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mqtt - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-event - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-kafka - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-groovy - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-cassandra - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-scripting - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xmpp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-websocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-graphql - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-feed - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jpa - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zeromq - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-http - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ip - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test-support - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-amqp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mail - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-security - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-camel - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xml - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-core - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jms - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mongodb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stream - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stomp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.boot @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index d12227d5f..815cb4239 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -141,14 +141,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index bfdd135db..6f59c09eb 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -127,14 +127,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index e491278d0..86d6462cb 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -117,202 +117,202 @@ org.springframework.integration spring-integration-file - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-syslog - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-smb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jdbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jmx - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ws - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-redis - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-webflux - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-sftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-rsocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mqtt - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-event - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-kafka - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-groovy - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-cassandra - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-scripting - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xmpp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-websocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-graphql - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-feed - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jpa - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zeromq - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-http - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ip - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test-support - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-amqp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mail - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-security - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-camel - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xml - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-core - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jms - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mongodb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stream - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stomp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.boot @@ -338,14 +338,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 5f61ad0b7..97dcdca9c 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -168,14 +168,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 7397379b5..7b978cd14 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index cbdb350fa..43b238925 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index e55174641..c460752e2 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/build.gradle b/build.gradle index 54330d6b8..05c446a60 100644 --- a/build.gradle +++ b/build.gradle @@ -260,11 +260,11 @@ subprojects { subproject -> postgresVersion = '42.5.0' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.0-SNAPSHOT' - springIntegrationVersion = '6.0.0-RC1' + springIntegrationVersion = '6.0.0-RC2' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.0.0-RC1' + springVersion = '6.0.0-RC3' springSecurityVersion = '6.0.0-RC1' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.17.5' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 8da38db80..ec70c3b14 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -128,202 +128,202 @@ org.springframework.integration spring-integration-file - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-syslog - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-smb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jdbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jmx - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ws - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-redis - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-webflux - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-sftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-rsocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mqtt - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-event - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-kafka - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-groovy - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-cassandra - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-scripting - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xmpp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-websocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-graphql - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-feed - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jpa - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zeromq - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-http - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ip - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test-support - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-amqp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mail - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-security - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-camel - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xml - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-core - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jms - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mongodb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stream - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stomp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.boot @@ -349,14 +349,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 75857a31c..b14327333 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -128,202 +128,202 @@ org.springframework.integration spring-integration-file - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-syslog - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-smb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jdbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jmx - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ws - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-redis - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-webflux - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-sftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-rsocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mqtt - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-event - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-kafka - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-groovy - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-cassandra - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-scripting - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xmpp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-websocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-graphql - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-feed - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jpa - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zeromq - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-http - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ip - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test-support - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-amqp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mail - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-security - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-camel - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xml - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-core - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jms - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mongodb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stream - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stomp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.boot @@ -349,14 +349,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index c5d8cfa16..ddcc0790a 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -150,202 +150,202 @@ org.springframework.integration spring-integration-file - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-syslog - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-smb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jdbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jmx - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ws - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-redis - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-webflux - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-sftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-rsocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mqtt - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-event - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-kafka - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-groovy - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-cassandra - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-scripting - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xmpp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-websocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-graphql - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-feed - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jpa - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zeromq - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-http - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ip - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test-support - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-amqp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mail - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-security - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-camel - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xml - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-core - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jms - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mongodb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stream - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stomp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.boot @@ -371,14 +371,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index b387f63ad..668700cc0 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 7d63e4a0f..ce768c37b 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index e6c5e67be..c2d50d7aa 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 129d657cc..7187d9541 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 7baa5f31a..e4d0446d5 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 49592df99..1b61d5f87 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index fecf00180..6f56d055b 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index db93fb783..6d1e982aa 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -211,14 +211,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index d811cb3ae..f8ac4db6f 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 4d2ad15b6..d4de6653e 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index aa58dca88..a47cd0a1e 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index f5d3eb54a..466d3602f 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index fbbadae48..02115495f 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 8e6521c34..18223ce70 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -144,14 +144,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 833f00519..75ce433ec 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -117,202 +117,202 @@ org.springframework.integration spring-integration-file - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-syslog - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-smb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jdbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jmx - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ws - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-redis - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-webflux - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-sftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-rsocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mqtt - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-event - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ftp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-kafka - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-groovy - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-cassandra - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-scripting - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xmpp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-websocket - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-graphql - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-feed - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jpa - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zeromq - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-http - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-ip - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-test-support - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-amqp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mail - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-security - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-camel - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-xml - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-core - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-jms - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-mongodb - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stream - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.integration spring-integration-stomp - 6.0.0-RC1 + 6.0.0-RC2 org.springframework.boot @@ -338,14 +338,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index de2818007..0ab65af33 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 4ea819163..95004c4f1 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -143,203 +143,203 @@ org.springframework.integration - spring-integration-file - 6.0.0-RC1 + spring-integration-jdbc + 6.0.0-RC2 org.springframework.integration - spring-integration-syslog - 6.0.0-RC1 + spring-integration-ws + 6.0.0-RC2 org.springframework.integration - spring-integration-smb - 6.0.0-RC1 + spring-integration-redis + 6.0.0-RC2 org.springframework.integration - spring-integration-jdbc - 6.0.0-RC1 + spring-integration-r2dbc + 6.0.0-RC2 org.springframework.integration - spring-integration-jmx - 6.0.0-RC1 + spring-integration-rsocket + 6.0.0-RC2 org.springframework.integration - spring-integration-ws - 6.0.0-RC1 + spring-integration-event + 6.0.0-RC2 org.springframework.integration - spring-integration-redis - 6.0.0-RC1 + spring-integration-cassandra + 6.0.0-RC2 org.springframework.integration - spring-integration-r2dbc - 6.0.0-RC1 + spring-integration-scripting + 6.0.0-RC2 org.springframework.integration - spring-integration-webflux - 6.0.0-RC1 + spring-integration-websocket + 6.0.0-RC2 org.springframework.integration - spring-integration-sftp - 6.0.0-RC1 + spring-integration-graphql + 6.0.0-RC2 org.springframework.integration - spring-integration-rsocket - 6.0.0-RC1 + spring-integration-jpa + 6.0.0-RC2 org.springframework.integration - spring-integration-mqtt - 6.0.0-RC1 + spring-integration-test + 6.0.0-RC2 org.springframework.integration - spring-integration-event - 6.0.0-RC1 + spring-integration-http + 6.0.0-RC2 org.springframework.integration - spring-integration-ftp - 6.0.0-RC1 + spring-integration-zookeeper + 6.0.0-RC2 org.springframework.integration - spring-integration-kafka - 6.0.0-RC1 + spring-integration-ip + 6.0.0-RC2 org.springframework.integration - spring-integration-groovy - 6.0.0-RC1 + spring-integration-mail + 6.0.0-RC2 org.springframework.integration - spring-integration-cassandra - 6.0.0-RC1 + spring-integration-camel + 6.0.0-RC2 org.springframework.integration - spring-integration-scripting - 6.0.0-RC1 + spring-integration-mongodb + 6.0.0-RC2 org.springframework.integration - spring-integration-xmpp - 6.0.0-RC1 + spring-integration-stream + 6.0.0-RC2 org.springframework.integration - spring-integration-websocket - 6.0.0-RC1 + spring-integration-stomp + 6.0.0-RC2 org.springframework.integration - spring-integration-graphql - 6.0.0-RC1 + spring-integration-file + 6.0.0-RC2 org.springframework.integration - spring-integration-feed - 6.0.0-RC1 + spring-integration-syslog + 6.0.0-RC2 org.springframework.integration - spring-integration-jpa - 6.0.0-RC1 + spring-integration-smb + 6.0.0-RC2 org.springframework.integration - spring-integration-test - 6.0.0-RC1 + spring-integration-jmx + 6.0.0-RC2 org.springframework.integration - spring-integration-zeromq - 6.0.0-RC1 + spring-integration-webflux + 6.0.0-RC2 org.springframework.integration - spring-integration-http - 6.0.0-RC1 + spring-integration-sftp + 6.0.0-RC2 org.springframework.integration - spring-integration-zookeeper - 6.0.0-RC1 + spring-integration-mqtt + 6.0.0-RC2 org.springframework.integration - spring-integration-ip - 6.0.0-RC1 + spring-integration-ftp + 6.0.0-RC2 org.springframework.integration - spring-integration-hazelcast - 6.0.0-RC1 + spring-integration-kafka + 6.0.0-RC2 org.springframework.integration - spring-integration-test-support - 6.0.0-RC1 + spring-integration-groovy + 6.0.0-RC2 org.springframework.integration - spring-integration-amqp - 6.0.0-RC1 + spring-integration-xmpp + 6.0.0-RC2 org.springframework.integration - spring-integration-mail - 6.0.0-RC1 + spring-integration-feed + 6.0.0-RC2 org.springframework.integration - spring-integration-security - 6.0.0-RC1 + spring-integration-zeromq + 6.0.0-RC2 org.springframework.integration - spring-integration-camel - 6.0.0-RC1 + spring-integration-hazelcast + 6.0.0-RC2 org.springframework.integration - spring-integration-xml - 6.0.0-RC1 + spring-integration-test-support + 6.0.0-RC2 org.springframework.integration - spring-integration-core - 6.0.0-RC1 + spring-integration-amqp + 6.0.0-RC2 org.springframework.integration - spring-integration-jms - 6.0.0-RC1 + spring-integration-security + 6.0.0-RC2 org.springframework.integration - spring-integration-mongodb - 6.0.0-RC1 + spring-integration-xml + 6.0.0-RC2 org.springframework.integration - spring-integration-stream - 6.0.0-RC1 + spring-integration-core + 6.0.0-RC2 org.springframework.integration - spring-integration-stomp - 6.0.0-RC1 + spring-integration-jms + 6.0.0-RC2 org.springframework.cloud @@ -372,14 +372,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 627c722db..4b34add17 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -136,14 +136,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index b6eb341e2..03bfd713e 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-RC1 + 6.0.0-RC3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC1 + 6.0.0-RC2 import pom From 4f77344a8f508038605ba6325f312909523651d3 Mon Sep 17 00:00:00 2001 From: Daniel Hammer Date: Thu, 10 Nov 2022 23:34:03 +0100 Subject: [PATCH 304/356] Provide a realistic SFTP public key * Provide a more realistic SFTP configuration example, utilizing `~/.ssh/known_hosts` based on the `PublickeyAuthenticator` support from Apache MINA. --- .../samples/sftp/EmbeddedSftpServer.java | 47 +++---------------- .../resources/META-INF/keys/sftp_known_hosts | 1 + .../test/resources/META-INF/keys/sftp_rsa.pub | 1 - 3 files changed, 8 insertions(+), 41 deletions(-) create mode 100644 basic/sftp/src/test/resources/META-INF/keys/sftp_known_hosts delete mode 100644 basic/sftp/src/test/resources/META-INF/keys/sftp_rsa.pub diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/EmbeddedSftpServer.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/EmbeddedSftpServer.java index ec0e09b70..a8fda809b 100644 --- a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/EmbeddedSftpServer.java +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/EmbeddedSftpServer.java @@ -18,18 +18,14 @@ import java.io.File; import java.io.IOException; -import java.io.InputStream; -import java.math.BigInteger; -import java.nio.ByteBuffer; +import java.nio.file.Path; import java.nio.file.Paths; -import java.security.KeyFactory; -import java.security.PublicKey; -import java.security.spec.RSAPublicKeySpec; -import java.util.Arrays; import java.util.Collections; import org.apache.sshd.common.file.virtualfs.VirtualFileSystemFactory; import org.apache.sshd.server.SshServer; +import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator; +import org.apache.sshd.server.config.keys.AuthorizedKeysAuthenticator; import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; import org.apache.sshd.sftp.server.SftpSubsystemFactory; @@ -37,8 +33,6 @@ import org.springframework.context.SmartLifecycle; import org.springframework.core.io.ClassPathResource; import org.springframework.integration.sftp.session.DefaultSftpSessionFactory; -import org.springframework.util.Base64Utils; -import org.springframework.util.StreamUtils; /** * @author Artem Bilan @@ -68,8 +62,7 @@ public void setDefaultSftpSessionFactory(DefaultSftpSessionFactory defaultSftpSe @Override public void afterPropertiesSet() throws Exception { - final PublicKey allowedKey = decodePublicKey(); - this.server.setPublickeyAuthenticator((username, key, session) -> key.equals(allowedKey)); + this.server.setPublickeyAuthenticator(getPublickeyAuthenticator()); this.server.setPort(this.port); this.server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File("hostkey.ser").toPath())); server.setSubsystemFactories(Collections.singletonList(new SftpSubsystemFactory())); @@ -78,35 +71,9 @@ public void afterPropertiesSet() throws Exception { server.setFileSystemFactory(new VirtualFileSystemFactory(Paths.get(pathname))); } - private PublicKey decodePublicKey() throws Exception { - InputStream stream = new ClassPathResource("META-INF/keys/sftp_rsa.pub").getInputStream(); - byte[] keyBytes = StreamUtils.copyToByteArray(stream); - // strip any newline chars - while (keyBytes[keyBytes.length - 1] == 0x0a || keyBytes[keyBytes.length - 1] == 0x0d) { - keyBytes = Arrays.copyOf(keyBytes, keyBytes.length - 1); - } - byte[] decodeBuffer = Base64Utils.decode(keyBytes); - ByteBuffer bb = ByteBuffer.wrap(decodeBuffer); - int len = bb.getInt(); - byte[] type = new byte[len]; - bb.get(type); - if ("ssh-rsa".equals(new String(type))) { - BigInteger e = decodeBigInt(bb); - BigInteger m = decodeBigInt(bb); - RSAPublicKeySpec spec = new RSAPublicKeySpec(m, e); - return KeyFactory.getInstance("RSA").generatePublic(spec); - - } - else { - throw new IllegalArgumentException("Only supports RSA"); - } - } - - private BigInteger decodeBigInt(ByteBuffer bb) { - int len = bb.getInt(); - byte[] bytes = new byte[len]; - bb.get(bytes); - return new BigInteger(bytes); + private PublickeyAuthenticator getPublickeyAuthenticator() throws Exception { + Path path = new ClassPathResource("META-INF/keys/sftp_known_hosts").getFile().toPath(); + return new AuthorizedKeysAuthenticator(path); } @Override diff --git a/basic/sftp/src/test/resources/META-INF/keys/sftp_known_hosts b/basic/sftp/src/test/resources/META-INF/keys/sftp_known_hosts new file mode 100644 index 000000000..3c147ae2e --- /dev/null +++ b/basic/sftp/src/test/resources/META-INF/keys/sftp_known_hosts @@ -0,0 +1 @@ +localhost ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMQB/vTCY6QEF+/P73ZQZzgj5LBUG8gKPbAXdWcE/X0g3jgsPpxb7+NGiqNpP+oVIQsL9Q7TBsv1/X7xc6sd6SmM/UTP8LF0zlf0GSvEehC2BT98GCiDqI8BKpZjG6O8+pPEBY8M5iGOLtDUSzlhzyV7kPcADYLHl/z1fssU+x2UML7BoSmgh0XPc2u+Gv6+58SVk2ipAZOmaWZDyzWAc3sczz/DkQeR/cpj047HVc1Zb/M5a4ajYI18Ka+mVhKeiQnHc3NKwE6ZxcwlacbVK/feypfperHQOlj6Ee6f6huhnVx9x42V11A41Toh98WI2EVDequ4EcTxHHJntJhpbd diff --git a/basic/sftp/src/test/resources/META-INF/keys/sftp_rsa.pub b/basic/sftp/src/test/resources/META-INF/keys/sftp_rsa.pub deleted file mode 100644 index e790fbc53..000000000 --- a/basic/sftp/src/test/resources/META-INF/keys/sftp_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -AAAAB3NzaC1yc2EAAAADAQABAAABAQDMQB/vTCY6QEF+/P73ZQZzgj5LBUG8gKPbAXdWcE/X0g3jgsPpxb7+NGiqNpP+oVIQsL9Q7TBsv1/X7xc6sd6SmM/UTP8LF0zlf0GSvEehC2BT98GCiDqI8BKpZjG6O8+pPEBY8M5iGOLtDUSzlhzyV7kPcADYLHl/z1fssU+x2UML7BoSmgh0XPc2u+Gv6+58SVk2ipAZOmaWZDyzWAc3sczz/DkQeR/cpj047HVc1Zb/M5a4ajYI18Ka+mVhKeiQnHc3NKwE6ZxcwlacbVK/feypfperHQOlj6Ee6f6huhnVx9x42V11A41Toh98WI2EVDequ4EcTxHHJntJhpbd From 282a5b8f6e25ecc4281a7d2127958dd1f333154c Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 22 Nov 2022 09:58:44 -0500 Subject: [PATCH 305/356] Upgrade to Spring Integration 6.0.0 --- build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 05c446a60..276d7a94a 100644 --- a/build.gradle +++ b/build.gradle @@ -232,8 +232,8 @@ subprojects { subproject -> c3p0Version = '0.9.5.5' derbyVersion = '10.16.1.1' hamcrestVersion = '2.2' - hibernateVersion = '6.1.4.Final' - hibernateValidatorVersion = '7.0.2.Final' + hibernateVersion = '6.1.5.Final' + hibernateValidatorVersion = '8.0.0.Final' ftpServerVersion = '1.1.2' flexjsonVersion = '2.0' groovyVersion = '4.0.6' @@ -259,15 +259,15 @@ subprojects { subproject -> oracleDriverVersion = '19.3.0.0' postgresVersion = '42.5.0' slf4jVersion = '1.7.30' - springCloudVersion = '2022.0.0-SNAPSHOT' - springIntegrationVersion = '6.0.0-RC2' + springCloudVersion = '2022.0.0-RC2' + springIntegrationVersion = '6.0.0' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.0.0-RC3' - springSecurityVersion = '6.0.0-RC1' + springVersion = '6.0.0' + springSecurityVersion = '6.0.0' springWebFlowVersion = '2.3.3.RELEASE' - testcontainersVersion = '1.17.5' + testcontainersVersion = '1.17.6' tilesJspVersion = '2.2.1' } From 7130646139975e567a839fe4f6dc3efa5baaaff4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Nov 2022 22:23:16 +0000 Subject: [PATCH 306/356] Bump postgresql in /intermediate/stored-procedures-postgresql Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.5.0 to 42.5.1. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.5.0...REL42.5.1) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- intermediate/stored-procedures-postgresql/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 18223ce70..520c915fd 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -60,7 +60,7 @@ org.postgresql postgresql - 42.5.0 + 42.5.1 compile From 7dec6980eb48e186c82d5d1c19c01dbe416dd647 Mon Sep 17 00:00:00 2001 From: Chris Dickinson Date: Tue, 20 Dec 2022 17:54:20 +0100 Subject: [PATCH 307/356] Add URL for index.html page for WebSocket sample Turns out the CORS is always enabled for WebSocket with SockJS. So, since we cannot predict an URL for the `index.html` therefore we always recommend open it on the same host port as server application - `http://localhost:8080` --- basic/web-sockets/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basic/web-sockets/README.md b/basic/web-sockets/README.md index 632ed9b9a..a6beebc5c 100644 --- a/basic/web-sockets/README.md +++ b/basic/web-sockets/README.md @@ -21,7 +21,7 @@ The `org.springframework.integration.samples.websocket.standard.client.Applicati ## Browser Client The `index.html` in the `src/main/resources/static` directory of this project demonstrates a JavaScript `SockJS` client, which connects -to our server and just prints its messages in the middle of page. +to our server and just prints its messages in the middle of page. It can be reached at http://localhost:8080/index.html. ## Test Case From 5dd165b349d92c3e405dc0cfba3e811be27dcad7 Mon Sep 17 00:00:00 2001 From: abilan Date: Wed, 21 Dec 2022 11:29:40 -0500 Subject: [PATCH 308/356] Upgrade to Spring Integration 6.0.1 --- advanced/advanced-testing-examples/pom.xml | 4 +- advanced/dynamic-ftp/pom.xml | 4 +- advanced/dynamic-tcp-client/pom.xml | 88 +++++++++--------- applications/cafe-scripted/pom.xml | 4 +- applications/cafe/cafe-amqp/pom.xml | 4 +- applications/cafe/cafe-jms/pom.xml | 4 +- applications/cafe/cafe-si/pom.xml | 4 +- applications/file-split-ftp/pom.xml | 88 +++++++++--------- applications/loan-broker/pom.xml | 4 +- applications/loanshark/pom.xml | 8 +- applications/stomp-chat/pom.xml | 88 +++++++++--------- basic/amqp/pom.xml | 4 +- basic/barrier/pom.xml | 88 +++++++++--------- basic/control-bus/pom.xml | 4 +- basic/enricher/pom.xml | 4 +- basic/feed/pom.xml | 4 +- basic/file/pom.xml | 4 +- basic/ftp/pom.xml | 4 +- basic/helloworld/pom.xml | 4 +- basic/http/pom.xml | 4 +- basic/jdbc/pom.xml | 4 +- basic/jms/pom.xml | 4 +- basic/jmx/pom.xml | 4 +- basic/jpa/pom.xml | 88 +++++++++--------- basic/kafka/pom.xml | 88 +++++++++--------- basic/mail/pom.xml | 4 +- basic/mongodb/pom.xml | 4 +- basic/mqtt/pom.xml | 88 +++++++++--------- basic/oddeven/pom.xml | 4 +- basic/quote/pom.xml | 4 +- basic/sftp/pom.xml | 4 +- basic/tcp-amqp/pom.xml | 4 +- basic/tcp-broadcast/pom.xml | 88 +++++++++--------- basic/tcp-client-server/pom.xml | 4 +- basic/tcp-with-headers/pom.xml | 88 +++++++++--------- basic/testing-examples/pom.xml | 4 +- basic/twitter/pom.xml | 4 +- basic/web-sockets/pom.xml | 88 +++++++++--------- basic/ws-inbound-gateway/pom.xml | 4 +- basic/ws-outbound-gateway/pom.xml | 4 +- basic/xml/pom.xml | 4 +- basic/xmpp/pom.xml | 4 +- build.gradle | 8 +- dsl/cafe-dsl/pom.xml | 88 +++++++++--------- dsl/kafka-dsl/pom.xml | 88 +++++++++--------- dsl/si4demo/pom.xml | 88 +++++++++--------- gradle.properties | 2 +- intermediate/async-gateway/pom.xml | 4 +- intermediate/dynamic-poller/pom.xml | 4 +- intermediate/errorhandling/pom.xml | 4 +- intermediate/file-processing/pom.xml | 4 +- intermediate/mail-attachments/pom.xml | 4 +- intermediate/monitoring/pom.xml | 4 +- intermediate/multipart-http/pom.xml | 4 +- intermediate/rest-http/pom.xml | 8 +- intermediate/retry-and-more/pom.xml | 4 +- .../splitter-aggregator-reaper/pom.xml | 4 +- intermediate/stored-procedures-derby/pom.xml | 4 +- intermediate/stored-procedures-ms/pom.xml | 4 +- intermediate/stored-procedures-oracle/pom.xml | 4 +- .../stored-procedures-postgresql/pom.xml | 6 +- intermediate/tcp-async-bi-directional/pom.xml | 88 +++++++++--------- .../tcp-client-server-multiplex/pom.xml | 4 +- intermediate/testcontainers-rabbitmq/pom.xml | 92 +++++++++---------- intermediate/travel/pom.xml | 4 +- intermediate/tx-synch/pom.xml | 4 +- 66 files changed, 770 insertions(+), 770 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index e367a36f4..d9799918b 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 86823a707..3dec37edf 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 501595bf2..f84cc0f41 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -117,207 +117,207 @@ org.springframework.integration spring-integration-file - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-syslog - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-smb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jdbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jmx - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ws - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-redis - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-webflux - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-sftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-rsocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mqtt - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-event - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-kafka - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-groovy - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-cassandra - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-scripting - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xmpp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-websocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-graphql - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-feed - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jpa - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zeromq - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-http - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ip - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test-support - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-amqp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mail - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-security - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-camel - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xml - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-core - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jms - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mongodb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stream - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stomp - 6.0.0-RC2 + 6.0.1 org.springframework.boot spring-boot-dependencies - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT import pom @@ -338,14 +338,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom @@ -362,7 +362,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 3e3ef85cc..bb4ad6975 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 5767970d8..da6ae14a1 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 7174d749d..44fa50e34 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -156,14 +156,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 36851b2d2..b0eb211b5 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index fa9e622a4..3e6ff54ed 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -144,207 +144,207 @@ org.springframework.integration spring-integration-file - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-syslog - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-smb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jdbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jmx - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ws - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-redis - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-webflux - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-sftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-rsocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mqtt - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-event - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-kafka - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-groovy - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-cassandra - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-scripting - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xmpp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-websocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-graphql - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-feed - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jpa - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zeromq - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-http - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ip - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test-support - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-amqp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mail - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-security - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-camel - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xml - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-core - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jms - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mongodb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stream - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stomp - 6.0.0-RC2 + 6.0.1 org.springframework.boot spring-boot-dependencies - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT import pom @@ -365,14 +365,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom @@ -389,7 +389,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 0302507f9..2b8413306 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 27488b959..7eb01caa6 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -155,7 +155,7 @@ org.hibernate hibernate-validator - 7.0.2.Final + 8.0.0.Final compile @@ -167,7 +167,7 @@ org.hibernate.orm hibernate-core - 6.1.4.Final + 6.1.5.Final compile @@ -325,14 +325,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 8902cae57..2a08e5b35 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -127,207 +127,207 @@ org.springframework.integration spring-integration-file - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-syslog - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-smb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jdbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jmx - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ws - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-redis - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-webflux - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-sftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-rsocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mqtt - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-event - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-kafka - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-groovy - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-cassandra - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-scripting - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xmpp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-websocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-graphql - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-feed - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jpa - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zeromq - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-http - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ip - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test-support - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-amqp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mail - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-security - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-camel - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xml - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-core - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jms - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mongodb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stream - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stomp - 6.0.0-RC2 + 6.0.1 org.springframework.boot spring-boot-dependencies - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT import pom @@ -348,14 +348,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom @@ -372,7 +372,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 2af5fb51c..5b870f1ad 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index b39d1b5ad..753ca17b8 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -132,207 +132,207 @@ org.springframework.integration spring-integration-file - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-syslog - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-smb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jdbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jmx - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ws - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-redis - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-webflux - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-sftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-rsocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mqtt - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-event - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-kafka - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-groovy - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-cassandra - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-scripting - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xmpp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-websocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-graphql - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-feed - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jpa - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zeromq - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-http - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ip - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test-support - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-amqp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mail - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-security - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-camel - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xml - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-core - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jms - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mongodb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stream - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stomp - 6.0.0-RC2 + 6.0.1 org.springframework.boot spring-boot-dependencies - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT import pom @@ -353,14 +353,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom @@ -377,7 +377,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index f41c8364e..42295ce31 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 2439cb603..d452bdf39 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index c99972a6d..50cce1dd1 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index b15d2f4b6..9ca1dc1a4 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index a483c9084..1e9e05064 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -150,14 +150,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 51912fba1..2d9605888 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index b62ba2b5d..50684248c 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index d2c223f51..e295b101e 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index f3ddc1373..01ac2b622 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 0e3e307d8..203d08e1f 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index f36e9b7ff..308ae3ed6 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -134,207 +134,207 @@ org.springframework.integration spring-integration-file - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-syslog - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-smb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jdbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jmx - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ws - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-redis - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-webflux - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-sftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-rsocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mqtt - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-event - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-kafka - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-groovy - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-cassandra - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-scripting - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xmpp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-websocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-graphql - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-feed - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jpa - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zeromq - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-http - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ip - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test-support - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-amqp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mail - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-security - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-camel - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xml - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-core - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jms - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mongodb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stream - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stomp - 6.0.0-RC2 + 6.0.1 org.springframework.boot spring-boot-dependencies - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT import pom @@ -355,14 +355,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom @@ -379,7 +379,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 528b3c482..35f9bb204 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -134,207 +134,207 @@ org.springframework.integration spring-integration-file - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-syslog - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-smb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jdbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jmx - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ws - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-redis - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-webflux - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-sftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-rsocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mqtt - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-event - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-kafka - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-groovy - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-cassandra - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-scripting - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xmpp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-websocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-graphql - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-feed - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jpa - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zeromq - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-http - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ip - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test-support - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-amqp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mail - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-security - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-camel - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xml - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-core - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jms - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mongodb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stream - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stomp - 6.0.0-RC2 + 6.0.1 org.springframework.boot spring-boot-dependencies - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT import pom @@ -355,14 +355,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom @@ -379,7 +379,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index ab1ad3572..cde500a0e 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 44aef058e..1681edc54 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 62b980c5d..9d04bc54b 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -122,207 +122,207 @@ org.springframework.integration spring-integration-file - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-syslog - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-smb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jdbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jmx - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ws - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-redis - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-webflux - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-sftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-rsocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mqtt - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-event - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-kafka - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-groovy - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-cassandra - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-scripting - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xmpp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-websocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-graphql - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-feed - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jpa - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zeromq - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-http - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ip - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test-support - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-amqp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mail - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-security - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-camel - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xml - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-core - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jms - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mongodb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stream - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stomp - 6.0.0-RC2 + 6.0.1 org.springframework.boot spring-boot-dependencies - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT import pom @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom @@ -367,7 +367,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index e4c32171e..2b1469789 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 9263bb87d..50d73354d 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 3d4be5de3..c120cedaf 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 64e08a46b..b2de6da51 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index b62ce7b04..1a7aa7457 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -122,207 +122,207 @@ org.springframework.integration spring-integration-file - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-syslog - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-smb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jdbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jmx - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ws - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-redis - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-webflux - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-sftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-rsocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mqtt - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-event - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-kafka - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-groovy - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-cassandra - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-scripting - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xmpp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-websocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-graphql - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-feed - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jpa - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zeromq - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-http - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ip - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test-support - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-amqp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mail - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-security - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-camel - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xml - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-core - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jms - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mongodb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stream - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stomp - 6.0.0-RC2 + 6.0.1 org.springframework.boot spring-boot-dependencies - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT import pom @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom @@ -367,7 +367,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 6bab7840b..3ecb4e044 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 95f461b07..9219bcdfc 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -122,207 +122,207 @@ org.springframework.integration spring-integration-file - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-syslog - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-smb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jdbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jmx - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ws - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-redis - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-webflux - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-sftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-rsocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mqtt - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-event - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-kafka - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-groovy - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-cassandra - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-scripting - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xmpp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-websocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-graphql - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-feed - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jpa - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zeromq - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-http - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ip - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test-support - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-amqp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mail - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-security - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-camel - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xml - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-core - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jms - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mongodb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stream - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stomp - 6.0.0-RC2 + 6.0.1 org.springframework.boot spring-boot-dependencies - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT import pom @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom @@ -367,7 +367,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 815cb4239..ff58e1c76 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -141,14 +141,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 6f59c09eb..1d8059d0f 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -127,14 +127,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 86d6462cb..348b2cc56 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -117,207 +117,207 @@ org.springframework.integration spring-integration-file - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-syslog - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-smb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jdbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jmx - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ws - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-redis - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-webflux - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-sftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-rsocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mqtt - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-event - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-kafka - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-groovy - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-cassandra - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-scripting - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xmpp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-websocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-graphql - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-feed - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jpa - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zeromq - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-http - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ip - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test-support - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-amqp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mail - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-security - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-camel - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xml - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-core - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jms - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mongodb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stream - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stomp - 6.0.0-RC2 + 6.0.1 org.springframework.boot spring-boot-dependencies - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT import pom @@ -338,14 +338,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom @@ -362,7 +362,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 97dcdca9c..351b6fc42 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -168,14 +168,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 7b978cd14..76c90e233 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 43b238925..307b2c72e 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index c460752e2..be1f83183 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/build.gradle b/build.gradle index 276d7a94a..dcbcb6b8b 100644 --- a/build.gradle +++ b/build.gradle @@ -259,13 +259,13 @@ subprojects { subproject -> oracleDriverVersion = '19.3.0.0' postgresVersion = '42.5.0' slf4jVersion = '1.7.30' - springCloudVersion = '2022.0.0-RC2' - springIntegrationVersion = '6.0.0' + springCloudVersion = '2022.0.0' + springIntegrationVersion = '6.0.1' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.0.0' - springSecurityVersion = '6.0.0' + springVersion = '6.0.3' + springSecurityVersion = '6.0.1' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.17.6' tilesJspVersion = '2.2.1' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index ec70c3b14..4fe6c30dc 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -128,207 +128,207 @@ org.springframework.integration spring-integration-file - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-syslog - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-smb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jdbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jmx - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ws - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-redis - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-webflux - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-sftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-rsocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mqtt - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-event - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-kafka - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-groovy - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-cassandra - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-scripting - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xmpp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-websocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-graphql - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-feed - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jpa - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zeromq - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-http - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ip - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test-support - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-amqp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mail - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-security - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-camel - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xml - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-core - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jms - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mongodb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stream - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stomp - 6.0.0-RC2 + 6.0.1 org.springframework.boot spring-boot-dependencies - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT import pom @@ -349,14 +349,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom @@ -373,7 +373,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index b14327333..4c65564c5 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -128,207 +128,207 @@ org.springframework.integration spring-integration-file - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-syslog - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-smb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jdbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jmx - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ws - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-redis - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-webflux - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-sftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-rsocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mqtt - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-event - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-kafka - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-groovy - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-cassandra - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-scripting - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xmpp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-websocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-graphql - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-feed - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jpa - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zeromq - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-http - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ip - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test-support - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-amqp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mail - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-security - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-camel - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xml - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-core - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jms - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mongodb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stream - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stomp - 6.0.0-RC2 + 6.0.1 org.springframework.boot spring-boot-dependencies - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT import pom @@ -349,14 +349,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom @@ -373,7 +373,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index ddcc0790a..3a2f63cf7 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -150,207 +150,207 @@ org.springframework.integration spring-integration-file - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-syslog - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-smb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jdbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jmx - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ws - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-redis - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-webflux - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-sftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-rsocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mqtt - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-event - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-kafka - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-groovy - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-cassandra - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-scripting - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xmpp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-websocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-graphql - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-feed - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jpa - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zeromq - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-http - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ip - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test-support - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-amqp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mail - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-security - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-camel - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xml - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-core - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jms - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mongodb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stream - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stomp - 6.0.0-RC2 + 6.0.1 org.springframework.boot spring-boot-dependencies - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT import pom @@ -371,14 +371,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom @@ -395,7 +395,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/gradle.properties b/gradle.properties index 5ad8ef474..b2a9c79e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ version=6.0.0 -springBootVersion=3.0.0-SNAPSHOT +springBootVersion=3.0.1-SNAPSHOT org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8 org.gradle.caching=true org.gradle.parallel=true diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 668700cc0..21bcbbbfd 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index ce768c37b..35c9ad362 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index c2d50d7aa..e6a3772ab 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 7187d9541..ed4601314 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index e4d0446d5..7b8959a9c 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 1b61d5f87..3d50ec937 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 6f56d055b..be92ae997 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 6d1e982aa..469e37e8a 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -95,13 +95,13 @@ org.springframework.security spring-security-web - 6.0.0-RC1 + 6.0.1 compile org.springframework.security spring-security-config - 6.0.0-RC1 + 6.0.1 compile @@ -211,14 +211,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index f8ac4db6f..31ce01167 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index d4de6653e..76016b893 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index a47cd0a1e..4ab9bc431 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 466d3602f..a061ac87d 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 02115495f..75cae85fa 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 520c915fd..184121630 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -60,7 +60,7 @@ org.postgresql postgresql - 42.5.1 + 42.5.0 compile @@ -144,14 +144,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 75ce433ec..3097ee080 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -117,207 +117,207 @@ org.springframework.integration spring-integration-file - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-syslog - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-smb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jdbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jmx - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ws - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-redis - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-webflux - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-sftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-rsocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mqtt - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-event - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-kafka - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-groovy - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-cassandra - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-scripting - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xmpp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-websocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-graphql - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-feed - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jpa - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zeromq - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-http - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ip - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test-support - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-amqp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mail - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-security - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-camel - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xml - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-core - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jms - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mongodb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stream - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stomp - 6.0.0-RC2 + 6.0.1 org.springframework.boot spring-boot-dependencies - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT import pom @@ -338,14 +338,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom @@ -362,7 +362,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 0ab65af33..6e0e615fb 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 95004c4f1..bbf3e1b7f 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -114,7 +114,7 @@ org.testcontainers junit-jupiter - 1.17.5 + 1.17.6 test @@ -144,214 +144,214 @@ org.springframework.integration spring-integration-jdbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ws - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-redis - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-r2dbc - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-rsocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-event - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-cassandra - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-scripting - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-websocket - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-graphql - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jpa - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-http - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zookeeper - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ip - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mail - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-camel - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mongodb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stream - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-stomp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-file - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-syslog - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-smb - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jmx - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-webflux - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-sftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-mqtt - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-ftp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-kafka - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-groovy - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xmpp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-feed - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-zeromq - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-hazelcast - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-test-support - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-amqp - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-security - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-xml - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-core - 6.0.0-RC2 + 6.0.1 org.springframework.integration spring-integration-jms - 6.0.0-RC2 + 6.0.1 org.springframework.cloud spring-cloud-dependencies - 2022.0.0-SNAPSHOT + 2022.0.0 import pom org.springframework.boot spring-boot-dependencies - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT import pom @@ -372,14 +372,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom @@ -396,7 +396,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 4b34add17..c39772c48 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -136,14 +136,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 03bfd713e..cc747cca5 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.0-RC3 + 6.0.3 import pom org.springframework.integration spring-integration-bom - 6.0.0-RC2 + 6.0.1 import pom From 4eef6ee08bf195b6621dd82b675d7b05aa35ee49 Mon Sep 17 00:00:00 2001 From: abilan Date: Tue, 3 Jan 2023 11:55:36 -0500 Subject: [PATCH 309/356] GH-340: Fix logging for WebSocket server side Fixes https://github.com/spring-projects/spring-integration-samples/issues/340 The `LoggingHandler` uses a `org.springframework.integration.handler` category by default. So, the `info` provided for the `loggingChannelAdapter` service activator does not have any effects because `logback.xml` has an `ERROR` for the `org.springframework.integration` category * Use dedicated `wsLog` category in the `LoggingHandler` bean definition to print a server message published to the subscribed web socket clients --- .../samples/websocket/standard/server/Application.java | 1 + 1 file changed, 1 insertion(+) diff --git a/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java b/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java index f5c6e96df..f839cf388 100644 --- a/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java +++ b/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java @@ -128,6 +128,7 @@ public MessageHandler webSocketOutboundAdapter() { @ServiceActivator(inputChannel = "sendTimeChannel") public MessageHandler loggingChannelAdapter() { LoggingHandler loggingHandler = new LoggingHandler("info"); + loggingHandler.setLoggerName("wsLog"); loggingHandler.setLogExpressionString( "'The time ' + payload + ' has been sent to the WebSocketSession ' + headers.simpSessionId"); return loggingHandler; From 5a5043041b37e66ba007414345e692b59628e900 Mon Sep 17 00:00:00 2001 From: abilan Date: Wed, 18 Jan 2023 16:02:55 -0500 Subject: [PATCH 310/356] Upgrade to Spring Integration 6.0.2 * Upgrade other dependencies --- advanced/advanced-testing-examples/pom.xml | 6 +- advanced/dynamic-ftp/pom.xml | 6 +- advanced/dynamic-tcp-client/pom.xml | 90 +++++++++---------- applications/cafe-scripted/pom.xml | 8 +- applications/cafe/cafe-amqp/pom.xml | 6 +- applications/cafe/cafe-jms/pom.xml | 10 +-- applications/cafe/cafe-si/pom.xml | 6 +- applications/file-split-ftp/pom.xml | 90 +++++++++---------- applications/loan-broker/pom.xml | 6 +- applications/loanshark/pom.xml | 10 +-- applications/stomp-chat/pom.xml | 90 +++++++++---------- basic/amqp/pom.xml | 6 +- basic/barrier/pom.xml | 90 +++++++++---------- basic/control-bus/pom.xml | 6 +- basic/enricher/pom.xml | 6 +- basic/feed/pom.xml | 6 +- basic/file/pom.xml | 6 +- basic/ftp/pom.xml | 8 +- basic/helloworld/pom.xml | 6 +- basic/http/pom.xml | 6 +- basic/jdbc/pom.xml | 6 +- basic/jms/pom.xml | 10 +-- basic/jmx/pom.xml | 6 +- basic/jpa/pom.xml | 90 +++++++++---------- basic/kafka/pom.xml | 90 +++++++++---------- basic/mail/pom.xml | 6 +- basic/mongodb/pom.xml | 6 +- basic/mqtt/pom.xml | 90 +++++++++---------- basic/oddeven/pom.xml | 6 +- basic/quote/pom.xml | 6 +- basic/sftp/pom.xml | 8 +- basic/tcp-amqp/pom.xml | 6 +- basic/tcp-broadcast/pom.xml | 90 +++++++++---------- basic/tcp-client-server/pom.xml | 6 +- basic/tcp-with-headers/pom.xml | 90 +++++++++---------- basic/testing-examples/pom.xml | 6 +- basic/twitter/pom.xml | 6 +- basic/web-sockets/pom.xml | 90 +++++++++---------- basic/ws-inbound-gateway/pom.xml | 6 +- basic/ws-outbound-gateway/pom.xml | 6 +- basic/xml/pom.xml | 6 +- basic/xmpp/pom.xml | 6 +- build.gradle | 22 ++--- dsl/cafe-dsl/pom.xml | 90 +++++++++---------- dsl/kafka-dsl/pom.xml | 90 +++++++++---------- dsl/si4demo/pom.xml | 90 +++++++++---------- gradle.properties | 3 +- intermediate/async-gateway/pom.xml | 6 +- intermediate/dynamic-poller/pom.xml | 6 +- intermediate/errorhandling/pom.xml | 6 +- intermediate/file-processing/pom.xml | 6 +- intermediate/mail-attachments/pom.xml | 6 +- intermediate/monitoring/pom.xml | 6 +- intermediate/multipart-http/pom.xml | 6 +- intermediate/rest-http/pom.xml | 6 +- intermediate/retry-and-more/pom.xml | 6 +- .../splitter-aggregator-reaper/pom.xml | 6 +- intermediate/stored-procedures-derby/pom.xml | 6 +- intermediate/stored-procedures-ms/pom.xml | 6 +- intermediate/stored-procedures-oracle/pom.xml | 6 +- .../stored-procedures-postgresql/pom.xml | 8 +- intermediate/tcp-async-bi-directional/pom.xml | 90 +++++++++---------- .../tcp-client-server-multiplex/pom.xml | 6 +- intermediate/testcontainers-rabbitmq/pom.xml | 90 +++++++++---------- intermediate/travel/pom.xml | 6 +- intermediate/tx-synch/pom.xml | 6 +- 66 files changed, 844 insertions(+), 845 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index d9799918b..f130e4138 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -130,21 +130,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 3dec37edf..312fd0539 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -119,21 +119,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index f84cc0f41..83d7071c8 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -117,207 +117,207 @@ org.springframework.integration spring-integration-file - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-syslog - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-smb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jdbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jmx - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ws - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-redis - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-r2dbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-webflux - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-sftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-rsocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mqtt - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-event - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-kafka - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-groovy - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-cassandra - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-scripting - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xmpp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-websocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-graphql - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-feed - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jpa - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zeromq - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-http - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zookeeper - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ip - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-hazelcast - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test-support - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-amqp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mail - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-security - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-camel - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xml - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-core - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jms - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mongodb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stream - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stomp - 6.0.1 + 6.0.2 org.springframework.boot spring-boot-dependencies - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT import pom @@ -331,21 +331,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom @@ -362,7 +362,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index bb4ad6975..692f13b44 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -87,7 +87,7 @@ org.apache.groovy groovy-jsr223 - 4.0.6 + 4.0.7 compile @@ -152,21 +152,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index da6ae14a1..d922076d0 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -125,21 +125,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 44fa50e34..7df4b07ea 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -61,7 +61,7 @@ org.apache.activemq artemis-server - 2.26.0 + 2.27.1 compile @@ -73,7 +73,7 @@ org.apache.activemq artemis-jakarta-client - 2.26.0 + 2.27.1 compile @@ -149,21 +149,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index b0eb211b5..6d4e4b22f 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -124,21 +124,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 3e6ff54ed..960d3b88b 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -144,207 +144,207 @@ org.springframework.integration spring-integration-file - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-syslog - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-smb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jdbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jmx - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ws - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-redis - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-r2dbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-webflux - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-sftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-rsocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mqtt - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-event - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-kafka - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-groovy - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-cassandra - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-scripting - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xmpp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-websocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-graphql - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-feed - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jpa - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zeromq - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-http - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zookeeper - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ip - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-hazelcast - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test-support - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-amqp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mail - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-security - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-camel - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xml - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-core - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jms - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mongodb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stream - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stomp - 6.0.1 + 6.0.2 org.springframework.boot spring-boot-dependencies - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT import pom @@ -358,21 +358,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom @@ -389,7 +389,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 2b8413306..379f55f83 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -119,21 +119,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 7eb01caa6..9ca7371bc 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -80,7 +80,7 @@ org.aspectj aspectjtools - 1.9.9.1 + 1.9.19 compile @@ -167,7 +167,7 @@ org.hibernate.orm hibernate-core - 6.1.5.Final + 6.1.6.Final compile @@ -318,21 +318,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 2a08e5b35..42dc01b32 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -127,207 +127,207 @@ org.springframework.integration spring-integration-file - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-syslog - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-smb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jdbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jmx - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ws - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-redis - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-r2dbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-webflux - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-sftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-rsocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mqtt - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-event - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-kafka - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-groovy - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-cassandra - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-scripting - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xmpp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-websocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-graphql - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-feed - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jpa - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zeromq - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-http - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zookeeper - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ip - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-hazelcast - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test-support - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-amqp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mail - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-security - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-camel - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xml - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-core - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jms - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mongodb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stream - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stomp - 6.0.1 + 6.0.2 org.springframework.boot spring-boot-dependencies - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT import pom @@ -341,21 +341,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom @@ -372,7 +372,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 5b870f1ad..269c2d824 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -130,21 +130,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 753ca17b8..9c310fa52 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -132,207 +132,207 @@ org.springframework.integration spring-integration-file - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-syslog - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-smb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jdbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jmx - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ws - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-redis - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-r2dbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-webflux - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-sftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-rsocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mqtt - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-event - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-kafka - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-groovy - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-cassandra - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-scripting - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xmpp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-websocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-graphql - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-feed - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jpa - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zeromq - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-http - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zookeeper - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ip - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-hazelcast - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test-support - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-amqp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mail - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-security - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-camel - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xml - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-core - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jms - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mongodb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stream - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stomp - 6.0.1 + 6.0.2 org.springframework.boot spring-boot-dependencies - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT import pom @@ -346,21 +346,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom @@ -377,7 +377,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 42295ce31..9dbf74178 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -119,21 +119,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index d452bdf39..75ac7512f 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -125,21 +125,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 50cce1dd1..ce35a494f 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -119,21 +119,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 9ca1dc1a4..4b7b41815 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -119,21 +119,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 1e9e05064..62dd49a40 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -66,7 +66,7 @@ org.apache.ftpserver ftpserver-core - 1.1.2 + 1.2.0 compile @@ -143,21 +143,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 2d9605888..13b14cb49 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -119,21 +119,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 50684248c..3c3778421 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -179,21 +179,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index e295b101e..39ea83c33 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -125,21 +125,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 01ac2b622..dd9f7fb97 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -71,7 +71,7 @@ org.apache.activemq artemis-server - 2.26.0 + 2.27.1 compile @@ -83,7 +83,7 @@ org.apache.activemq artemis-jakarta-client - 2.26.0 + 2.27.1 compile @@ -148,21 +148,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 203d08e1f..995751682 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -124,21 +124,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 308ae3ed6..3e8f0592a 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -134,207 +134,207 @@ org.springframework.integration spring-integration-file - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-syslog - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-smb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jdbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jmx - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ws - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-redis - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-r2dbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-webflux - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-sftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-rsocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mqtt - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-event - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-kafka - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-groovy - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-cassandra - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-scripting - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xmpp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-websocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-graphql - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-feed - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jpa - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zeromq - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-http - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zookeeper - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ip - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-hazelcast - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test-support - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-amqp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mail - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-security - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-camel - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xml - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-core - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jms - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mongodb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stream - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stomp - 6.0.1 + 6.0.2 org.springframework.boot spring-boot-dependencies - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT import pom @@ -348,21 +348,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom @@ -379,7 +379,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 35f9bb204..253377def 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -134,207 +134,207 @@ org.springframework.integration spring-integration-file - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-syslog - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-smb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jdbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jmx - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ws - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-redis - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-r2dbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-webflux - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-sftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-rsocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mqtt - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-event - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-kafka - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-groovy - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-cassandra - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-scripting - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xmpp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-websocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-graphql - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-feed - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jpa - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zeromq - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-http - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zookeeper - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ip - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-hazelcast - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test-support - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-amqp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mail - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-security - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-camel - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xml - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-core - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jms - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mongodb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stream - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stomp - 6.0.1 + 6.0.2 org.springframework.boot spring-boot-dependencies - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT import pom @@ -348,21 +348,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom @@ -379,7 +379,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index cde500a0e..32d4051cd 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -130,21 +130,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 1681edc54..26c7666a0 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -125,21 +125,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 9d04bc54b..1d893083f 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -122,207 +122,207 @@ org.springframework.integration spring-integration-file - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-syslog - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-smb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jdbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jmx - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ws - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-redis - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-r2dbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-webflux - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-sftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-rsocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mqtt - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-event - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-kafka - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-groovy - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-cassandra - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-scripting - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xmpp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-websocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-graphql - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-feed - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jpa - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zeromq - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-http - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zookeeper - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ip - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-hazelcast - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test-support - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-amqp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mail - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-security - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-camel - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xml - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-core - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jms - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mongodb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stream - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stomp - 6.0.1 + 6.0.2 org.springframework.boot spring-boot-dependencies - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT import pom @@ -336,21 +336,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom @@ -367,7 +367,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 2b1469789..6b779c346 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -119,21 +119,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 50d73354d..5c7111c2d 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -119,21 +119,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index c120cedaf..9496ab1d6 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -94,7 +94,7 @@ org.apache.sshd sshd-sftp - 2.9.1 + 2.9.2 test @@ -125,21 +125,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index b2de6da51..ed6a07e38 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -136,21 +136,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 1a7aa7457..888d800b6 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -122,207 +122,207 @@ org.springframework.integration spring-integration-file - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-syslog - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-smb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jdbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jmx - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ws - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-redis - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-r2dbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-webflux - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-sftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-rsocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mqtt - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-event - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-kafka - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-groovy - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-cassandra - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-scripting - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xmpp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-websocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-graphql - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-feed - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jpa - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zeromq - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-http - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zookeeper - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ip - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-hazelcast - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test-support - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-amqp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mail - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-security - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-camel - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xml - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-core - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jms - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mongodb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stream - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stomp - 6.0.1 + 6.0.2 org.springframework.boot spring-boot-dependencies - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT import pom @@ -336,21 +336,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom @@ -367,7 +367,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 3ecb4e044..68fc16b3b 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -130,21 +130,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 9219bcdfc..32dfac7e8 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -122,207 +122,207 @@ org.springframework.integration spring-integration-file - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-syslog - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-smb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jdbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jmx - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ws - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-redis - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-r2dbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-webflux - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-sftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-rsocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mqtt - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-event - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-kafka - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-groovy - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-cassandra - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-scripting - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xmpp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-websocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-graphql - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-feed - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jpa - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zeromq - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-http - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zookeeper - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ip - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-hazelcast - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test-support - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-amqp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mail - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-security - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-camel - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xml - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-core - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jms - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mongodb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stream - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stomp - 6.0.1 + 6.0.2 org.springframework.boot spring-boot-dependencies - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT import pom @@ -336,21 +336,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom @@ -367,7 +367,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index ff58e1c76..858a25235 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -134,21 +134,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 1d8059d0f..3c1f69ab7 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -120,21 +120,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 348b2cc56..3940f1c05 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -117,207 +117,207 @@ org.springframework.integration spring-integration-file - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-syslog - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-smb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jdbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jmx - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ws - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-redis - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-r2dbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-webflux - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-sftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-rsocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mqtt - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-event - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-kafka - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-groovy - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-cassandra - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-scripting - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xmpp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-websocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-graphql - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-feed - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jpa - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zeromq - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-http - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zookeeper - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ip - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-hazelcast - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test-support - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-amqp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mail - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-security - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-camel - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xml - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-core - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jms - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mongodb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stream - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stomp - 6.0.1 + 6.0.2 org.springframework.boot spring-boot-dependencies - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT import pom @@ -331,21 +331,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom @@ -362,7 +362,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 351b6fc42..cb936e9b7 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -161,21 +161,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 76c90e233..a1482476f 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -124,21 +124,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 307b2c72e..37343e47b 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -119,21 +119,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index be1f83183..258155850 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -119,21 +119,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/build.gradle b/build.gradle index dcbcb6b8b..6ea82f32c 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url 'https://repo.spring.io/snapshot' } } dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE' + classpath 'io.spring.gradle:dependency-management-plugin:1.1.0' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" classpath 'gradle.plugin.org.gretty:gretty:2.3.1' } @@ -220,9 +220,9 @@ subprojects { subproject -> } ext { - apacheSshdVersion = '2.9.1' - artemisVersion = '2.26.0' - aspectjVersion = '1.9.9.1' + apacheSshdVersion = '2.9.2' + artemisVersion = '2.27.1' + aspectjVersion = '1.9.19' commonsDigesterVersion = '2.1' commonsDbcpVersion = '2.9.0' commonsFileUploadVersion = '1.4' @@ -232,14 +232,14 @@ subprojects { subproject -> c3p0Version = '0.9.5.5' derbyVersion = '10.16.1.1' hamcrestVersion = '2.2' - hibernateVersion = '6.1.5.Final' + hibernateVersion = '6.1.6.Final' hibernateValidatorVersion = '8.0.0.Final' - ftpServerVersion = '1.1.2' + ftpServerVersion = '1.2.0' flexjsonVersion = '2.0' - groovyVersion = '4.0.6' + groovyVersion = '4.0.7' hsqldbVersion = '2.7.1' h2Version = '2.1.214' - jacksonVersion = '2.13.4' + jacksonVersion = '2.14.1' mailVersion = '2.0.1' jaxbVersion = '2.3.3' jodaTimeVersion = '1.6' @@ -257,14 +257,14 @@ subprojects { subproject -> mongoDriverVersion = '4.7.2' openJpaVersion = '2.4.0' oracleDriverVersion = '19.3.0.0' - postgresVersion = '42.5.0' + postgresVersion = '42.5.1' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.0' - springIntegrationVersion = '6.0.1' + springIntegrationVersion = '6.0.2' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.0.3' + springVersion = '6.0.4' springSecurityVersion = '6.0.1' springWebFlowVersion = '2.3.3.RELEASE' testcontainersVersion = '1.17.6' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 4fe6c30dc..435f51777 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -128,207 +128,207 @@ org.springframework.integration spring-integration-file - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-syslog - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-smb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jdbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jmx - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ws - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-redis - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-r2dbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-webflux - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-sftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-rsocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mqtt - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-event - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-kafka - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-groovy - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-cassandra - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-scripting - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xmpp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-websocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-graphql - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-feed - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jpa - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zeromq - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-http - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zookeeper - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ip - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-hazelcast - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test-support - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-amqp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mail - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-security - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-camel - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xml - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-core - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jms - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mongodb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stream - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stomp - 6.0.1 + 6.0.2 org.springframework.boot spring-boot-dependencies - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT import pom @@ -342,21 +342,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom @@ -373,7 +373,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 4c65564c5..946ce6d03 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -128,207 +128,207 @@ org.springframework.integration spring-integration-file - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-syslog - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-smb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jdbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jmx - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ws - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-redis - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-r2dbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-webflux - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-sftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-rsocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mqtt - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-event - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-kafka - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-groovy - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-cassandra - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-scripting - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xmpp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-websocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-graphql - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-feed - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jpa - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zeromq - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-http - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zookeeper - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ip - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-hazelcast - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test-support - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-amqp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mail - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-security - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-camel - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xml - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-core - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jms - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mongodb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stream - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stomp - 6.0.1 + 6.0.2 org.springframework.boot spring-boot-dependencies - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT import pom @@ -342,21 +342,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom @@ -373,7 +373,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 3a2f63cf7..27726b89b 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -150,207 +150,207 @@ org.springframework.integration spring-integration-file - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-syslog - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-smb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jdbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jmx - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ws - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-redis - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-r2dbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-webflux - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-sftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-rsocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mqtt - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-event - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-kafka - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-groovy - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-cassandra - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-scripting - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xmpp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-websocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-graphql - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-feed - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jpa - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zeromq - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-http - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zookeeper - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ip - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-hazelcast - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test-support - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-amqp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mail - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-security - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-camel - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xml - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-core - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jms - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mongodb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stream - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stomp - 6.0.1 + 6.0.2 org.springframework.boot spring-boot-dependencies - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT import pom @@ -364,21 +364,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom @@ -395,7 +395,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT diff --git a/gradle.properties b/gradle.properties index b2a9c79e6..94c93f2d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,5 @@ version=6.0.0 -springBootVersion=3.0.1-SNAPSHOT +springBootVersion=3.0.2-SNAPSHOT org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8 org.gradle.caching=true org.gradle.parallel=true - diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 21bcbbbfd..f178d079c 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -119,21 +119,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 35c9ad362..423c5c2fe 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -119,21 +119,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index e6a3772ab..6d7465f01 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -119,21 +119,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index ed4601314..46a4798c6 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -119,21 +119,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 7b8959a9c..cdc7f9d73 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -136,21 +136,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 3d50ec937..a6a4ddc4e 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -173,21 +173,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index be92ae997..4b4d75de8 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -173,21 +173,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 469e37e8a..9771d13ec 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -204,21 +204,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 31ce01167..7b9aebeb0 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -152,21 +152,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 76016b893..97c75b2de 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -119,21 +119,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 4ab9bc431..35a7bf873 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -131,21 +131,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index a061ac87d..dec2a70c4 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -131,21 +131,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 75cae85fa..76253d0b7 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -125,21 +125,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 184121630..e4b9c5fdc 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -60,7 +60,7 @@ org.postgresql postgresql - 42.5.0 + 42.5.1 compile @@ -137,21 +137,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 3097ee080..fd3dd69f4 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -117,207 +117,207 @@ org.springframework.integration spring-integration-file - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-syslog - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-smb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jdbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jmx - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ws - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-redis - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-r2dbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-webflux - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-sftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-rsocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mqtt - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-event - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-kafka - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-groovy - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-cassandra - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-scripting - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xmpp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-websocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-graphql - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-feed - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jpa - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zeromq - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-http - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zookeeper - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ip - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-hazelcast - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test-support - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-amqp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mail - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-security - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-camel - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xml - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-core - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jms - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mongodb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stream - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stomp - 6.0.1 + 6.0.2 org.springframework.boot spring-boot-dependencies - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT import pom @@ -331,21 +331,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom @@ -362,7 +362,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 6e0e615fb..82e6dfae1 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -119,21 +119,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index bbf3e1b7f..02a5280cc 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -144,202 +144,202 @@ org.springframework.integration spring-integration-jdbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ws - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-redis - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-r2dbc - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-rsocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-event - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-cassandra - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-scripting - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-websocket - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-graphql - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jpa - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-http - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zookeeper - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ip - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mail - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-camel - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mongodb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stream - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-stomp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-file - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-syslog - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-smb - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jmx - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-webflux - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-sftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-mqtt - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-ftp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-kafka - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-groovy - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xmpp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-feed - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-zeromq - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-hazelcast - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-test-support - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-amqp - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-security - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-xml - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-core - 6.0.1 + 6.0.2 org.springframework.integration spring-integration-jms - 6.0.1 + 6.0.2 org.springframework.cloud @@ -351,7 +351,7 @@ org.springframework.boot spring-boot-dependencies - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT import pom @@ -365,21 +365,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom @@ -396,7 +396,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1-SNAPSHOT + 3.0.2-SNAPSHOT diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index c39772c48..4d8e6a0d1 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -129,21 +129,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index cc747cca5..68f8a05e6 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -130,21 +130,21 @@ com.fasterxml.jackson jackson-bom - 2.13.4 + 2.14.1 import pom org.springframework spring-framework-bom - 6.0.3 + 6.0.4 import pom org.springframework.integration spring-integration-bom - 6.0.1 + 6.0.2 import pom From cf9251633097bca39bd543dbf544bc496b7529cc Mon Sep 17 00:00:00 2001 From: Daniel Hammer Date: Mon, 23 Jan 2023 19:04:29 +0100 Subject: [PATCH 311/356] Add useJUnitPlatform for all modules * Enable Gradle test-support for all samples. * "Fix" for coverage failure org.springframework.integration.samples.barrier.ApplicationTests#contextLoads(); AmqpConnectException: java.net.ConnectException: Connection refused ~ inspired by ".. we generally use a JUnit @Rule to skip the test if the broker's not available." - Gary Russell @see https://stackoverflow.com/a/38747559 * Temporarily disabled Gradle test-support for file-split-ftp & tcp-client-server-multiplex, in-order to allow for successful Gradle check task execution. * Temporarily disabled remaining failing coverage, in-order to support continous integration going forward @see https://github.com/spring-projects/spring-integration-samples/pull/335#discussion_r1072371788 Co-authored-by: Daniel Hammer --- .../samples/barrier/ApplicationTests.java | 2 ++ basic/sftp/README.md | 11 ++++++++++- build.gradle | 12 ++---------- .../tcpclientserver/TcpClientServerDemoTest.java | 3 +++ 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java b/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java index 96ffb330c..9287cffe4 100644 --- a/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java +++ b/basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java @@ -22,6 +22,7 @@ import org.junit.jupiter.api.Test; +import org.springframework.amqp.rabbit.junit.RabbitAvailable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.integration.channel.AbstractMessageChannel; @@ -37,6 +38,7 @@ * @since 4.2 */ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = Application.class) +@RabbitAvailable public class ApplicationTests { @Autowired diff --git a/basic/sftp/README.md b/basic/sftp/README.md index f4d938dfa..f162853ae 100644 --- a/basic/sftp/README.md +++ b/basic/sftp/README.md @@ -1,12 +1,21 @@ SFTP Sample =========== +# Overview This example demonstrates the following aspects of the SFTP support available with Spring Integration: 1. SFTP Inbound Channel Adapter (transfers files from remote to local directory) 2. SFTP Outbound Channel Adapter (transfers files from local to the remote directory) -In order to run this sample for the 'real' SFTP Server you need to: +## How to Run the Sample + +If you imported the example into your IDE, you can just run samples from **org.springframework.integration.samples.sftp**. + +Alternatively, you can execute all the samples from the command line: + +>$ ./gradlew :sftp:check + +## In order to run this sample for the 'real' SFTP Server you need to: 1. generate private/public keys. Below is simple directions what needs to be done 2. update user.properties file with appropriate values diff --git a/build.gradle b/build.gradle index 6ea82f32c..62fb51a41 100644 --- a/build.gradle +++ b/build.gradle @@ -315,6 +315,7 @@ subprojects { subproject -> } test { + useJUnitPlatform() // suppress all console output during testing unless running `gradle -i` logging.captureStandardOutput(LogLevel.INFO) jacoco { @@ -518,6 +519,7 @@ project('barrier') { api 'org.springframework.integration:spring-integration-amqp' api 'org.springframework.integration:spring-integration-http' + testImplementation 'org.springframework.amqp:spring-rabbit-junit' testImplementation 'org.springframework.boot:spring-boot-starter-test' } @@ -997,11 +999,6 @@ project('testcontainers-rabbitmq') { mavenBom "org.springframework.cloud:spring-cloud-dependencies:$springCloudVersion" } } - - test { - useJUnitPlatform() - } - } project('testing-examples') { @@ -1362,11 +1359,6 @@ project('tcp-async-bi-directional') { main 'org.springframework.integration.samples.tcpasyncbi.TcpAsyncBiDirectionalApplication' classpath = sourceSets.main.runtimeClasspath } - - test { - useJUnitPlatform() - } - } project('tcp-client-server-multiplex') { diff --git a/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java b/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java index 8559d0d12..b3d0f52f5 100644 --- a/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java +++ b/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java @@ -24,7 +24,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; + import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -109,6 +111,7 @@ public void testMultiPlex() throws Exception { assertThat(results).hasSize(0); } + @Disabled("AssertionError: Expecting code to raise a throwable.") // TODO @Test public void testTimeoutThrow() { assertThatExceptionOfType(MessagingException.class) From a0f710037cdde8350c0eaea97b2694534bc411ef Mon Sep 17 00:00:00 2001 From: abilan Date: Tue, 24 Jan 2023 13:48:34 -0500 Subject: [PATCH 312/356] Fix TcpClientServerDemoTest.testTimeoutThrow The `IntegrationUtils.wrapInHandlingExceptionIfNecessary()` wraps now any exception if there is no `failedMessage` set --- .../tcpclientserver/TcpClientServerDemoTest.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java b/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java index b3d0f52f5..9213e6c28 100644 --- a/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java +++ b/intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,17 +16,12 @@ package org.springframework.integration.samples.tcpclientserver; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; - import java.util.concurrent.BlockingQueue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; - import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -41,12 +36,15 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + /** * Demonstrates the use of a gateway as an entry point into the integration flow, * with two pairs of collaborating channel adapters (client and server), which * enables multiplexing multiple messages over the same connection. - * + *

* Requires correlation data in the payload. * * @author Gary Russell @@ -111,12 +109,11 @@ public void testMultiPlex() throws Exception { assertThat(results).hasSize(0); } - @Disabled("AssertionError: Expecting code to raise a throwable.") // TODO @Test public void testTimeoutThrow() { assertThatExceptionOfType(MessagingException.class) .isThrownBy(() -> gw.send("TIMEOUT_TEST_THROW")) - .withMessageContaining("No response received for TIMEOUT_TEST"); + .withStackTraceContaining("No response received for TIMEOUT_TEST"); } @Test From 350a0ed09c31aa808a7625336355519363a1c8f8 Mon Sep 17 00:00:00 2001 From: abilan Date: Wed, 25 Jan 2023 10:22:38 -0500 Subject: [PATCH 313/356] Fix reply timeout for TcpClientServerDemoTest --- .../integration/tcpClientServerDemo-conversion-context.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml b/intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml index 251c5920f..26c60efe9 100644 --- a/intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml +++ b/intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml @@ -30,7 +30,7 @@ Date: Thu, 26 Jan 2023 11:10:40 -0500 Subject: [PATCH 314/356] Decrease timeout for TcpClientServerDemoTest --- .../integration/tcpClientServerDemo-conversion-context.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml b/intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml index 26c60efe9..c7cd320b9 100644 --- a/intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml +++ b/intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml @@ -30,7 +30,7 @@ Date: Thu, 26 Jan 2023 11:15:23 -0500 Subject: [PATCH 315/356] Increase sleep for `TIMEOUT_TEST_THROW` --- .../integration/samples/tcpclientserver/EchoService.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/intermediate/tcp-client-server-multiplex/src/main/java/org/springframework/integration/samples/tcpclientserver/EchoService.java b/intermediate/tcp-client-server-multiplex/src/main/java/org/springframework/integration/samples/tcpclientserver/EchoService.java index ad10e3d9c..5fab23381 100644 --- a/intermediate/tcp-client-server-multiplex/src/main/java/org/springframework/integration/samples/tcpclientserver/EchoService.java +++ b/intermediate/tcp-client-server-multiplex/src/main/java/org/springframework/integration/samples/tcpclientserver/EchoService.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.tcpclientserver; import org.springframework.integration.MessageTimeoutException; @@ -22,6 +23,8 @@ * converts it to a String and appends it with ':echo'. * * @author Gary Russell + * @author Artem Bilan + * * @since 2.1 * */ @@ -32,7 +35,7 @@ public String test(String input) throws InterruptedException { throw new RuntimeException("Failure Demonstration"); } else if(input.startsWith("TIMEOUT_TEST")) { - Thread.sleep(3000); + Thread.sleep(50000); } return input + ":echo"; From e9585ccd07849a6ee21714722096eedc5e70d81b Mon Sep 17 00:00:00 2001 From: abilan Date: Thu, 26 Jan 2023 11:36:28 -0500 Subject: [PATCH 316/356] Use `default-reply-timeout="2000"` Make the gateway timeout bigger than `group-timeout="1000"` and smaller than `sleep(5000)` for `TIMEOUT_TEST_THROW` use-case --- .../integration/tcpClientServerDemo-conversion-context.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml b/intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml index c7cd320b9..26c60efe9 100644 --- a/intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml +++ b/intermediate/tcp-client-server-multiplex/src/main/resources/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml @@ -30,7 +30,7 @@ Date: Tue, 31 Jan 2023 10:25:29 -0500 Subject: [PATCH 317/356] Fix Mail dependencies * Upgrade to Spring Boot `3.0.3-SNAPSHOT` * Fix generated packaging for samples with Spring Boot plugin * Regenerate POMs --- advanced/dynamic-tcp-client/pom.xml | 206 +---------------- applications/file-split-ftp/pom.xml | 210 +---------------- applications/stomp-chat/pom.xml | 206 +---------------- basic/barrier/pom.xml | 211 +----------------- basic/http/pom.xml | 4 +- basic/jpa/pom.xml | 206 +---------------- basic/kafka/pom.xml | 206 +---------------- basic/mail/pom.xml | 4 +- basic/mqtt/pom.xml | 206 +---------------- basic/tcp-broadcast/pom.xml | 206 +---------------- basic/tcp-with-headers/pom.xml | 206 +---------------- basic/web-sockets/pom.xml | 206 +---------------- build.gradle | 22 +- dsl/cafe-dsl/pom.xml | 206 +---------------- dsl/kafka-dsl/pom.xml | 206 +---------------- dsl/si4demo/pom.xml | 210 +---------------- gradle.properties | 2 +- intermediate/mail-attachments/pom.xml | 4 +- intermediate/tcp-async-bi-directional/pom.xml | 206 +---------------- intermediate/testcontainers-rabbitmq/pom.xml | 206 +---------------- 20 files changed, 74 insertions(+), 3065 deletions(-) diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 83d7071c8..4a20baadd 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.integration.samples dynamic-tcp-client 6.0.0 - pom + jar https://github.com/spring-projects/spring-integration-samples Spring IO @@ -114,210 +114,10 @@ - - org.springframework.integration - spring-integration-file - 6.0.2 - - - org.springframework.integration - spring-integration-syslog - 6.0.2 - - - org.springframework.integration - spring-integration-smb - 6.0.2 - - - org.springframework.integration - spring-integration-jdbc - 6.0.2 - - - org.springframework.integration - spring-integration-jmx - 6.0.2 - - - org.springframework.integration - spring-integration-ws - 6.0.2 - - - org.springframework.integration - spring-integration-redis - 6.0.2 - - - org.springframework.integration - spring-integration-r2dbc - 6.0.2 - - - org.springframework.integration - spring-integration-webflux - 6.0.2 - - - org.springframework.integration - spring-integration-sftp - 6.0.2 - - - org.springframework.integration - spring-integration-rsocket - 6.0.2 - - - org.springframework.integration - spring-integration-mqtt - 6.0.2 - - - org.springframework.integration - spring-integration-event - 6.0.2 - - - org.springframework.integration - spring-integration-ftp - 6.0.2 - - - org.springframework.integration - spring-integration-kafka - 6.0.2 - - - org.springframework.integration - spring-integration-groovy - 6.0.2 - - - org.springframework.integration - spring-integration-cassandra - 6.0.2 - - - org.springframework.integration - spring-integration-scripting - 6.0.2 - - - org.springframework.integration - spring-integration-xmpp - 6.0.2 - - - org.springframework.integration - spring-integration-websocket - 6.0.2 - - - org.springframework.integration - spring-integration-graphql - 6.0.2 - - - org.springframework.integration - spring-integration-feed - 6.0.2 - - - org.springframework.integration - spring-integration-jpa - 6.0.2 - - - org.springframework.integration - spring-integration-test - 6.0.2 - - - org.springframework.integration - spring-integration-zeromq - 6.0.2 - - - org.springframework.integration - spring-integration-http - 6.0.2 - - - org.springframework.integration - spring-integration-zookeeper - 6.0.2 - - - org.springframework.integration - spring-integration-ip - 6.0.2 - - - org.springframework.integration - spring-integration-hazelcast - 6.0.2 - - - org.springframework.integration - spring-integration-test-support - 6.0.2 - - - org.springframework.integration - spring-integration-amqp - 6.0.2 - - - org.springframework.integration - spring-integration-mail - 6.0.2 - - - org.springframework.integration - spring-integration-security - 6.0.2 - - - org.springframework.integration - spring-integration-camel - 6.0.2 - - - org.springframework.integration - spring-integration-xml - 6.0.2 - - - org.springframework.integration - spring-integration-core - 6.0.2 - - - org.springframework.integration - spring-integration-jms - 6.0.2 - - - org.springframework.integration - spring-integration-mongodb - 6.0.2 - - - org.springframework.integration - spring-integration-stream - 6.0.2 - - - org.springframework.integration - spring-integration-stomp - 6.0.2 - org.springframework.boot spring-boot-dependencies - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT import pom @@ -362,7 +162,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 960d3b88b..2443926d8 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -4,7 +4,7 @@ org.springframework.integration.samples file-split-ftp 6.0.0 - pom + jar https://github.com/spring-projects/spring-integration-samples Spring IO @@ -79,9 +79,9 @@ compile - com.sun.mail + org.eclipse.angus jakarta.mail - 2.0.1 + 1.0.0 compile @@ -141,210 +141,10 @@ - - org.springframework.integration - spring-integration-file - 6.0.2 - - - org.springframework.integration - spring-integration-syslog - 6.0.2 - - - org.springframework.integration - spring-integration-smb - 6.0.2 - - - org.springframework.integration - spring-integration-jdbc - 6.0.2 - - - org.springframework.integration - spring-integration-jmx - 6.0.2 - - - org.springframework.integration - spring-integration-ws - 6.0.2 - - - org.springframework.integration - spring-integration-redis - 6.0.2 - - - org.springframework.integration - spring-integration-r2dbc - 6.0.2 - - - org.springframework.integration - spring-integration-webflux - 6.0.2 - - - org.springframework.integration - spring-integration-sftp - 6.0.2 - - - org.springframework.integration - spring-integration-rsocket - 6.0.2 - - - org.springframework.integration - spring-integration-mqtt - 6.0.2 - - - org.springframework.integration - spring-integration-event - 6.0.2 - - - org.springframework.integration - spring-integration-ftp - 6.0.2 - - - org.springframework.integration - spring-integration-kafka - 6.0.2 - - - org.springframework.integration - spring-integration-groovy - 6.0.2 - - - org.springframework.integration - spring-integration-cassandra - 6.0.2 - - - org.springframework.integration - spring-integration-scripting - 6.0.2 - - - org.springframework.integration - spring-integration-xmpp - 6.0.2 - - - org.springframework.integration - spring-integration-websocket - 6.0.2 - - - org.springframework.integration - spring-integration-graphql - 6.0.2 - - - org.springframework.integration - spring-integration-feed - 6.0.2 - - - org.springframework.integration - spring-integration-jpa - 6.0.2 - - - org.springframework.integration - spring-integration-test - 6.0.2 - - - org.springframework.integration - spring-integration-zeromq - 6.0.2 - - - org.springframework.integration - spring-integration-http - 6.0.2 - - - org.springframework.integration - spring-integration-zookeeper - 6.0.2 - - - org.springframework.integration - spring-integration-ip - 6.0.2 - - - org.springframework.integration - spring-integration-hazelcast - 6.0.2 - - - org.springframework.integration - spring-integration-test-support - 6.0.2 - - - org.springframework.integration - spring-integration-amqp - 6.0.2 - - - org.springframework.integration - spring-integration-mail - 6.0.2 - - - org.springframework.integration - spring-integration-security - 6.0.2 - - - org.springframework.integration - spring-integration-camel - 6.0.2 - - - org.springframework.integration - spring-integration-xml - 6.0.2 - - - org.springframework.integration - spring-integration-core - 6.0.2 - - - org.springframework.integration - spring-integration-jms - 6.0.2 - - - org.springframework.integration - spring-integration-mongodb - 6.0.2 - - - org.springframework.integration - spring-integration-stream - 6.0.2 - - - org.springframework.integration - spring-integration-stomp - 6.0.2 - org.springframework.boot spring-boot-dependencies - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT import pom @@ -389,7 +189,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 42dc01b32..7ec2403c4 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -4,7 +4,7 @@ org.springframework.integration.samples stomp-chat 6.0.0 - pom + jar https://github.com/spring-projects/spring-integration-samples Spring IO @@ -124,210 +124,10 @@ - - org.springframework.integration - spring-integration-file - 6.0.2 - - - org.springframework.integration - spring-integration-syslog - 6.0.2 - - - org.springframework.integration - spring-integration-smb - 6.0.2 - - - org.springframework.integration - spring-integration-jdbc - 6.0.2 - - - org.springframework.integration - spring-integration-jmx - 6.0.2 - - - org.springframework.integration - spring-integration-ws - 6.0.2 - - - org.springframework.integration - spring-integration-redis - 6.0.2 - - - org.springframework.integration - spring-integration-r2dbc - 6.0.2 - - - org.springframework.integration - spring-integration-webflux - 6.0.2 - - - org.springframework.integration - spring-integration-sftp - 6.0.2 - - - org.springframework.integration - spring-integration-rsocket - 6.0.2 - - - org.springframework.integration - spring-integration-mqtt - 6.0.2 - - - org.springframework.integration - spring-integration-event - 6.0.2 - - - org.springframework.integration - spring-integration-ftp - 6.0.2 - - - org.springframework.integration - spring-integration-kafka - 6.0.2 - - - org.springframework.integration - spring-integration-groovy - 6.0.2 - - - org.springframework.integration - spring-integration-cassandra - 6.0.2 - - - org.springframework.integration - spring-integration-scripting - 6.0.2 - - - org.springframework.integration - spring-integration-xmpp - 6.0.2 - - - org.springframework.integration - spring-integration-websocket - 6.0.2 - - - org.springframework.integration - spring-integration-graphql - 6.0.2 - - - org.springframework.integration - spring-integration-feed - 6.0.2 - - - org.springframework.integration - spring-integration-jpa - 6.0.2 - - - org.springframework.integration - spring-integration-test - 6.0.2 - - - org.springframework.integration - spring-integration-zeromq - 6.0.2 - - - org.springframework.integration - spring-integration-http - 6.0.2 - - - org.springframework.integration - spring-integration-zookeeper - 6.0.2 - - - org.springframework.integration - spring-integration-ip - 6.0.2 - - - org.springframework.integration - spring-integration-hazelcast - 6.0.2 - - - org.springframework.integration - spring-integration-test-support - 6.0.2 - - - org.springframework.integration - spring-integration-amqp - 6.0.2 - - - org.springframework.integration - spring-integration-mail - 6.0.2 - - - org.springframework.integration - spring-integration-security - 6.0.2 - - - org.springframework.integration - spring-integration-camel - 6.0.2 - - - org.springframework.integration - spring-integration-xml - 6.0.2 - - - org.springframework.integration - spring-integration-core - 6.0.2 - - - org.springframework.integration - spring-integration-jms - 6.0.2 - - - org.springframework.integration - spring-integration-mongodb - 6.0.2 - - - org.springframework.integration - spring-integration-stream - 6.0.2 - - - org.springframework.integration - spring-integration-stomp - 6.0.2 - org.springframework.boot spring-boot-dependencies - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT import pom @@ -372,7 +172,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 9c310fa52..966b49261 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,7 +4,7 @@ org.springframework.integration.samples barrier 6.0.0 - pom + jar https://github.com/spring-projects/spring-integration-samples Spring IO @@ -106,6 +106,11 @@ spring-integration-test test + + org.springframework.amqp + spring-rabbit-junit + test + org.springframework.boot spring-boot-starter-test @@ -129,210 +134,10 @@ - - org.springframework.integration - spring-integration-file - 6.0.2 - - - org.springframework.integration - spring-integration-syslog - 6.0.2 - - - org.springframework.integration - spring-integration-smb - 6.0.2 - - - org.springframework.integration - spring-integration-jdbc - 6.0.2 - - - org.springframework.integration - spring-integration-jmx - 6.0.2 - - - org.springframework.integration - spring-integration-ws - 6.0.2 - - - org.springframework.integration - spring-integration-redis - 6.0.2 - - - org.springframework.integration - spring-integration-r2dbc - 6.0.2 - - - org.springframework.integration - spring-integration-webflux - 6.0.2 - - - org.springframework.integration - spring-integration-sftp - 6.0.2 - - - org.springframework.integration - spring-integration-rsocket - 6.0.2 - - - org.springframework.integration - spring-integration-mqtt - 6.0.2 - - - org.springframework.integration - spring-integration-event - 6.0.2 - - - org.springframework.integration - spring-integration-ftp - 6.0.2 - - - org.springframework.integration - spring-integration-kafka - 6.0.2 - - - org.springframework.integration - spring-integration-groovy - 6.0.2 - - - org.springframework.integration - spring-integration-cassandra - 6.0.2 - - - org.springframework.integration - spring-integration-scripting - 6.0.2 - - - org.springframework.integration - spring-integration-xmpp - 6.0.2 - - - org.springframework.integration - spring-integration-websocket - 6.0.2 - - - org.springframework.integration - spring-integration-graphql - 6.0.2 - - - org.springframework.integration - spring-integration-feed - 6.0.2 - - - org.springframework.integration - spring-integration-jpa - 6.0.2 - - - org.springframework.integration - spring-integration-test - 6.0.2 - - - org.springframework.integration - spring-integration-zeromq - 6.0.2 - - - org.springframework.integration - spring-integration-http - 6.0.2 - - - org.springframework.integration - spring-integration-zookeeper - 6.0.2 - - - org.springframework.integration - spring-integration-ip - 6.0.2 - - - org.springframework.integration - spring-integration-hazelcast - 6.0.2 - - - org.springframework.integration - spring-integration-test-support - 6.0.2 - - - org.springframework.integration - spring-integration-amqp - 6.0.2 - - - org.springframework.integration - spring-integration-mail - 6.0.2 - - - org.springframework.integration - spring-integration-security - 6.0.2 - - - org.springframework.integration - spring-integration-camel - 6.0.2 - - - org.springframework.integration - spring-integration-xml - 6.0.2 - - - org.springframework.integration - spring-integration-core - 6.0.2 - - - org.springframework.integration - spring-integration-jms - 6.0.2 - - - org.springframework.integration - spring-integration-mongodb - 6.0.2 - - - org.springframework.integration - spring-integration-stream - 6.0.2 - - - org.springframework.integration - spring-integration-stomp - 6.0.2 - org.springframework.boot spring-boot-dependencies - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT import pom @@ -377,7 +182,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 3c3778421..2ce846f41 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -80,9 +80,9 @@ compile - com.sun.mail + org.eclipse.angus jakarta.mail - 2.0.1 + 1.0.0 compile diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 3e8f0592a..91137491a 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,7 +4,7 @@ org.springframework.integration.samples jpa 6.0.0 - pom + jar https://github.com/spring-projects/spring-integration-samples Spring IO @@ -131,210 +131,10 @@ - - org.springframework.integration - spring-integration-file - 6.0.2 - - - org.springframework.integration - spring-integration-syslog - 6.0.2 - - - org.springframework.integration - spring-integration-smb - 6.0.2 - - - org.springframework.integration - spring-integration-jdbc - 6.0.2 - - - org.springframework.integration - spring-integration-jmx - 6.0.2 - - - org.springframework.integration - spring-integration-ws - 6.0.2 - - - org.springframework.integration - spring-integration-redis - 6.0.2 - - - org.springframework.integration - spring-integration-r2dbc - 6.0.2 - - - org.springframework.integration - spring-integration-webflux - 6.0.2 - - - org.springframework.integration - spring-integration-sftp - 6.0.2 - - - org.springframework.integration - spring-integration-rsocket - 6.0.2 - - - org.springframework.integration - spring-integration-mqtt - 6.0.2 - - - org.springframework.integration - spring-integration-event - 6.0.2 - - - org.springframework.integration - spring-integration-ftp - 6.0.2 - - - org.springframework.integration - spring-integration-kafka - 6.0.2 - - - org.springframework.integration - spring-integration-groovy - 6.0.2 - - - org.springframework.integration - spring-integration-cassandra - 6.0.2 - - - org.springframework.integration - spring-integration-scripting - 6.0.2 - - - org.springframework.integration - spring-integration-xmpp - 6.0.2 - - - org.springframework.integration - spring-integration-websocket - 6.0.2 - - - org.springframework.integration - spring-integration-graphql - 6.0.2 - - - org.springframework.integration - spring-integration-feed - 6.0.2 - - - org.springframework.integration - spring-integration-jpa - 6.0.2 - - - org.springframework.integration - spring-integration-test - 6.0.2 - - - org.springframework.integration - spring-integration-zeromq - 6.0.2 - - - org.springframework.integration - spring-integration-http - 6.0.2 - - - org.springframework.integration - spring-integration-zookeeper - 6.0.2 - - - org.springframework.integration - spring-integration-ip - 6.0.2 - - - org.springframework.integration - spring-integration-hazelcast - 6.0.2 - - - org.springframework.integration - spring-integration-test-support - 6.0.2 - - - org.springframework.integration - spring-integration-amqp - 6.0.2 - - - org.springframework.integration - spring-integration-mail - 6.0.2 - - - org.springframework.integration - spring-integration-security - 6.0.2 - - - org.springframework.integration - spring-integration-camel - 6.0.2 - - - org.springframework.integration - spring-integration-xml - 6.0.2 - - - org.springframework.integration - spring-integration-core - 6.0.2 - - - org.springframework.integration - spring-integration-jms - 6.0.2 - - - org.springframework.integration - spring-integration-mongodb - 6.0.2 - - - org.springframework.integration - spring-integration-stream - 6.0.2 - - - org.springframework.integration - spring-integration-stomp - 6.0.2 - org.springframework.boot spring-boot-dependencies - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT import pom @@ -379,7 +179,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 253377def..6b7255139 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.integration.samples kafka 6.0.0 - pom + jar https://github.com/spring-projects/spring-integration-samples Spring IO @@ -131,210 +131,10 @@ - - org.springframework.integration - spring-integration-file - 6.0.2 - - - org.springframework.integration - spring-integration-syslog - 6.0.2 - - - org.springframework.integration - spring-integration-smb - 6.0.2 - - - org.springframework.integration - spring-integration-jdbc - 6.0.2 - - - org.springframework.integration - spring-integration-jmx - 6.0.2 - - - org.springframework.integration - spring-integration-ws - 6.0.2 - - - org.springframework.integration - spring-integration-redis - 6.0.2 - - - org.springframework.integration - spring-integration-r2dbc - 6.0.2 - - - org.springframework.integration - spring-integration-webflux - 6.0.2 - - - org.springframework.integration - spring-integration-sftp - 6.0.2 - - - org.springframework.integration - spring-integration-rsocket - 6.0.2 - - - org.springframework.integration - spring-integration-mqtt - 6.0.2 - - - org.springframework.integration - spring-integration-event - 6.0.2 - - - org.springframework.integration - spring-integration-ftp - 6.0.2 - - - org.springframework.integration - spring-integration-kafka - 6.0.2 - - - org.springframework.integration - spring-integration-groovy - 6.0.2 - - - org.springframework.integration - spring-integration-cassandra - 6.0.2 - - - org.springframework.integration - spring-integration-scripting - 6.0.2 - - - org.springframework.integration - spring-integration-xmpp - 6.0.2 - - - org.springframework.integration - spring-integration-websocket - 6.0.2 - - - org.springframework.integration - spring-integration-graphql - 6.0.2 - - - org.springframework.integration - spring-integration-feed - 6.0.2 - - - org.springframework.integration - spring-integration-jpa - 6.0.2 - - - org.springframework.integration - spring-integration-test - 6.0.2 - - - org.springframework.integration - spring-integration-zeromq - 6.0.2 - - - org.springframework.integration - spring-integration-http - 6.0.2 - - - org.springframework.integration - spring-integration-zookeeper - 6.0.2 - - - org.springframework.integration - spring-integration-ip - 6.0.2 - - - org.springframework.integration - spring-integration-hazelcast - 6.0.2 - - - org.springframework.integration - spring-integration-test-support - 6.0.2 - - - org.springframework.integration - spring-integration-amqp - 6.0.2 - - - org.springframework.integration - spring-integration-mail - 6.0.2 - - - org.springframework.integration - spring-integration-security - 6.0.2 - - - org.springframework.integration - spring-integration-camel - 6.0.2 - - - org.springframework.integration - spring-integration-xml - 6.0.2 - - - org.springframework.integration - spring-integration-core - 6.0.2 - - - org.springframework.integration - spring-integration-jms - 6.0.2 - - - org.springframework.integration - spring-integration-mongodb - 6.0.2 - - - org.springframework.integration - spring-integration-stream - 6.0.2 - - - org.springframework.integration - spring-integration-stomp - 6.0.2 - org.springframework.boot spring-boot-dependencies - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT import pom @@ -379,7 +179,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 32d4051cd..89cb2d978 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -63,9 +63,9 @@ compile - com.sun.mail + org.eclipse.angus jakarta.mail - 2.0.1 + 1.0.0 compile diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 1d893083f..ce78731e2 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,7 +4,7 @@ org.springframework.integration.samples mqtt 6.0.0 - pom + jar https://github.com/spring-projects/spring-integration-samples Spring IO @@ -119,210 +119,10 @@ - - org.springframework.integration - spring-integration-file - 6.0.2 - - - org.springframework.integration - spring-integration-syslog - 6.0.2 - - - org.springframework.integration - spring-integration-smb - 6.0.2 - - - org.springframework.integration - spring-integration-jdbc - 6.0.2 - - - org.springframework.integration - spring-integration-jmx - 6.0.2 - - - org.springframework.integration - spring-integration-ws - 6.0.2 - - - org.springframework.integration - spring-integration-redis - 6.0.2 - - - org.springframework.integration - spring-integration-r2dbc - 6.0.2 - - - org.springframework.integration - spring-integration-webflux - 6.0.2 - - - org.springframework.integration - spring-integration-sftp - 6.0.2 - - - org.springframework.integration - spring-integration-rsocket - 6.0.2 - - - org.springframework.integration - spring-integration-mqtt - 6.0.2 - - - org.springframework.integration - spring-integration-event - 6.0.2 - - - org.springframework.integration - spring-integration-ftp - 6.0.2 - - - org.springframework.integration - spring-integration-kafka - 6.0.2 - - - org.springframework.integration - spring-integration-groovy - 6.0.2 - - - org.springframework.integration - spring-integration-cassandra - 6.0.2 - - - org.springframework.integration - spring-integration-scripting - 6.0.2 - - - org.springframework.integration - spring-integration-xmpp - 6.0.2 - - - org.springframework.integration - spring-integration-websocket - 6.0.2 - - - org.springframework.integration - spring-integration-graphql - 6.0.2 - - - org.springframework.integration - spring-integration-feed - 6.0.2 - - - org.springframework.integration - spring-integration-jpa - 6.0.2 - - - org.springframework.integration - spring-integration-test - 6.0.2 - - - org.springframework.integration - spring-integration-zeromq - 6.0.2 - - - org.springframework.integration - spring-integration-http - 6.0.2 - - - org.springframework.integration - spring-integration-zookeeper - 6.0.2 - - - org.springframework.integration - spring-integration-ip - 6.0.2 - - - org.springframework.integration - spring-integration-hazelcast - 6.0.2 - - - org.springframework.integration - spring-integration-test-support - 6.0.2 - - - org.springframework.integration - spring-integration-amqp - 6.0.2 - - - org.springframework.integration - spring-integration-mail - 6.0.2 - - - org.springframework.integration - spring-integration-security - 6.0.2 - - - org.springframework.integration - spring-integration-camel - 6.0.2 - - - org.springframework.integration - spring-integration-xml - 6.0.2 - - - org.springframework.integration - spring-integration-core - 6.0.2 - - - org.springframework.integration - spring-integration-jms - 6.0.2 - - - org.springframework.integration - spring-integration-mongodb - 6.0.2 - - - org.springframework.integration - spring-integration-stream - 6.0.2 - - - org.springframework.integration - spring-integration-stomp - 6.0.2 - org.springframework.boot spring-boot-dependencies - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT import pom @@ -367,7 +167,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 888d800b6..4fe482b84 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -4,7 +4,7 @@ org.springframework.integration.samples tcp-broadcast 6.0.0 - pom + jar https://github.com/spring-projects/spring-integration-samples Spring IO @@ -119,210 +119,10 @@ - - org.springframework.integration - spring-integration-file - 6.0.2 - - - org.springframework.integration - spring-integration-syslog - 6.0.2 - - - org.springframework.integration - spring-integration-smb - 6.0.2 - - - org.springframework.integration - spring-integration-jdbc - 6.0.2 - - - org.springframework.integration - spring-integration-jmx - 6.0.2 - - - org.springframework.integration - spring-integration-ws - 6.0.2 - - - org.springframework.integration - spring-integration-redis - 6.0.2 - - - org.springframework.integration - spring-integration-r2dbc - 6.0.2 - - - org.springframework.integration - spring-integration-webflux - 6.0.2 - - - org.springframework.integration - spring-integration-sftp - 6.0.2 - - - org.springframework.integration - spring-integration-rsocket - 6.0.2 - - - org.springframework.integration - spring-integration-mqtt - 6.0.2 - - - org.springframework.integration - spring-integration-event - 6.0.2 - - - org.springframework.integration - spring-integration-ftp - 6.0.2 - - - org.springframework.integration - spring-integration-kafka - 6.0.2 - - - org.springframework.integration - spring-integration-groovy - 6.0.2 - - - org.springframework.integration - spring-integration-cassandra - 6.0.2 - - - org.springframework.integration - spring-integration-scripting - 6.0.2 - - - org.springframework.integration - spring-integration-xmpp - 6.0.2 - - - org.springframework.integration - spring-integration-websocket - 6.0.2 - - - org.springframework.integration - spring-integration-graphql - 6.0.2 - - - org.springframework.integration - spring-integration-feed - 6.0.2 - - - org.springframework.integration - spring-integration-jpa - 6.0.2 - - - org.springframework.integration - spring-integration-test - 6.0.2 - - - org.springframework.integration - spring-integration-zeromq - 6.0.2 - - - org.springframework.integration - spring-integration-http - 6.0.2 - - - org.springframework.integration - spring-integration-zookeeper - 6.0.2 - - - org.springframework.integration - spring-integration-ip - 6.0.2 - - - org.springframework.integration - spring-integration-hazelcast - 6.0.2 - - - org.springframework.integration - spring-integration-test-support - 6.0.2 - - - org.springframework.integration - spring-integration-amqp - 6.0.2 - - - org.springframework.integration - spring-integration-mail - 6.0.2 - - - org.springframework.integration - spring-integration-security - 6.0.2 - - - org.springframework.integration - spring-integration-camel - 6.0.2 - - - org.springframework.integration - spring-integration-xml - 6.0.2 - - - org.springframework.integration - spring-integration-core - 6.0.2 - - - org.springframework.integration - spring-integration-jms - 6.0.2 - - - org.springframework.integration - spring-integration-mongodb - 6.0.2 - - - org.springframework.integration - spring-integration-stream - 6.0.2 - - - org.springframework.integration - spring-integration-stomp - 6.0.2 - org.springframework.boot spring-boot-dependencies - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT import pom @@ -367,7 +167,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 32dfac7e8..b57a5002a 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -4,7 +4,7 @@ org.springframework.integration.samples tcp-with-headers 6.0.0 - pom + jar https://github.com/spring-projects/spring-integration-samples Spring IO @@ -119,210 +119,10 @@ - - org.springframework.integration - spring-integration-file - 6.0.2 - - - org.springframework.integration - spring-integration-syslog - 6.0.2 - - - org.springframework.integration - spring-integration-smb - 6.0.2 - - - org.springframework.integration - spring-integration-jdbc - 6.0.2 - - - org.springframework.integration - spring-integration-jmx - 6.0.2 - - - org.springframework.integration - spring-integration-ws - 6.0.2 - - - org.springframework.integration - spring-integration-redis - 6.0.2 - - - org.springframework.integration - spring-integration-r2dbc - 6.0.2 - - - org.springframework.integration - spring-integration-webflux - 6.0.2 - - - org.springframework.integration - spring-integration-sftp - 6.0.2 - - - org.springframework.integration - spring-integration-rsocket - 6.0.2 - - - org.springframework.integration - spring-integration-mqtt - 6.0.2 - - - org.springframework.integration - spring-integration-event - 6.0.2 - - - org.springframework.integration - spring-integration-ftp - 6.0.2 - - - org.springframework.integration - spring-integration-kafka - 6.0.2 - - - org.springframework.integration - spring-integration-groovy - 6.0.2 - - - org.springframework.integration - spring-integration-cassandra - 6.0.2 - - - org.springframework.integration - spring-integration-scripting - 6.0.2 - - - org.springframework.integration - spring-integration-xmpp - 6.0.2 - - - org.springframework.integration - spring-integration-websocket - 6.0.2 - - - org.springframework.integration - spring-integration-graphql - 6.0.2 - - - org.springframework.integration - spring-integration-feed - 6.0.2 - - - org.springframework.integration - spring-integration-jpa - 6.0.2 - - - org.springframework.integration - spring-integration-test - 6.0.2 - - - org.springframework.integration - spring-integration-zeromq - 6.0.2 - - - org.springframework.integration - spring-integration-http - 6.0.2 - - - org.springframework.integration - spring-integration-zookeeper - 6.0.2 - - - org.springframework.integration - spring-integration-ip - 6.0.2 - - - org.springframework.integration - spring-integration-hazelcast - 6.0.2 - - - org.springframework.integration - spring-integration-test-support - 6.0.2 - - - org.springframework.integration - spring-integration-amqp - 6.0.2 - - - org.springframework.integration - spring-integration-mail - 6.0.2 - - - org.springframework.integration - spring-integration-security - 6.0.2 - - - org.springframework.integration - spring-integration-camel - 6.0.2 - - - org.springframework.integration - spring-integration-xml - 6.0.2 - - - org.springframework.integration - spring-integration-core - 6.0.2 - - - org.springframework.integration - spring-integration-jms - 6.0.2 - - - org.springframework.integration - spring-integration-mongodb - 6.0.2 - - - org.springframework.integration - spring-integration-stream - 6.0.2 - - - org.springframework.integration - spring-integration-stomp - 6.0.2 - org.springframework.boot spring-boot-dependencies - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT import pom @@ -367,7 +167,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 3940f1c05..fd5d2677f 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -4,7 +4,7 @@ org.springframework.integration.samples web-sockets 6.0.0 - pom + jar https://github.com/spring-projects/spring-integration-samples Spring IO @@ -114,210 +114,10 @@ - - org.springframework.integration - spring-integration-file - 6.0.2 - - - org.springframework.integration - spring-integration-syslog - 6.0.2 - - - org.springframework.integration - spring-integration-smb - 6.0.2 - - - org.springframework.integration - spring-integration-jdbc - 6.0.2 - - - org.springframework.integration - spring-integration-jmx - 6.0.2 - - - org.springframework.integration - spring-integration-ws - 6.0.2 - - - org.springframework.integration - spring-integration-redis - 6.0.2 - - - org.springframework.integration - spring-integration-r2dbc - 6.0.2 - - - org.springframework.integration - spring-integration-webflux - 6.0.2 - - - org.springframework.integration - spring-integration-sftp - 6.0.2 - - - org.springframework.integration - spring-integration-rsocket - 6.0.2 - - - org.springframework.integration - spring-integration-mqtt - 6.0.2 - - - org.springframework.integration - spring-integration-event - 6.0.2 - - - org.springframework.integration - spring-integration-ftp - 6.0.2 - - - org.springframework.integration - spring-integration-kafka - 6.0.2 - - - org.springframework.integration - spring-integration-groovy - 6.0.2 - - - org.springframework.integration - spring-integration-cassandra - 6.0.2 - - - org.springframework.integration - spring-integration-scripting - 6.0.2 - - - org.springframework.integration - spring-integration-xmpp - 6.0.2 - - - org.springframework.integration - spring-integration-websocket - 6.0.2 - - - org.springframework.integration - spring-integration-graphql - 6.0.2 - - - org.springframework.integration - spring-integration-feed - 6.0.2 - - - org.springframework.integration - spring-integration-jpa - 6.0.2 - - - org.springframework.integration - spring-integration-test - 6.0.2 - - - org.springframework.integration - spring-integration-zeromq - 6.0.2 - - - org.springframework.integration - spring-integration-http - 6.0.2 - - - org.springframework.integration - spring-integration-zookeeper - 6.0.2 - - - org.springframework.integration - spring-integration-ip - 6.0.2 - - - org.springframework.integration - spring-integration-hazelcast - 6.0.2 - - - org.springframework.integration - spring-integration-test-support - 6.0.2 - - - org.springframework.integration - spring-integration-amqp - 6.0.2 - - - org.springframework.integration - spring-integration-mail - 6.0.2 - - - org.springframework.integration - spring-integration-security - 6.0.2 - - - org.springframework.integration - spring-integration-camel - 6.0.2 - - - org.springframework.integration - spring-integration-xml - 6.0.2 - - - org.springframework.integration - spring-integration-core - 6.0.2 - - - org.springframework.integration - spring-integration-jms - 6.0.2 - - - org.springframework.integration - spring-integration-mongodb - 6.0.2 - - - org.springframework.integration - spring-integration-stream - 6.0.2 - - - org.springframework.integration - spring-integration-stomp - 6.0.2 - org.springframework.boot spring-boot-dependencies - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT import pom @@ -362,7 +162,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT diff --git a/build.gradle b/build.gradle index 62fb51a41..204361822 100644 --- a/build.gradle +++ b/build.gradle @@ -140,6 +140,7 @@ subprojects { subproject -> } } if (subproject.plugins.hasPlugin('org.springframework.boot')) { + asNode().get('packaging').first().value = 'jar' def plugins = asNode().build?.find()?.plugins?.find() if (!plugins) { plugins = asNode().appendNode('build').appendNode('plugins') @@ -149,8 +150,7 @@ subprojects { subproject -> appendNode('groupId', 'org.springframework.boot') appendNode('artifactId', 'spring-boot-maven-plugin') } - } - if (subproject.plugins.hasPlugin('org.springframework.boot')) { + asNode().appendNode('parent').with { appendNode('groupId', 'org.springframework.boot') appendNode('artifactId', 'spring-boot-starter-parent') @@ -240,7 +240,7 @@ subprojects { subproject -> hsqldbVersion = '2.7.1' h2Version = '2.1.214' jacksonVersion = '2.14.1' - mailVersion = '2.0.1' + mailVersion = '1.0.0' jaxbVersion = '2.3.3' jodaTimeVersion = '1.6' jtaVersion = '2.0.0' @@ -630,7 +630,7 @@ project('http') { api 'org.springframework:spring-webmvc' api "commons-fileupload:commons-fileupload:$commonsFileUploadVersion" api "commons-io:commons-io:$commonsIoVersion" - api "com.sun.mail:jakarta.mail:$mailVersion" + api "org.eclipse.angus:jakarta.mail:$mailVersion" api "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -725,7 +725,7 @@ project('si4demo') { api "org.springframework.integration:spring-integration-social-twitter:$springIntegrationSocialTwiterVersion" api 'org.springframework.integration:spring-integration-http' api 'org.springframework.integration:spring-integration-ip' - api "com.sun.mail:jakarta.mail:$mailVersion" + api "org.eclipse.angus:jakarta.mail:$mailVersion" api 'com.rometools:rome:1.18.0' testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -840,7 +840,7 @@ project('mail') { dependencies { api 'org.springframework.integration:spring-integration-mail' api 'org.springframework:spring-context' - api "com.sun.mail:jakarta.mail:$mailVersion" + api "org.eclipse.angus:jakarta.mail:$mailVersion" api "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1141,7 +1141,7 @@ project('mail-attachments') { dependencies { api 'org.springframework.integration:spring-integration-mail' api 'org.springframework.integration:spring-integration-file' - api "com.sun.mail:jakarta.mail:$mailVersion" + api "org.eclipse.angus:jakarta.mail:$mailVersion" api "commons-io:commons-io:$commonsIoVersion" api "org.apache.logging.log4j:log4j-core:$log4jVersion" @@ -1484,11 +1484,15 @@ project('file-split-ftp') { api 'org.springframework.integration:spring-integration-ftp' api 'org.springframework.integration:spring-integration-http' api 'org.springframework.integration:spring-integration-mail' - api "com.sun.mail:jakarta.mail:$mailVersion" + api "org.eclipse.angus:jakarta.mail:$mailVersion" testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.integration:spring-integration-test' - testImplementation "com.icegreen:greenmail:2.0.0-alpha-2" + testImplementation ('com.icegreen:greenmail:2.0.0-alpha-2') { + exclude group: 'com.sun.mail' + exclude group: 'jakarta.activation' + } + } springBoot { diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 435f51777..a84bf96b8 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.integration.samples cafe-dsl 6.0.0 - pom + jar https://github.com/spring-projects/spring-integration-samples Spring IO @@ -125,210 +125,10 @@ - - org.springframework.integration - spring-integration-file - 6.0.2 - - - org.springframework.integration - spring-integration-syslog - 6.0.2 - - - org.springframework.integration - spring-integration-smb - 6.0.2 - - - org.springframework.integration - spring-integration-jdbc - 6.0.2 - - - org.springframework.integration - spring-integration-jmx - 6.0.2 - - - org.springframework.integration - spring-integration-ws - 6.0.2 - - - org.springframework.integration - spring-integration-redis - 6.0.2 - - - org.springframework.integration - spring-integration-r2dbc - 6.0.2 - - - org.springframework.integration - spring-integration-webflux - 6.0.2 - - - org.springframework.integration - spring-integration-sftp - 6.0.2 - - - org.springframework.integration - spring-integration-rsocket - 6.0.2 - - - org.springframework.integration - spring-integration-mqtt - 6.0.2 - - - org.springframework.integration - spring-integration-event - 6.0.2 - - - org.springframework.integration - spring-integration-ftp - 6.0.2 - - - org.springframework.integration - spring-integration-kafka - 6.0.2 - - - org.springframework.integration - spring-integration-groovy - 6.0.2 - - - org.springframework.integration - spring-integration-cassandra - 6.0.2 - - - org.springframework.integration - spring-integration-scripting - 6.0.2 - - - org.springframework.integration - spring-integration-xmpp - 6.0.2 - - - org.springframework.integration - spring-integration-websocket - 6.0.2 - - - org.springframework.integration - spring-integration-graphql - 6.0.2 - - - org.springframework.integration - spring-integration-feed - 6.0.2 - - - org.springframework.integration - spring-integration-jpa - 6.0.2 - - - org.springframework.integration - spring-integration-test - 6.0.2 - - - org.springframework.integration - spring-integration-zeromq - 6.0.2 - - - org.springframework.integration - spring-integration-http - 6.0.2 - - - org.springframework.integration - spring-integration-zookeeper - 6.0.2 - - - org.springframework.integration - spring-integration-ip - 6.0.2 - - - org.springframework.integration - spring-integration-hazelcast - 6.0.2 - - - org.springframework.integration - spring-integration-test-support - 6.0.2 - - - org.springframework.integration - spring-integration-amqp - 6.0.2 - - - org.springframework.integration - spring-integration-mail - 6.0.2 - - - org.springframework.integration - spring-integration-security - 6.0.2 - - - org.springframework.integration - spring-integration-camel - 6.0.2 - - - org.springframework.integration - spring-integration-xml - 6.0.2 - - - org.springframework.integration - spring-integration-core - 6.0.2 - - - org.springframework.integration - spring-integration-jms - 6.0.2 - - - org.springframework.integration - spring-integration-mongodb - 6.0.2 - - - org.springframework.integration - spring-integration-stream - 6.0.2 - - - org.springframework.integration - spring-integration-stomp - 6.0.2 - org.springframework.boot spring-boot-dependencies - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT import pom @@ -373,7 +173,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 946ce6d03..4f5f4c47b 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.integration.samples kafka-dsl 6.0.0 - pom + jar https://github.com/spring-projects/spring-integration-samples Spring IO @@ -125,210 +125,10 @@ - - org.springframework.integration - spring-integration-file - 6.0.2 - - - org.springframework.integration - spring-integration-syslog - 6.0.2 - - - org.springframework.integration - spring-integration-smb - 6.0.2 - - - org.springframework.integration - spring-integration-jdbc - 6.0.2 - - - org.springframework.integration - spring-integration-jmx - 6.0.2 - - - org.springframework.integration - spring-integration-ws - 6.0.2 - - - org.springframework.integration - spring-integration-redis - 6.0.2 - - - org.springframework.integration - spring-integration-r2dbc - 6.0.2 - - - org.springframework.integration - spring-integration-webflux - 6.0.2 - - - org.springframework.integration - spring-integration-sftp - 6.0.2 - - - org.springframework.integration - spring-integration-rsocket - 6.0.2 - - - org.springframework.integration - spring-integration-mqtt - 6.0.2 - - - org.springframework.integration - spring-integration-event - 6.0.2 - - - org.springframework.integration - spring-integration-ftp - 6.0.2 - - - org.springframework.integration - spring-integration-kafka - 6.0.2 - - - org.springframework.integration - spring-integration-groovy - 6.0.2 - - - org.springframework.integration - spring-integration-cassandra - 6.0.2 - - - org.springframework.integration - spring-integration-scripting - 6.0.2 - - - org.springframework.integration - spring-integration-xmpp - 6.0.2 - - - org.springframework.integration - spring-integration-websocket - 6.0.2 - - - org.springframework.integration - spring-integration-graphql - 6.0.2 - - - org.springframework.integration - spring-integration-feed - 6.0.2 - - - org.springframework.integration - spring-integration-jpa - 6.0.2 - - - org.springframework.integration - spring-integration-test - 6.0.2 - - - org.springframework.integration - spring-integration-zeromq - 6.0.2 - - - org.springframework.integration - spring-integration-http - 6.0.2 - - - org.springframework.integration - spring-integration-zookeeper - 6.0.2 - - - org.springframework.integration - spring-integration-ip - 6.0.2 - - - org.springframework.integration - spring-integration-hazelcast - 6.0.2 - - - org.springframework.integration - spring-integration-test-support - 6.0.2 - - - org.springframework.integration - spring-integration-amqp - 6.0.2 - - - org.springframework.integration - spring-integration-mail - 6.0.2 - - - org.springframework.integration - spring-integration-security - 6.0.2 - - - org.springframework.integration - spring-integration-camel - 6.0.2 - - - org.springframework.integration - spring-integration-xml - 6.0.2 - - - org.springframework.integration - spring-integration-core - 6.0.2 - - - org.springframework.integration - spring-integration-jms - 6.0.2 - - - org.springframework.integration - spring-integration-mongodb - 6.0.2 - - - org.springframework.integration - spring-integration-stream - 6.0.2 - - - org.springframework.integration - spring-integration-stomp - 6.0.2 - org.springframework.boot spring-boot-dependencies - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT import pom @@ -373,7 +173,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 27726b89b..0dd52f5ca 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,7 +4,7 @@ org.springframework.integration.samples si4demo 6.0.0 - pom + jar https://github.com/spring-projects/spring-integration-samples Spring IO @@ -85,9 +85,9 @@ compile - com.sun.mail + org.eclipse.angus jakarta.mail - 2.0.1 + 1.0.0 compile @@ -147,210 +147,10 @@ - - org.springframework.integration - spring-integration-file - 6.0.2 - - - org.springframework.integration - spring-integration-syslog - 6.0.2 - - - org.springframework.integration - spring-integration-smb - 6.0.2 - - - org.springframework.integration - spring-integration-jdbc - 6.0.2 - - - org.springframework.integration - spring-integration-jmx - 6.0.2 - - - org.springframework.integration - spring-integration-ws - 6.0.2 - - - org.springframework.integration - spring-integration-redis - 6.0.2 - - - org.springframework.integration - spring-integration-r2dbc - 6.0.2 - - - org.springframework.integration - spring-integration-webflux - 6.0.2 - - - org.springframework.integration - spring-integration-sftp - 6.0.2 - - - org.springframework.integration - spring-integration-rsocket - 6.0.2 - - - org.springframework.integration - spring-integration-mqtt - 6.0.2 - - - org.springframework.integration - spring-integration-event - 6.0.2 - - - org.springframework.integration - spring-integration-ftp - 6.0.2 - - - org.springframework.integration - spring-integration-kafka - 6.0.2 - - - org.springframework.integration - spring-integration-groovy - 6.0.2 - - - org.springframework.integration - spring-integration-cassandra - 6.0.2 - - - org.springframework.integration - spring-integration-scripting - 6.0.2 - - - org.springframework.integration - spring-integration-xmpp - 6.0.2 - - - org.springframework.integration - spring-integration-websocket - 6.0.2 - - - org.springframework.integration - spring-integration-graphql - 6.0.2 - - - org.springframework.integration - spring-integration-feed - 6.0.2 - - - org.springframework.integration - spring-integration-jpa - 6.0.2 - - - org.springframework.integration - spring-integration-test - 6.0.2 - - - org.springframework.integration - spring-integration-zeromq - 6.0.2 - - - org.springframework.integration - spring-integration-http - 6.0.2 - - - org.springframework.integration - spring-integration-zookeeper - 6.0.2 - - - org.springframework.integration - spring-integration-ip - 6.0.2 - - - org.springframework.integration - spring-integration-hazelcast - 6.0.2 - - - org.springframework.integration - spring-integration-test-support - 6.0.2 - - - org.springframework.integration - spring-integration-amqp - 6.0.2 - - - org.springframework.integration - spring-integration-mail - 6.0.2 - - - org.springframework.integration - spring-integration-security - 6.0.2 - - - org.springframework.integration - spring-integration-camel - 6.0.2 - - - org.springframework.integration - spring-integration-xml - 6.0.2 - - - org.springframework.integration - spring-integration-core - 6.0.2 - - - org.springframework.integration - spring-integration-jms - 6.0.2 - - - org.springframework.integration - spring-integration-mongodb - 6.0.2 - - - org.springframework.integration - spring-integration-stream - 6.0.2 - - - org.springframework.integration - spring-integration-stomp - 6.0.2 - org.springframework.boot spring-boot-dependencies - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT import pom @@ -395,7 +195,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT diff --git a/gradle.properties b/gradle.properties index 94c93f2d4..434212ce5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ version=6.0.0 -springBootVersion=3.0.2-SNAPSHOT +springBootVersion=3.0.3-SNAPSHOT org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8 org.gradle.caching=true org.gradle.parallel=true diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index cdc7f9d73..1f5770cff 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -63,9 +63,9 @@ compile - com.sun.mail + org.eclipse.angus jakarta.mail - 2.0.1 + 1.0.0 compile diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index fd3dd69f4..f39af1769 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -4,7 +4,7 @@ org.springframework.integration.samples tcp-async-bi-directional 6.0.0 - pom + jar https://github.com/spring-projects/spring-integration-samples Spring IO @@ -114,210 +114,10 @@ - - org.springframework.integration - spring-integration-file - 6.0.2 - - - org.springframework.integration - spring-integration-syslog - 6.0.2 - - - org.springframework.integration - spring-integration-smb - 6.0.2 - - - org.springframework.integration - spring-integration-jdbc - 6.0.2 - - - org.springframework.integration - spring-integration-jmx - 6.0.2 - - - org.springframework.integration - spring-integration-ws - 6.0.2 - - - org.springframework.integration - spring-integration-redis - 6.0.2 - - - org.springframework.integration - spring-integration-r2dbc - 6.0.2 - - - org.springframework.integration - spring-integration-webflux - 6.0.2 - - - org.springframework.integration - spring-integration-sftp - 6.0.2 - - - org.springframework.integration - spring-integration-rsocket - 6.0.2 - - - org.springframework.integration - spring-integration-mqtt - 6.0.2 - - - org.springframework.integration - spring-integration-event - 6.0.2 - - - org.springframework.integration - spring-integration-ftp - 6.0.2 - - - org.springframework.integration - spring-integration-kafka - 6.0.2 - - - org.springframework.integration - spring-integration-groovy - 6.0.2 - - - org.springframework.integration - spring-integration-cassandra - 6.0.2 - - - org.springframework.integration - spring-integration-scripting - 6.0.2 - - - org.springframework.integration - spring-integration-xmpp - 6.0.2 - - - org.springframework.integration - spring-integration-websocket - 6.0.2 - - - org.springframework.integration - spring-integration-graphql - 6.0.2 - - - org.springframework.integration - spring-integration-feed - 6.0.2 - - - org.springframework.integration - spring-integration-jpa - 6.0.2 - - - org.springframework.integration - spring-integration-test - 6.0.2 - - - org.springframework.integration - spring-integration-zeromq - 6.0.2 - - - org.springframework.integration - spring-integration-http - 6.0.2 - - - org.springframework.integration - spring-integration-zookeeper - 6.0.2 - - - org.springframework.integration - spring-integration-ip - 6.0.2 - - - org.springframework.integration - spring-integration-hazelcast - 6.0.2 - - - org.springframework.integration - spring-integration-test-support - 6.0.2 - - - org.springframework.integration - spring-integration-amqp - 6.0.2 - - - org.springframework.integration - spring-integration-mail - 6.0.2 - - - org.springframework.integration - spring-integration-security - 6.0.2 - - - org.springframework.integration - spring-integration-camel - 6.0.2 - - - org.springframework.integration - spring-integration-xml - 6.0.2 - - - org.springframework.integration - spring-integration-core - 6.0.2 - - - org.springframework.integration - spring-integration-jms - 6.0.2 - - - org.springframework.integration - spring-integration-mongodb - 6.0.2 - - - org.springframework.integration - spring-integration-stream - 6.0.2 - - - org.springframework.integration - spring-integration-stomp - 6.0.2 - org.springframework.boot spring-boot-dependencies - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT import pom @@ -362,7 +162,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 02a5280cc..25938aa88 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -4,7 +4,7 @@ org.springframework.integration.samples testcontainers-rabbitmq 6.0.0 - pom + jar https://github.com/spring-projects/spring-integration-samples Spring IO @@ -141,206 +141,6 @@ - - org.springframework.integration - spring-integration-jdbc - 6.0.2 - - - org.springframework.integration - spring-integration-ws - 6.0.2 - - - org.springframework.integration - spring-integration-redis - 6.0.2 - - - org.springframework.integration - spring-integration-r2dbc - 6.0.2 - - - org.springframework.integration - spring-integration-rsocket - 6.0.2 - - - org.springframework.integration - spring-integration-event - 6.0.2 - - - org.springframework.integration - spring-integration-cassandra - 6.0.2 - - - org.springframework.integration - spring-integration-scripting - 6.0.2 - - - org.springframework.integration - spring-integration-websocket - 6.0.2 - - - org.springframework.integration - spring-integration-graphql - 6.0.2 - - - org.springframework.integration - spring-integration-jpa - 6.0.2 - - - org.springframework.integration - spring-integration-test - 6.0.2 - - - org.springframework.integration - spring-integration-http - 6.0.2 - - - org.springframework.integration - spring-integration-zookeeper - 6.0.2 - - - org.springframework.integration - spring-integration-ip - 6.0.2 - - - org.springframework.integration - spring-integration-mail - 6.0.2 - - - org.springframework.integration - spring-integration-camel - 6.0.2 - - - org.springframework.integration - spring-integration-mongodb - 6.0.2 - - - org.springframework.integration - spring-integration-stream - 6.0.2 - - - org.springframework.integration - spring-integration-stomp - 6.0.2 - - - org.springframework.integration - spring-integration-file - 6.0.2 - - - org.springframework.integration - spring-integration-syslog - 6.0.2 - - - org.springframework.integration - spring-integration-smb - 6.0.2 - - - org.springframework.integration - spring-integration-jmx - 6.0.2 - - - org.springframework.integration - spring-integration-webflux - 6.0.2 - - - org.springframework.integration - spring-integration-sftp - 6.0.2 - - - org.springframework.integration - spring-integration-mqtt - 6.0.2 - - - org.springframework.integration - spring-integration-ftp - 6.0.2 - - - org.springframework.integration - spring-integration-kafka - 6.0.2 - - - org.springframework.integration - spring-integration-groovy - 6.0.2 - - - org.springframework.integration - spring-integration-xmpp - 6.0.2 - - - org.springframework.integration - spring-integration-feed - 6.0.2 - - - org.springframework.integration - spring-integration-zeromq - 6.0.2 - - - org.springframework.integration - spring-integration-hazelcast - 6.0.2 - - - org.springframework.integration - spring-integration-test-support - 6.0.2 - - - org.springframework.integration - spring-integration-amqp - 6.0.2 - - - org.springframework.integration - spring-integration-security - 6.0.2 - - - org.springframework.integration - spring-integration-xml - 6.0.2 - - - org.springframework.integration - spring-integration-core - 6.0.2 - - - org.springframework.integration - spring-integration-jms - 6.0.2 - org.springframework.cloud spring-cloud-dependencies @@ -351,7 +151,7 @@ org.springframework.boot spring-boot-dependencies - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT import pom @@ -396,7 +196,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.2-SNAPSHOT + 3.0.3-SNAPSHOT From be9eef5b4fc43906de67be9efffef0490edad330 Mon Sep 17 00:00:00 2001 From: abilan Date: Tue, 21 Feb 2023 15:04:55 -0500 Subject: [PATCH 318/356] Upgrade to SI-6.0.3 --- advanced/advanced-testing-examples/pom.xml | 12 +- advanced/dynamic-ftp/pom.xml | 10 +- advanced/dynamic-tcp-client/pom.xml | 210 ++++++++++++++++- applications/cafe-scripted/pom.xml | 12 +- applications/cafe/cafe-amqp/pom.xml | 10 +- applications/cafe/cafe-jms/pom.xml | 12 +- applications/cafe/cafe-si/pom.xml | 10 +- applications/file-split-ftp/pom.xml | 210 ++++++++++++++++- applications/loan-broker/pom.xml | 10 +- applications/loanshark/pom.xml | 14 +- applications/stomp-chat/pom.xml | 210 ++++++++++++++++- basic/amqp/pom.xml | 10 +- basic/barrier/pom.xml | 210 ++++++++++++++++- basic/control-bus/pom.xml | 10 +- basic/enricher/pom.xml | 10 +- basic/feed/pom.xml | 10 +- basic/file/pom.xml | 10 +- basic/ftp/pom.xml | 10 +- basic/helloworld/pom.xml | 10 +- basic/http/pom.xml | 10 +- basic/jdbc/pom.xml | 10 +- basic/jms/pom.xml | 12 +- basic/jmx/pom.xml | 10 +- basic/jpa/pom.xml | 210 ++++++++++++++++- basic/kafka/pom.xml | 210 ++++++++++++++++- basic/mail/pom.xml | 10 +- basic/mongodb/pom.xml | 12 +- basic/mqtt/pom.xml | 210 ++++++++++++++++- basic/oddeven/pom.xml | 10 +- basic/quote/pom.xml | 10 +- basic/sftp/pom.xml | 10 +- basic/tcp-amqp/pom.xml | 10 +- basic/tcp-broadcast/pom.xml | 210 ++++++++++++++++- basic/tcp-client-server/pom.xml | 10 +- basic/tcp-with-headers/pom.xml | 210 ++++++++++++++++- basic/testing-examples/pom.xml | 10 +- basic/twitter/pom.xml | 10 +- basic/web-sockets/pom.xml | 210 ++++++++++++++++- basic/ws-inbound-gateway/pom.xml | 10 +- basic/ws-outbound-gateway/pom.xml | 10 +- basic/xml/pom.xml | 10 +- basic/xmpp/pom.xml | 10 +- build.gradle | 30 +-- dsl/cafe-dsl/pom.xml | 210 ++++++++++++++++- dsl/kafka-dsl/pom.xml | 210 ++++++++++++++++- dsl/si4demo/pom.xml | 210 ++++++++++++++++- intermediate/async-gateway/pom.xml | 10 +- intermediate/dynamic-poller/pom.xml | 10 +- intermediate/errorhandling/pom.xml | 10 +- intermediate/file-processing/pom.xml | 10 +- intermediate/mail-attachments/pom.xml | 10 +- intermediate/monitoring/pom.xml | 10 +- intermediate/multipart-http/pom.xml | 10 +- intermediate/rest-http/pom.xml | 16 +- .../samples/rest/domain/Employee.java | 14 +- .../samples/rest/domain/EmployeeList.java | 16 +- .../samples/rest/RestHttpClientTest.java | 40 ++-- intermediate/retry-and-more/pom.xml | 12 +- .../splitter-aggregator-reaper/pom.xml | 10 +- intermediate/stored-procedures-derby/pom.xml | 10 +- intermediate/stored-procedures-ms/pom.xml | 10 +- intermediate/stored-procedures-oracle/pom.xml | 10 +- .../stored-procedures-postgresql/pom.xml | 12 +- intermediate/tcp-async-bi-directional/pom.xml | 210 ++++++++++++++++- .../tcp-client-server-multiplex/pom.xml | 10 +- intermediate/testcontainers-rabbitmq/pom.xml | 212 +++++++++++++++++- intermediate/travel/pom.xml | 10 +- intermediate/tx-synch/pom.xml | 10 +- 68 files changed, 3376 insertions(+), 390 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index f130e4138..1312660b8 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -55,7 +55,7 @@ jakarta.jms jakarta.jms-api - 3.0.0 + 3.1.0 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 312fd0539..1958635b7 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 4a20baadd..2ced7638e 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -114,6 +114,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.3 + + + org.springframework.integration + spring-integration-syslog + 6.0.3 + + + org.springframework.integration + spring-integration-smb + 6.0.3 + + + org.springframework.integration + spring-integration-jdbc + 6.0.3 + + + org.springframework.integration + spring-integration-jmx + 6.0.3 + + + org.springframework.integration + spring-integration-ws + 6.0.3 + + + org.springframework.integration + spring-integration-redis + 6.0.3 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.3 + + + org.springframework.integration + spring-integration-webflux + 6.0.3 + + + org.springframework.integration + spring-integration-sftp + 6.0.3 + + + org.springframework.integration + spring-integration-rsocket + 6.0.3 + + + org.springframework.integration + spring-integration-mqtt + 6.0.3 + + + org.springframework.integration + spring-integration-event + 6.0.3 + + + org.springframework.integration + spring-integration-ftp + 6.0.3 + + + org.springframework.integration + spring-integration-kafka + 6.0.3 + + + org.springframework.integration + spring-integration-groovy + 6.0.3 + + + org.springframework.integration + spring-integration-cassandra + 6.0.3 + + + org.springframework.integration + spring-integration-scripting + 6.0.3 + + + org.springframework.integration + spring-integration-xmpp + 6.0.3 + + + org.springframework.integration + spring-integration-websocket + 6.0.3 + + + org.springframework.integration + spring-integration-graphql + 6.0.3 + + + org.springframework.integration + spring-integration-feed + 6.0.3 + + + org.springframework.integration + spring-integration-jpa + 6.0.3 + + + org.springframework.integration + spring-integration-test + 6.0.3 + + + org.springframework.integration + spring-integration-zeromq + 6.0.3 + + + org.springframework.integration + spring-integration-http + 6.0.3 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.3 + + + org.springframework.integration + spring-integration-ip + 6.0.3 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.3 + + + org.springframework.integration + spring-integration-test-support + 6.0.3 + + + org.springframework.integration + spring-integration-amqp + 6.0.3 + + + org.springframework.integration + spring-integration-mail + 6.0.3 + + + org.springframework.integration + spring-integration-security + 6.0.3 + + + org.springframework.integration + spring-integration-camel + 6.0.3 + + + org.springframework.integration + spring-integration-xml + 6.0.3 + + + org.springframework.integration + spring-integration-core + 6.0.3 + + + org.springframework.integration + spring-integration-jms + 6.0.3 + + + org.springframework.integration + spring-integration-mongodb + 6.0.3 + + + org.springframework.integration + spring-integration-stream + 6.0.3 + + + org.springframework.integration + spring-integration-stomp + 6.0.3 + org.springframework.boot spring-boot-dependencies @@ -124,28 +324,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 692f13b44..d6358c0a9 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -87,7 +87,7 @@ org.apache.groovy groovy-jsr223 - 4.0.7 + 4.0.9 compile @@ -111,7 +111,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -145,28 +145,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index d922076d0..481ed384d 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -84,7 +84,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 7df4b07ea..64ab67910 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -84,7 +84,7 @@ jakarta.jms jakarta.jms-api - 3.0.0 + 3.1.0 compile @@ -108,7 +108,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -142,28 +142,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 6d4e4b22f..7f795baa1 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -117,28 +117,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 2443926d8..26c3bfd11 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -99,7 +99,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -141,6 +141,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.3 + + + org.springframework.integration + spring-integration-syslog + 6.0.3 + + + org.springframework.integration + spring-integration-smb + 6.0.3 + + + org.springframework.integration + spring-integration-jdbc + 6.0.3 + + + org.springframework.integration + spring-integration-jmx + 6.0.3 + + + org.springframework.integration + spring-integration-ws + 6.0.3 + + + org.springframework.integration + spring-integration-redis + 6.0.3 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.3 + + + org.springframework.integration + spring-integration-webflux + 6.0.3 + + + org.springframework.integration + spring-integration-sftp + 6.0.3 + + + org.springframework.integration + spring-integration-rsocket + 6.0.3 + + + org.springframework.integration + spring-integration-mqtt + 6.0.3 + + + org.springframework.integration + spring-integration-event + 6.0.3 + + + org.springframework.integration + spring-integration-ftp + 6.0.3 + + + org.springframework.integration + spring-integration-kafka + 6.0.3 + + + org.springframework.integration + spring-integration-groovy + 6.0.3 + + + org.springframework.integration + spring-integration-cassandra + 6.0.3 + + + org.springframework.integration + spring-integration-scripting + 6.0.3 + + + org.springframework.integration + spring-integration-xmpp + 6.0.3 + + + org.springframework.integration + spring-integration-websocket + 6.0.3 + + + org.springframework.integration + spring-integration-graphql + 6.0.3 + + + org.springframework.integration + spring-integration-feed + 6.0.3 + + + org.springframework.integration + spring-integration-jpa + 6.0.3 + + + org.springframework.integration + spring-integration-test + 6.0.3 + + + org.springframework.integration + spring-integration-zeromq + 6.0.3 + + + org.springframework.integration + spring-integration-http + 6.0.3 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.3 + + + org.springframework.integration + spring-integration-ip + 6.0.3 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.3 + + + org.springframework.integration + spring-integration-test-support + 6.0.3 + + + org.springframework.integration + spring-integration-amqp + 6.0.3 + + + org.springframework.integration + spring-integration-mail + 6.0.3 + + + org.springframework.integration + spring-integration-security + 6.0.3 + + + org.springframework.integration + spring-integration-camel + 6.0.3 + + + org.springframework.integration + spring-integration-xml + 6.0.3 + + + org.springframework.integration + spring-integration-core + 6.0.3 + + + org.springframework.integration + spring-integration-jms + 6.0.3 + + + org.springframework.integration + spring-integration-mongodb + 6.0.3 + + + org.springframework.integration + spring-integration-stream + 6.0.3 + + + org.springframework.integration + spring-integration-stomp + 6.0.3 + org.springframework.boot spring-boot-dependencies @@ -151,28 +351,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 379f55f83..0e32712ba 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 9ca7371bc..96030b34d 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -167,13 +167,13 @@ org.hibernate.orm hibernate-core - 6.1.6.Final + 6.1.7.Final compile org.springframework.webflow spring-js - 2.3.3.RELEASE + 2.4.8.RELEASE compile @@ -277,7 +277,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -311,28 +311,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 7ec2403c4..25fed4676 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -88,7 +88,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -124,6 +124,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.3 + + + org.springframework.integration + spring-integration-syslog + 6.0.3 + + + org.springframework.integration + spring-integration-smb + 6.0.3 + + + org.springframework.integration + spring-integration-jdbc + 6.0.3 + + + org.springframework.integration + spring-integration-jmx + 6.0.3 + + + org.springframework.integration + spring-integration-ws + 6.0.3 + + + org.springframework.integration + spring-integration-redis + 6.0.3 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.3 + + + org.springframework.integration + spring-integration-webflux + 6.0.3 + + + org.springframework.integration + spring-integration-sftp + 6.0.3 + + + org.springframework.integration + spring-integration-rsocket + 6.0.3 + + + org.springframework.integration + spring-integration-mqtt + 6.0.3 + + + org.springframework.integration + spring-integration-event + 6.0.3 + + + org.springframework.integration + spring-integration-ftp + 6.0.3 + + + org.springframework.integration + spring-integration-kafka + 6.0.3 + + + org.springframework.integration + spring-integration-groovy + 6.0.3 + + + org.springframework.integration + spring-integration-cassandra + 6.0.3 + + + org.springframework.integration + spring-integration-scripting + 6.0.3 + + + org.springframework.integration + spring-integration-xmpp + 6.0.3 + + + org.springframework.integration + spring-integration-websocket + 6.0.3 + + + org.springframework.integration + spring-integration-graphql + 6.0.3 + + + org.springframework.integration + spring-integration-feed + 6.0.3 + + + org.springframework.integration + spring-integration-jpa + 6.0.3 + + + org.springframework.integration + spring-integration-test + 6.0.3 + + + org.springframework.integration + spring-integration-zeromq + 6.0.3 + + + org.springframework.integration + spring-integration-http + 6.0.3 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.3 + + + org.springframework.integration + spring-integration-ip + 6.0.3 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.3 + + + org.springframework.integration + spring-integration-test-support + 6.0.3 + + + org.springframework.integration + spring-integration-amqp + 6.0.3 + + + org.springframework.integration + spring-integration-mail + 6.0.3 + + + org.springframework.integration + spring-integration-security + 6.0.3 + + + org.springframework.integration + spring-integration-camel + 6.0.3 + + + org.springframework.integration + spring-integration-xml + 6.0.3 + + + org.springframework.integration + spring-integration-core + 6.0.3 + + + org.springframework.integration + spring-integration-jms + 6.0.3 + + + org.springframework.integration + spring-integration-mongodb + 6.0.3 + + + org.springframework.integration + spring-integration-stream + 6.0.3 + + + org.springframework.integration + spring-integration-stomp + 6.0.3 + org.springframework.boot spring-boot-dependencies @@ -134,28 +334,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 269c2d824..02b7c41cb 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 966b49261..d3e11a169 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -93,7 +93,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -134,6 +134,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.3 + + + org.springframework.integration + spring-integration-syslog + 6.0.3 + + + org.springframework.integration + spring-integration-smb + 6.0.3 + + + org.springframework.integration + spring-integration-jdbc + 6.0.3 + + + org.springframework.integration + spring-integration-jmx + 6.0.3 + + + org.springframework.integration + spring-integration-ws + 6.0.3 + + + org.springframework.integration + spring-integration-redis + 6.0.3 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.3 + + + org.springframework.integration + spring-integration-webflux + 6.0.3 + + + org.springframework.integration + spring-integration-sftp + 6.0.3 + + + org.springframework.integration + spring-integration-rsocket + 6.0.3 + + + org.springframework.integration + spring-integration-mqtt + 6.0.3 + + + org.springframework.integration + spring-integration-event + 6.0.3 + + + org.springframework.integration + spring-integration-ftp + 6.0.3 + + + org.springframework.integration + spring-integration-kafka + 6.0.3 + + + org.springframework.integration + spring-integration-groovy + 6.0.3 + + + org.springframework.integration + spring-integration-cassandra + 6.0.3 + + + org.springframework.integration + spring-integration-scripting + 6.0.3 + + + org.springframework.integration + spring-integration-xmpp + 6.0.3 + + + org.springframework.integration + spring-integration-websocket + 6.0.3 + + + org.springframework.integration + spring-integration-graphql + 6.0.3 + + + org.springframework.integration + spring-integration-feed + 6.0.3 + + + org.springframework.integration + spring-integration-jpa + 6.0.3 + + + org.springframework.integration + spring-integration-test + 6.0.3 + + + org.springframework.integration + spring-integration-zeromq + 6.0.3 + + + org.springframework.integration + spring-integration-http + 6.0.3 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.3 + + + org.springframework.integration + spring-integration-ip + 6.0.3 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.3 + + + org.springframework.integration + spring-integration-test-support + 6.0.3 + + + org.springframework.integration + spring-integration-amqp + 6.0.3 + + + org.springframework.integration + spring-integration-mail + 6.0.3 + + + org.springframework.integration + spring-integration-security + 6.0.3 + + + org.springframework.integration + spring-integration-camel + 6.0.3 + + + org.springframework.integration + spring-integration-xml + 6.0.3 + + + org.springframework.integration + spring-integration-core + 6.0.3 + + + org.springframework.integration + spring-integration-jms + 6.0.3 + + + org.springframework.integration + spring-integration-mongodb + 6.0.3 + + + org.springframework.integration + spring-integration-stream + 6.0.3 + + + org.springframework.integration + spring-integration-stomp + 6.0.3 + org.springframework.boot spring-boot-dependencies @@ -144,28 +344,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 9dbf74178..f2fb675b0 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 75ac7512f..f32a557b1 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -84,7 +84,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index ce35a494f..83ec3cf20 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 4b7b41815..a95baec6d 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 62dd49a40..a912d4377 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -96,7 +96,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -136,28 +136,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 13b14cb49..c18474b74 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 2ce846f41..a6581f517 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -138,7 +138,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -172,28 +172,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 39ea83c33..d2bcd2a64 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -84,7 +84,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index dd9f7fb97..be7171c9d 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -55,7 +55,7 @@ jakarta.jms jakarta.jms-api - 3.0.0 + 3.1.0 compile @@ -107,7 +107,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -141,28 +141,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 995751682..a5916f3ce 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -117,28 +117,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 91137491a..2aa91426d 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -95,7 +95,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -131,6 +131,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.3 + + + org.springframework.integration + spring-integration-syslog + 6.0.3 + + + org.springframework.integration + spring-integration-smb + 6.0.3 + + + org.springframework.integration + spring-integration-jdbc + 6.0.3 + + + org.springframework.integration + spring-integration-jmx + 6.0.3 + + + org.springframework.integration + spring-integration-ws + 6.0.3 + + + org.springframework.integration + spring-integration-redis + 6.0.3 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.3 + + + org.springframework.integration + spring-integration-webflux + 6.0.3 + + + org.springframework.integration + spring-integration-sftp + 6.0.3 + + + org.springframework.integration + spring-integration-rsocket + 6.0.3 + + + org.springframework.integration + spring-integration-mqtt + 6.0.3 + + + org.springframework.integration + spring-integration-event + 6.0.3 + + + org.springframework.integration + spring-integration-ftp + 6.0.3 + + + org.springframework.integration + spring-integration-kafka + 6.0.3 + + + org.springframework.integration + spring-integration-groovy + 6.0.3 + + + org.springframework.integration + spring-integration-cassandra + 6.0.3 + + + org.springframework.integration + spring-integration-scripting + 6.0.3 + + + org.springframework.integration + spring-integration-xmpp + 6.0.3 + + + org.springframework.integration + spring-integration-websocket + 6.0.3 + + + org.springframework.integration + spring-integration-graphql + 6.0.3 + + + org.springframework.integration + spring-integration-feed + 6.0.3 + + + org.springframework.integration + spring-integration-jpa + 6.0.3 + + + org.springframework.integration + spring-integration-test + 6.0.3 + + + org.springframework.integration + spring-integration-zeromq + 6.0.3 + + + org.springframework.integration + spring-integration-http + 6.0.3 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.3 + + + org.springframework.integration + spring-integration-ip + 6.0.3 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.3 + + + org.springframework.integration + spring-integration-test-support + 6.0.3 + + + org.springframework.integration + spring-integration-amqp + 6.0.3 + + + org.springframework.integration + spring-integration-mail + 6.0.3 + + + org.springframework.integration + spring-integration-security + 6.0.3 + + + org.springframework.integration + spring-integration-camel + 6.0.3 + + + org.springframework.integration + spring-integration-xml + 6.0.3 + + + org.springframework.integration + spring-integration-core + 6.0.3 + + + org.springframework.integration + spring-integration-jms + 6.0.3 + + + org.springframework.integration + spring-integration-mongodb + 6.0.3 + + + org.springframework.integration + spring-integration-stream + 6.0.3 + + + org.springframework.integration + spring-integration-stomp + 6.0.3 + org.springframework.boot spring-boot-dependencies @@ -141,28 +341,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 6b7255139..d022d4ac8 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -95,7 +95,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -131,6 +131,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.3 + + + org.springframework.integration + spring-integration-syslog + 6.0.3 + + + org.springframework.integration + spring-integration-smb + 6.0.3 + + + org.springframework.integration + spring-integration-jdbc + 6.0.3 + + + org.springframework.integration + spring-integration-jmx + 6.0.3 + + + org.springframework.integration + spring-integration-ws + 6.0.3 + + + org.springframework.integration + spring-integration-redis + 6.0.3 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.3 + + + org.springframework.integration + spring-integration-webflux + 6.0.3 + + + org.springframework.integration + spring-integration-sftp + 6.0.3 + + + org.springframework.integration + spring-integration-rsocket + 6.0.3 + + + org.springframework.integration + spring-integration-mqtt + 6.0.3 + + + org.springframework.integration + spring-integration-event + 6.0.3 + + + org.springframework.integration + spring-integration-ftp + 6.0.3 + + + org.springframework.integration + spring-integration-kafka + 6.0.3 + + + org.springframework.integration + spring-integration-groovy + 6.0.3 + + + org.springframework.integration + spring-integration-cassandra + 6.0.3 + + + org.springframework.integration + spring-integration-scripting + 6.0.3 + + + org.springframework.integration + spring-integration-xmpp + 6.0.3 + + + org.springframework.integration + spring-integration-websocket + 6.0.3 + + + org.springframework.integration + spring-integration-graphql + 6.0.3 + + + org.springframework.integration + spring-integration-feed + 6.0.3 + + + org.springframework.integration + spring-integration-jpa + 6.0.3 + + + org.springframework.integration + spring-integration-test + 6.0.3 + + + org.springframework.integration + spring-integration-zeromq + 6.0.3 + + + org.springframework.integration + spring-integration-http + 6.0.3 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.3 + + + org.springframework.integration + spring-integration-ip + 6.0.3 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.3 + + + org.springframework.integration + spring-integration-test-support + 6.0.3 + + + org.springframework.integration + spring-integration-amqp + 6.0.3 + + + org.springframework.integration + spring-integration-mail + 6.0.3 + + + org.springframework.integration + spring-integration-security + 6.0.3 + + + org.springframework.integration + spring-integration-camel + 6.0.3 + + + org.springframework.integration + spring-integration-xml + 6.0.3 + + + org.springframework.integration + spring-integration-core + 6.0.3 + + + org.springframework.integration + spring-integration-jms + 6.0.3 + + + org.springframework.integration + spring-integration-mongodb + 6.0.3 + + + org.springframework.integration + spring-integration-stream + 6.0.3 + + + org.springframework.integration + spring-integration-stomp + 6.0.3 + org.springframework.boot spring-boot-dependencies @@ -141,28 +341,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 89cb2d978..b6b4f410b 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 26c7666a0..903e5f1e3 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -66,7 +66,7 @@ org.mongodb mongodb-driver-sync - 4.7.2 + 4.8.2 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index ce78731e2..f881324e2 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -119,6 +119,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.3 + + + org.springframework.integration + spring-integration-syslog + 6.0.3 + + + org.springframework.integration + spring-integration-smb + 6.0.3 + + + org.springframework.integration + spring-integration-jdbc + 6.0.3 + + + org.springframework.integration + spring-integration-jmx + 6.0.3 + + + org.springframework.integration + spring-integration-ws + 6.0.3 + + + org.springframework.integration + spring-integration-redis + 6.0.3 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.3 + + + org.springframework.integration + spring-integration-webflux + 6.0.3 + + + org.springframework.integration + spring-integration-sftp + 6.0.3 + + + org.springframework.integration + spring-integration-rsocket + 6.0.3 + + + org.springframework.integration + spring-integration-mqtt + 6.0.3 + + + org.springframework.integration + spring-integration-event + 6.0.3 + + + org.springframework.integration + spring-integration-ftp + 6.0.3 + + + org.springframework.integration + spring-integration-kafka + 6.0.3 + + + org.springframework.integration + spring-integration-groovy + 6.0.3 + + + org.springframework.integration + spring-integration-cassandra + 6.0.3 + + + org.springframework.integration + spring-integration-scripting + 6.0.3 + + + org.springframework.integration + spring-integration-xmpp + 6.0.3 + + + org.springframework.integration + spring-integration-websocket + 6.0.3 + + + org.springframework.integration + spring-integration-graphql + 6.0.3 + + + org.springframework.integration + spring-integration-feed + 6.0.3 + + + org.springframework.integration + spring-integration-jpa + 6.0.3 + + + org.springframework.integration + spring-integration-test + 6.0.3 + + + org.springframework.integration + spring-integration-zeromq + 6.0.3 + + + org.springframework.integration + spring-integration-http + 6.0.3 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.3 + + + org.springframework.integration + spring-integration-ip + 6.0.3 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.3 + + + org.springframework.integration + spring-integration-test-support + 6.0.3 + + + org.springframework.integration + spring-integration-amqp + 6.0.3 + + + org.springframework.integration + spring-integration-mail + 6.0.3 + + + org.springframework.integration + spring-integration-security + 6.0.3 + + + org.springframework.integration + spring-integration-camel + 6.0.3 + + + org.springframework.integration + spring-integration-xml + 6.0.3 + + + org.springframework.integration + spring-integration-core + 6.0.3 + + + org.springframework.integration + spring-integration-jms + 6.0.3 + + + org.springframework.integration + spring-integration-mongodb + 6.0.3 + + + org.springframework.integration + spring-integration-stream + 6.0.3 + + + org.springframework.integration + spring-integration-stomp + 6.0.3 + org.springframework.boot spring-boot-dependencies @@ -129,28 +329,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 6b779c346..fe7e45a8c 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 5c7111c2d..8740889b7 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 9496ab1d6..4a0a44823 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index ed6a07e38..d6329f9dc 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -95,7 +95,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -129,28 +129,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 4fe482b84..33a5f238f 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -119,6 +119,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.3 + + + org.springframework.integration + spring-integration-syslog + 6.0.3 + + + org.springframework.integration + spring-integration-smb + 6.0.3 + + + org.springframework.integration + spring-integration-jdbc + 6.0.3 + + + org.springframework.integration + spring-integration-jmx + 6.0.3 + + + org.springframework.integration + spring-integration-ws + 6.0.3 + + + org.springframework.integration + spring-integration-redis + 6.0.3 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.3 + + + org.springframework.integration + spring-integration-webflux + 6.0.3 + + + org.springframework.integration + spring-integration-sftp + 6.0.3 + + + org.springframework.integration + spring-integration-rsocket + 6.0.3 + + + org.springframework.integration + spring-integration-mqtt + 6.0.3 + + + org.springframework.integration + spring-integration-event + 6.0.3 + + + org.springframework.integration + spring-integration-ftp + 6.0.3 + + + org.springframework.integration + spring-integration-kafka + 6.0.3 + + + org.springframework.integration + spring-integration-groovy + 6.0.3 + + + org.springframework.integration + spring-integration-cassandra + 6.0.3 + + + org.springframework.integration + spring-integration-scripting + 6.0.3 + + + org.springframework.integration + spring-integration-xmpp + 6.0.3 + + + org.springframework.integration + spring-integration-websocket + 6.0.3 + + + org.springframework.integration + spring-integration-graphql + 6.0.3 + + + org.springframework.integration + spring-integration-feed + 6.0.3 + + + org.springframework.integration + spring-integration-jpa + 6.0.3 + + + org.springframework.integration + spring-integration-test + 6.0.3 + + + org.springframework.integration + spring-integration-zeromq + 6.0.3 + + + org.springframework.integration + spring-integration-http + 6.0.3 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.3 + + + org.springframework.integration + spring-integration-ip + 6.0.3 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.3 + + + org.springframework.integration + spring-integration-test-support + 6.0.3 + + + org.springframework.integration + spring-integration-amqp + 6.0.3 + + + org.springframework.integration + spring-integration-mail + 6.0.3 + + + org.springframework.integration + spring-integration-security + 6.0.3 + + + org.springframework.integration + spring-integration-camel + 6.0.3 + + + org.springframework.integration + spring-integration-xml + 6.0.3 + + + org.springframework.integration + spring-integration-core + 6.0.3 + + + org.springframework.integration + spring-integration-jms + 6.0.3 + + + org.springframework.integration + spring-integration-mongodb + 6.0.3 + + + org.springframework.integration + spring-integration-stream + 6.0.3 + + + org.springframework.integration + spring-integration-stomp + 6.0.3 + org.springframework.boot spring-boot-dependencies @@ -129,28 +329,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 68fc16b3b..9f8da5926 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index b57a5002a..20b4e3b94 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -119,6 +119,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.3 + + + org.springframework.integration + spring-integration-syslog + 6.0.3 + + + org.springframework.integration + spring-integration-smb + 6.0.3 + + + org.springframework.integration + spring-integration-jdbc + 6.0.3 + + + org.springframework.integration + spring-integration-jmx + 6.0.3 + + + org.springframework.integration + spring-integration-ws + 6.0.3 + + + org.springframework.integration + spring-integration-redis + 6.0.3 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.3 + + + org.springframework.integration + spring-integration-webflux + 6.0.3 + + + org.springframework.integration + spring-integration-sftp + 6.0.3 + + + org.springframework.integration + spring-integration-rsocket + 6.0.3 + + + org.springframework.integration + spring-integration-mqtt + 6.0.3 + + + org.springframework.integration + spring-integration-event + 6.0.3 + + + org.springframework.integration + spring-integration-ftp + 6.0.3 + + + org.springframework.integration + spring-integration-kafka + 6.0.3 + + + org.springframework.integration + spring-integration-groovy + 6.0.3 + + + org.springframework.integration + spring-integration-cassandra + 6.0.3 + + + org.springframework.integration + spring-integration-scripting + 6.0.3 + + + org.springframework.integration + spring-integration-xmpp + 6.0.3 + + + org.springframework.integration + spring-integration-websocket + 6.0.3 + + + org.springframework.integration + spring-integration-graphql + 6.0.3 + + + org.springframework.integration + spring-integration-feed + 6.0.3 + + + org.springframework.integration + spring-integration-jpa + 6.0.3 + + + org.springframework.integration + spring-integration-test + 6.0.3 + + + org.springframework.integration + spring-integration-zeromq + 6.0.3 + + + org.springframework.integration + spring-integration-http + 6.0.3 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.3 + + + org.springframework.integration + spring-integration-ip + 6.0.3 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.3 + + + org.springframework.integration + spring-integration-test-support + 6.0.3 + + + org.springframework.integration + spring-integration-amqp + 6.0.3 + + + org.springframework.integration + spring-integration-mail + 6.0.3 + + + org.springframework.integration + spring-integration-security + 6.0.3 + + + org.springframework.integration + spring-integration-camel + 6.0.3 + + + org.springframework.integration + spring-integration-xml + 6.0.3 + + + org.springframework.integration + spring-integration-core + 6.0.3 + + + org.springframework.integration + spring-integration-jms + 6.0.3 + + + org.springframework.integration + spring-integration-mongodb + 6.0.3 + + + org.springframework.integration + spring-integration-stream + 6.0.3 + + + org.springframework.integration + spring-integration-stomp + 6.0.3 + org.springframework.boot spring-boot-dependencies @@ -129,28 +329,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 858a25235..1fd2365cd 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -93,7 +93,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -127,28 +127,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 3c1f69ab7..385b19321 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -79,7 +79,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -113,28 +113,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index fd5d2677f..c6ff306d5 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -114,6 +114,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.3 + + + org.springframework.integration + spring-integration-syslog + 6.0.3 + + + org.springframework.integration + spring-integration-smb + 6.0.3 + + + org.springframework.integration + spring-integration-jdbc + 6.0.3 + + + org.springframework.integration + spring-integration-jmx + 6.0.3 + + + org.springframework.integration + spring-integration-ws + 6.0.3 + + + org.springframework.integration + spring-integration-redis + 6.0.3 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.3 + + + org.springframework.integration + spring-integration-webflux + 6.0.3 + + + org.springframework.integration + spring-integration-sftp + 6.0.3 + + + org.springframework.integration + spring-integration-rsocket + 6.0.3 + + + org.springframework.integration + spring-integration-mqtt + 6.0.3 + + + org.springframework.integration + spring-integration-event + 6.0.3 + + + org.springframework.integration + spring-integration-ftp + 6.0.3 + + + org.springframework.integration + spring-integration-kafka + 6.0.3 + + + org.springframework.integration + spring-integration-groovy + 6.0.3 + + + org.springframework.integration + spring-integration-cassandra + 6.0.3 + + + org.springframework.integration + spring-integration-scripting + 6.0.3 + + + org.springframework.integration + spring-integration-xmpp + 6.0.3 + + + org.springframework.integration + spring-integration-websocket + 6.0.3 + + + org.springframework.integration + spring-integration-graphql + 6.0.3 + + + org.springframework.integration + spring-integration-feed + 6.0.3 + + + org.springframework.integration + spring-integration-jpa + 6.0.3 + + + org.springframework.integration + spring-integration-test + 6.0.3 + + + org.springframework.integration + spring-integration-zeromq + 6.0.3 + + + org.springframework.integration + spring-integration-http + 6.0.3 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.3 + + + org.springframework.integration + spring-integration-ip + 6.0.3 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.3 + + + org.springframework.integration + spring-integration-test-support + 6.0.3 + + + org.springframework.integration + spring-integration-amqp + 6.0.3 + + + org.springframework.integration + spring-integration-mail + 6.0.3 + + + org.springframework.integration + spring-integration-security + 6.0.3 + + + org.springframework.integration + spring-integration-camel + 6.0.3 + + + org.springframework.integration + spring-integration-xml + 6.0.3 + + + org.springframework.integration + spring-integration-core + 6.0.3 + + + org.springframework.integration + spring-integration-jms + 6.0.3 + + + org.springframework.integration + spring-integration-mongodb + 6.0.3 + + + org.springframework.integration + spring-integration-stream + 6.0.3 + + + org.springframework.integration + spring-integration-stomp + 6.0.3 + org.springframework.boot spring-boot-dependencies @@ -124,28 +324,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index cb936e9b7..39ba62493 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -120,7 +120,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -154,28 +154,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index a1482476f..bbf53184d 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -117,28 +117,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 37343e47b..df2f44dc7 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 258155850..09660f00a 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/build.gradle b/build.gradle index 204361822..cba5c0a16 100644 --- a/build.gradle +++ b/build.gradle @@ -205,7 +205,7 @@ subprojects { subproject -> } jacoco { - toolVersion = '0.8.7' + toolVersion = '0.8.8' } compileJava { @@ -232,41 +232,41 @@ subprojects { subproject -> c3p0Version = '0.9.5.5' derbyVersion = '10.16.1.1' hamcrestVersion = '2.2' - hibernateVersion = '6.1.6.Final' + hibernateVersion = '6.1.7.Final' hibernateValidatorVersion = '8.0.0.Final' ftpServerVersion = '1.2.0' flexjsonVersion = '2.0' - groovyVersion = '4.0.7' + groovyVersion = '4.0.9' hsqldbVersion = '2.7.1' h2Version = '2.1.214' - jacksonVersion = '2.14.1' + jacksonVersion = '2.14.2' mailVersion = '1.0.0' - jaxbVersion = '2.3.3' + jaxbVersion = '4.0.2' jodaTimeVersion = '1.6' jtaVersion = '2.0.0' jtdsVersion = '1.2.6' - jmsApiVersion = '3.0.0' + jmsApiVersion = '3.1.0' jrubyVersion = '9.2.14.0' jpaApiVersion = '3.0.2' jstlVersion = '1.2' junitVersion = '4.13.2' - junitJupiterVersion = '5.9.1' + junitJupiterVersion = '5.9.2' jythonVersion = '2.7.3' log4jVersion = '2.19.0' - mockitoVersion = '4.8.0' - mongoDriverVersion = '4.7.2' + mockitoVersion = '4.10.0' + mongoDriverVersion = '4.8.2' openJpaVersion = '2.4.0' oracleDriverVersion = '19.3.0.0' - postgresVersion = '42.5.1' + postgresVersion = '42.5.4' slf4jVersion = '1.7.30' - springCloudVersion = '2022.0.0' - springIntegrationVersion = '6.0.2' + springCloudVersion = '2022.0.1' + springIntegrationVersion = '6.0.3' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.0.4' - springSecurityVersion = '6.0.1' - springWebFlowVersion = '2.3.3.RELEASE' + springVersion = '6.0.5' + springSecurityVersion = '6.0.2' + springWebFlowVersion = '2.4.8.RELEASE' testcontainersVersion = '1.17.6' tilesJspVersion = '2.2.1' } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index a84bf96b8..d3b8f5b42 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -125,6 +125,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.3 + + + org.springframework.integration + spring-integration-syslog + 6.0.3 + + + org.springframework.integration + spring-integration-smb + 6.0.3 + + + org.springframework.integration + spring-integration-jdbc + 6.0.3 + + + org.springframework.integration + spring-integration-jmx + 6.0.3 + + + org.springframework.integration + spring-integration-ws + 6.0.3 + + + org.springframework.integration + spring-integration-redis + 6.0.3 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.3 + + + org.springframework.integration + spring-integration-webflux + 6.0.3 + + + org.springframework.integration + spring-integration-sftp + 6.0.3 + + + org.springframework.integration + spring-integration-rsocket + 6.0.3 + + + org.springframework.integration + spring-integration-mqtt + 6.0.3 + + + org.springframework.integration + spring-integration-event + 6.0.3 + + + org.springframework.integration + spring-integration-ftp + 6.0.3 + + + org.springframework.integration + spring-integration-kafka + 6.0.3 + + + org.springframework.integration + spring-integration-groovy + 6.0.3 + + + org.springframework.integration + spring-integration-cassandra + 6.0.3 + + + org.springframework.integration + spring-integration-scripting + 6.0.3 + + + org.springframework.integration + spring-integration-xmpp + 6.0.3 + + + org.springframework.integration + spring-integration-websocket + 6.0.3 + + + org.springframework.integration + spring-integration-graphql + 6.0.3 + + + org.springframework.integration + spring-integration-feed + 6.0.3 + + + org.springframework.integration + spring-integration-jpa + 6.0.3 + + + org.springframework.integration + spring-integration-test + 6.0.3 + + + org.springframework.integration + spring-integration-zeromq + 6.0.3 + + + org.springframework.integration + spring-integration-http + 6.0.3 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.3 + + + org.springframework.integration + spring-integration-ip + 6.0.3 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.3 + + + org.springframework.integration + spring-integration-test-support + 6.0.3 + + + org.springframework.integration + spring-integration-amqp + 6.0.3 + + + org.springframework.integration + spring-integration-mail + 6.0.3 + + + org.springframework.integration + spring-integration-security + 6.0.3 + + + org.springframework.integration + spring-integration-camel + 6.0.3 + + + org.springframework.integration + spring-integration-xml + 6.0.3 + + + org.springframework.integration + spring-integration-core + 6.0.3 + + + org.springframework.integration + spring-integration-jms + 6.0.3 + + + org.springframework.integration + spring-integration-mongodb + 6.0.3 + + + org.springframework.integration + spring-integration-stream + 6.0.3 + + + org.springframework.integration + spring-integration-stomp + 6.0.3 + org.springframework.boot spring-boot-dependencies @@ -135,28 +335,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 4f5f4c47b..d24528100 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -125,6 +125,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.3 + + + org.springframework.integration + spring-integration-syslog + 6.0.3 + + + org.springframework.integration + spring-integration-smb + 6.0.3 + + + org.springframework.integration + spring-integration-jdbc + 6.0.3 + + + org.springframework.integration + spring-integration-jmx + 6.0.3 + + + org.springframework.integration + spring-integration-ws + 6.0.3 + + + org.springframework.integration + spring-integration-redis + 6.0.3 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.3 + + + org.springframework.integration + spring-integration-webflux + 6.0.3 + + + org.springframework.integration + spring-integration-sftp + 6.0.3 + + + org.springframework.integration + spring-integration-rsocket + 6.0.3 + + + org.springframework.integration + spring-integration-mqtt + 6.0.3 + + + org.springframework.integration + spring-integration-event + 6.0.3 + + + org.springframework.integration + spring-integration-ftp + 6.0.3 + + + org.springframework.integration + spring-integration-kafka + 6.0.3 + + + org.springframework.integration + spring-integration-groovy + 6.0.3 + + + org.springframework.integration + spring-integration-cassandra + 6.0.3 + + + org.springframework.integration + spring-integration-scripting + 6.0.3 + + + org.springframework.integration + spring-integration-xmpp + 6.0.3 + + + org.springframework.integration + spring-integration-websocket + 6.0.3 + + + org.springframework.integration + spring-integration-graphql + 6.0.3 + + + org.springframework.integration + spring-integration-feed + 6.0.3 + + + org.springframework.integration + spring-integration-jpa + 6.0.3 + + + org.springframework.integration + spring-integration-test + 6.0.3 + + + org.springframework.integration + spring-integration-zeromq + 6.0.3 + + + org.springframework.integration + spring-integration-http + 6.0.3 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.3 + + + org.springframework.integration + spring-integration-ip + 6.0.3 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.3 + + + org.springframework.integration + spring-integration-test-support + 6.0.3 + + + org.springframework.integration + spring-integration-amqp + 6.0.3 + + + org.springframework.integration + spring-integration-mail + 6.0.3 + + + org.springframework.integration + spring-integration-security + 6.0.3 + + + org.springframework.integration + spring-integration-camel + 6.0.3 + + + org.springframework.integration + spring-integration-xml + 6.0.3 + + + org.springframework.integration + spring-integration-core + 6.0.3 + + + org.springframework.integration + spring-integration-jms + 6.0.3 + + + org.springframework.integration + spring-integration-mongodb + 6.0.3 + + + org.springframework.integration + spring-integration-stream + 6.0.3 + + + org.springframework.integration + spring-integration-stomp + 6.0.3 + org.springframework.boot spring-boot-dependencies @@ -135,28 +335,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 0dd52f5ca..5e3afd096 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -111,7 +111,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -147,6 +147,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.3 + + + org.springframework.integration + spring-integration-syslog + 6.0.3 + + + org.springframework.integration + spring-integration-smb + 6.0.3 + + + org.springframework.integration + spring-integration-jdbc + 6.0.3 + + + org.springframework.integration + spring-integration-jmx + 6.0.3 + + + org.springframework.integration + spring-integration-ws + 6.0.3 + + + org.springframework.integration + spring-integration-redis + 6.0.3 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.3 + + + org.springframework.integration + spring-integration-webflux + 6.0.3 + + + org.springframework.integration + spring-integration-sftp + 6.0.3 + + + org.springframework.integration + spring-integration-rsocket + 6.0.3 + + + org.springframework.integration + spring-integration-mqtt + 6.0.3 + + + org.springframework.integration + spring-integration-event + 6.0.3 + + + org.springframework.integration + spring-integration-ftp + 6.0.3 + + + org.springframework.integration + spring-integration-kafka + 6.0.3 + + + org.springframework.integration + spring-integration-groovy + 6.0.3 + + + org.springframework.integration + spring-integration-cassandra + 6.0.3 + + + org.springframework.integration + spring-integration-scripting + 6.0.3 + + + org.springframework.integration + spring-integration-xmpp + 6.0.3 + + + org.springframework.integration + spring-integration-websocket + 6.0.3 + + + org.springframework.integration + spring-integration-graphql + 6.0.3 + + + org.springframework.integration + spring-integration-feed + 6.0.3 + + + org.springframework.integration + spring-integration-jpa + 6.0.3 + + + org.springframework.integration + spring-integration-test + 6.0.3 + + + org.springframework.integration + spring-integration-zeromq + 6.0.3 + + + org.springframework.integration + spring-integration-http + 6.0.3 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.3 + + + org.springframework.integration + spring-integration-ip + 6.0.3 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.3 + + + org.springframework.integration + spring-integration-test-support + 6.0.3 + + + org.springframework.integration + spring-integration-amqp + 6.0.3 + + + org.springframework.integration + spring-integration-mail + 6.0.3 + + + org.springframework.integration + spring-integration-security + 6.0.3 + + + org.springframework.integration + spring-integration-camel + 6.0.3 + + + org.springframework.integration + spring-integration-xml + 6.0.3 + + + org.springframework.integration + spring-integration-core + 6.0.3 + + + org.springframework.integration + spring-integration-jms + 6.0.3 + + + org.springframework.integration + spring-integration-mongodb + 6.0.3 + + + org.springframework.integration + spring-integration-stream + 6.0.3 + + + org.springframework.integration + spring-integration-stomp + 6.0.3 + org.springframework.boot spring-boot-dependencies @@ -157,28 +357,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index f178d079c..e3e5dd42c 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 423c5c2fe..fdd834791 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 6d7465f01..82edcfa7c 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 46a4798c6..237998a4c 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 1f5770cff..183141bd9 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -95,7 +95,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -129,28 +129,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index a6a4ddc4e..e1519ae05 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -132,7 +132,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -166,28 +166,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 4b4d75de8..cef76177c 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -132,7 +132,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -166,28 +166,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 9771d13ec..21216076b 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -95,13 +95,13 @@ org.springframework.security spring-security-web - 6.0.1 + 6.0.2 compile org.springframework.security spring-security-config - 6.0.1 + 6.0.2 compile @@ -113,7 +113,7 @@ com.sun.xml.bind jaxb-impl - 2.3.3 + 4.0.2 compile @@ -163,7 +163,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -197,28 +197,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/domain/Employee.java b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/domain/Employee.java index 363bca957..ae04b98d0 100644 --- a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/domain/Employee.java +++ b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/domain/Employee.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,15 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.rest.domain; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * Employee.java: Employee Domain class + * * @author Vigil Bose */ @XmlAccessorType(XmlAccessType.FIELD) @@ -81,5 +83,3 @@ public void setLname(String lname) { this.lname = lname; } } - - diff --git a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/domain/EmployeeList.java b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/domain/EmployeeList.java index 0edf133ca..4da99945a 100644 --- a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/domain/EmployeeList.java +++ b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/domain/EmployeeList.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,19 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.rest.domain; import java.util.ArrayList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * EmployeeList.java: EmployeeList Domain class + * * @author Vigil Bose */ @XmlAccessorType(XmlAccessType.FIELD) @@ -84,5 +86,3 @@ public void setReturnStatusMsg(String returnStatusMsg) { this.returnStatusMsg = returnStatusMsg; } } - - diff --git a/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java b/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java index fb34e2d72..5a0db209a 100644 --- a/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java +++ b/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,7 @@ package org.springframework.integration.samples.rest; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.io.StringWriter; import java.util.Base64; import java.util.HashMap; @@ -28,11 +24,11 @@ import javax.xml.transform.stream.StreamResult; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; @@ -43,13 +39,11 @@ import org.springframework.http.client.ClientHttpRequest; import org.springframework.integration.samples.rest.domain.EmployeeList; import org.springframework.oxm.jaxb.Jaxb2Marshaller; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.web.client.HttpMessageConverterExtractor; -import org.springframework.web.client.RequestCallback; import org.springframework.web.client.RestTemplate; -import com.fasterxml.jackson.databind.ObjectMapper; +import static org.assertj.core.api.Assertions.assertThat; /** * RestHttpClientTest.java: Functional Test to test the REST HTTP Path usage. This test requires @@ -59,8 +53,7 @@ * @author Gary Russell * @author Artem Bilan */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { "classpath*:META-INF/spring/integration/http-outbound-config.xml" }) +@SpringJUnitConfig(locations = "classpath*:META-INF/spring/integration/http-outbound-config.xml") public class RestHttpClientTest { @Autowired @@ -76,24 +69,19 @@ public class RestHttpClientTest { @Autowired private ObjectMapper jaxbJacksonObjectMapper; - @Before + @BeforeEach public void setUp() { responseExtractor = new HttpMessageConverterExtractor<>(EmployeeList.class, restTemplate .getMessageConverters()); Map properties = new HashMap<>(); - properties.put(javax.xml.bind.Marshaller.JAXB_ENCODING, "UTF-8"); - properties.put(javax.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); + properties.put(jakarta.xml.bind.Marshaller.JAXB_ENCODING, "UTF-8"); + properties.put(jakarta.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); marshaller.setMarshallerProperties(properties); } - /** - * - * @throws Exception - */ @Test public void testGetEmployeeAsXml() { - Map employeeSearchMap = getEmployeeSearchMap("0"); final String fullUrl = "http://localhost:8080/rest-http/services/employee/{id}/search"; @@ -111,7 +99,7 @@ public void testGetEmployeeAsXml() { marshaller.marshal(employeeList, sr); logger.info(sr.getWriter().toString()); - assertTrue(employeeList.getEmployee().size() > 0); + assertThat(employeeList.getEmployee()).hasSizeGreaterThan(0); } private Map getEmployeeSearchMap(String id) { @@ -134,10 +122,10 @@ public void testGetEmployeeAsJson() throws Exception { .exchange(fullUrl, HttpMethod.GET, request, EmployeeList.class, employeeSearchMap); logger.info("Return Status :" + httpResponse.getHeaders().get("X-Return-Status")); logger.info("Return Status Message :" + httpResponse.getHeaders().get("X-Return-Status-Msg")); - assertEquals(httpResponse.getStatusCode(), HttpStatus.OK); + assertThat(httpResponse.getStatusCode()).isEqualTo(HttpStatus.OK); ByteArrayOutputStream out = new ByteArrayOutputStream(); jaxbJacksonObjectMapper.writeValue(out, httpResponse.getBody()); - logger.info(new String(out.toByteArray())); + logger.info(out.toString()); } private HttpHeaders getHttpHeadersWithUserCredentials(ClientHttpRequest request) { @@ -159,5 +147,3 @@ private HttpHeaders getHttpHeadersWithUserCredentials(HttpHeaders headers) { } } - - diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 7b9aebeb0..28017c302 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -75,7 +75,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 compile @@ -111,7 +111,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -145,28 +145,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 97c75b2de..aab55b89e 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 35a7bf873..30f9f2c35 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -90,7 +90,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -124,28 +124,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index dec2a70c4..1d6f08f4f 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -90,7 +90,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -124,28 +124,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 76253d0b7..f48845257 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -84,7 +84,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index e4b9c5fdc..e28a7bb51 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -60,7 +60,7 @@ org.postgresql postgresql - 42.5.1 + 42.5.4 compile @@ -96,7 +96,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -130,28 +130,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index f39af1769..f56c4fe86 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -114,6 +114,206 @@ + + org.springframework.integration + spring-integration-file + 6.0.3 + + + org.springframework.integration + spring-integration-syslog + 6.0.3 + + + org.springframework.integration + spring-integration-smb + 6.0.3 + + + org.springframework.integration + spring-integration-jdbc + 6.0.3 + + + org.springframework.integration + spring-integration-jmx + 6.0.3 + + + org.springframework.integration + spring-integration-ws + 6.0.3 + + + org.springframework.integration + spring-integration-redis + 6.0.3 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.3 + + + org.springframework.integration + spring-integration-webflux + 6.0.3 + + + org.springframework.integration + spring-integration-sftp + 6.0.3 + + + org.springframework.integration + spring-integration-rsocket + 6.0.3 + + + org.springframework.integration + spring-integration-mqtt + 6.0.3 + + + org.springframework.integration + spring-integration-event + 6.0.3 + + + org.springframework.integration + spring-integration-ftp + 6.0.3 + + + org.springframework.integration + spring-integration-kafka + 6.0.3 + + + org.springframework.integration + spring-integration-groovy + 6.0.3 + + + org.springframework.integration + spring-integration-cassandra + 6.0.3 + + + org.springframework.integration + spring-integration-scripting + 6.0.3 + + + org.springframework.integration + spring-integration-xmpp + 6.0.3 + + + org.springframework.integration + spring-integration-websocket + 6.0.3 + + + org.springframework.integration + spring-integration-graphql + 6.0.3 + + + org.springframework.integration + spring-integration-feed + 6.0.3 + + + org.springframework.integration + spring-integration-jpa + 6.0.3 + + + org.springframework.integration + spring-integration-test + 6.0.3 + + + org.springframework.integration + spring-integration-zeromq + 6.0.3 + + + org.springframework.integration + spring-integration-http + 6.0.3 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.3 + + + org.springframework.integration + spring-integration-ip + 6.0.3 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.3 + + + org.springframework.integration + spring-integration-test-support + 6.0.3 + + + org.springframework.integration + spring-integration-amqp + 6.0.3 + + + org.springframework.integration + spring-integration-mail + 6.0.3 + + + org.springframework.integration + spring-integration-security + 6.0.3 + + + org.springframework.integration + spring-integration-camel + 6.0.3 + + + org.springframework.integration + spring-integration-xml + 6.0.3 + + + org.springframework.integration + spring-integration-core + 6.0.3 + + + org.springframework.integration + spring-integration-jms + 6.0.3 + + + org.springframework.integration + spring-integration-mongodb + 6.0.3 + + + org.springframework.integration + spring-integration-stream + 6.0.3 + + + org.springframework.integration + spring-integration-stomp + 6.0.3 + org.springframework.boot spring-boot-dependencies @@ -124,28 +324,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 82e6dfae1..a0da2a645 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 25938aa88..9d0d2a262 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -141,10 +141,210 @@ + + org.springframework.integration + spring-integration-jdbc + 6.0.3 + + + org.springframework.integration + spring-integration-ws + 6.0.3 + + + org.springframework.integration + spring-integration-redis + 6.0.3 + + + org.springframework.integration + spring-integration-r2dbc + 6.0.3 + + + org.springframework.integration + spring-integration-rsocket + 6.0.3 + + + org.springframework.integration + spring-integration-event + 6.0.3 + + + org.springframework.integration + spring-integration-cassandra + 6.0.3 + + + org.springframework.integration + spring-integration-scripting + 6.0.3 + + + org.springframework.integration + spring-integration-websocket + 6.0.3 + + + org.springframework.integration + spring-integration-graphql + 6.0.3 + + + org.springframework.integration + spring-integration-jpa + 6.0.3 + + + org.springframework.integration + spring-integration-test + 6.0.3 + + + org.springframework.integration + spring-integration-http + 6.0.3 + + + org.springframework.integration + spring-integration-zookeeper + 6.0.3 + + + org.springframework.integration + spring-integration-ip + 6.0.3 + + + org.springframework.integration + spring-integration-mail + 6.0.3 + + + org.springframework.integration + spring-integration-camel + 6.0.3 + + + org.springframework.integration + spring-integration-mongodb + 6.0.3 + + + org.springframework.integration + spring-integration-stream + 6.0.3 + + + org.springframework.integration + spring-integration-stomp + 6.0.3 + + + org.springframework.integration + spring-integration-file + 6.0.3 + + + org.springframework.integration + spring-integration-syslog + 6.0.3 + + + org.springframework.integration + spring-integration-smb + 6.0.3 + + + org.springframework.integration + spring-integration-jmx + 6.0.3 + + + org.springframework.integration + spring-integration-webflux + 6.0.3 + + + org.springframework.integration + spring-integration-sftp + 6.0.3 + + + org.springframework.integration + spring-integration-mqtt + 6.0.3 + + + org.springframework.integration + spring-integration-ftp + 6.0.3 + + + org.springframework.integration + spring-integration-kafka + 6.0.3 + + + org.springframework.integration + spring-integration-groovy + 6.0.3 + + + org.springframework.integration + spring-integration-xmpp + 6.0.3 + + + org.springframework.integration + spring-integration-feed + 6.0.3 + + + org.springframework.integration + spring-integration-zeromq + 6.0.3 + + + org.springframework.integration + spring-integration-hazelcast + 6.0.3 + + + org.springframework.integration + spring-integration-test-support + 6.0.3 + + + org.springframework.integration + spring-integration-amqp + 6.0.3 + + + org.springframework.integration + spring-integration-security + 6.0.3 + + + org.springframework.integration + spring-integration-xml + 6.0.3 + + + org.springframework.integration + spring-integration-core + 6.0.3 + + + org.springframework.integration + spring-integration-jms + 6.0.3 + org.springframework.cloud spring-cloud-dependencies - 2022.0.0 + 2022.0.1 import pom @@ -158,28 +358,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 4d8e6a0d1..6e30f2f81 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -88,7 +88,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -122,28 +122,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 68f8a05e6..c96eb6dec 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.8.0 + 4.10.0 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.9.1 + 5.9.2 import pom com.fasterxml.jackson jackson-bom - 2.14.1 + 2.14.2 import pom org.springframework spring-framework-bom - 6.0.4 + 6.0.5 import pom org.springframework.integration spring-integration-bom - 6.0.2 + 6.0.3 import pom From 6bec9485a152c03a95cd547d6818e841e9c3e138 Mon Sep 17 00:00:00 2001 From: abilan Date: Wed, 22 Feb 2023 08:24:43 -0500 Subject: [PATCH 319/356] Upgrade to commons-fileupload-1.5 --- applications/loanshark/pom.xml | 2 +- basic/http/pom.xml | 2 +- build.gradle | 2 +- intermediate/multipart-http/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 96030b34d..f51dc320a 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -101,7 +101,7 @@ commons-fileupload commons-fileupload - 1.4 + 1.5 compile diff --git a/basic/http/pom.xml b/basic/http/pom.xml index a6581f517..b798a4e0e 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -70,7 +70,7 @@ commons-fileupload commons-fileupload - 1.4 + 1.5 compile diff --git a/build.gradle b/build.gradle index cba5c0a16..a534d342d 100644 --- a/build.gradle +++ b/build.gradle @@ -225,7 +225,7 @@ subprojects { subproject -> aspectjVersion = '1.9.19' commonsDigesterVersion = '2.1' commonsDbcpVersion = '2.9.0' - commonsFileUploadVersion = '1.4' + commonsFileUploadVersion = '1.5' commonsIoVersion = '2.11.0' commonsLangVersion = '3.12.0' commonsPoolVersion = '2.11.1' diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index cef76177c..cd9d27111 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -70,7 +70,7 @@ commons-fileupload commons-fileupload - 1.4 + 1.5 compile From 60caa5d0ededdfc736e4b882a54ac64f6d1f601c Mon Sep 17 00:00:00 2001 From: abilan Date: Wed, 22 Feb 2023 08:28:59 -0500 Subject: [PATCH 320/356] Fix XML configs for latest Mockito --- .../samples/advance/testing/jms/JmsMockTests-context.xml | 2 +- .../META-INF/spring/integration/expression-advice-context.xml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml index 70eadc0db..f9f3cad27 100644 --- a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml +++ b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests-context.xml @@ -23,7 +23,7 @@ - + diff --git a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml index a01201aab..e1a1c2550 100644 --- a/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml +++ b/intermediate/retry-and-more/src/main/resources/META-INF/spring/integration/expression-advice-context.xml @@ -2,14 +2,12 @@ @@ -41,7 +39,7 @@ - + Date: Wed, 22 Mar 2023 14:01:24 -0400 Subject: [PATCH 321/356] Upgrade to latest deps --- advanced/advanced-testing-examples/pom.xml | 4 +- advanced/dynamic-ftp/pom.xml | 4 +- advanced/dynamic-tcp-client/pom.xml | 88 +++++++++---------- applications/cafe-scripted/pom.xml | 6 +- applications/cafe/cafe-amqp/pom.xml | 4 +- applications/cafe/cafe-jms/pom.xml | 4 +- applications/cafe/cafe-si/pom.xml | 4 +- applications/file-split-ftp/pom.xml | 88 +++++++++---------- applications/loan-broker/pom.xml | 4 +- applications/loanshark/pom.xml | 4 +- applications/stomp-chat/pom.xml | 88 +++++++++---------- basic/amqp/pom.xml | 4 +- basic/barrier/pom.xml | 88 +++++++++---------- basic/control-bus/pom.xml | 4 +- basic/enricher/pom.xml | 4 +- basic/feed/pom.xml | 4 +- basic/file/pom.xml | 4 +- basic/ftp/pom.xml | 4 +- basic/helloworld/pom.xml | 4 +- basic/http/pom.xml | 4 +- basic/jdbc/pom.xml | 4 +- basic/jms/pom.xml | 4 +- basic/jmx/pom.xml | 4 +- basic/jpa/pom.xml | 88 +++++++++---------- basic/kafka/pom.xml | 88 +++++++++---------- basic/mail/pom.xml | 4 +- basic/mongodb/pom.xml | 4 +- basic/mqtt/pom.xml | 88 +++++++++---------- basic/oddeven/pom.xml | 4 +- basic/quote/pom.xml | 4 +- basic/sftp/pom.xml | 4 +- basic/tcp-amqp/pom.xml | 4 +- basic/tcp-broadcast/pom.xml | 88 +++++++++---------- basic/tcp-client-server/pom.xml | 4 +- basic/tcp-with-headers/pom.xml | 88 +++++++++---------- basic/testing-examples/pom.xml | 4 +- basic/twitter/pom.xml | 4 +- basic/web-sockets/pom.xml | 88 +++++++++---------- basic/ws-inbound-gateway/pom.xml | 4 +- basic/ws-outbound-gateway/pom.xml | 4 +- basic/xml/pom.xml | 4 +- basic/xmpp/pom.xml | 4 +- build.gradle | 6 +- dsl/cafe-dsl/pom.xml | 88 +++++++++---------- dsl/kafka-dsl/pom.xml | 88 +++++++++---------- dsl/si4demo/pom.xml | 88 +++++++++---------- gradle.properties | 2 +- intermediate/async-gateway/pom.xml | 4 +- intermediate/dynamic-poller/pom.xml | 4 +- intermediate/errorhandling/pom.xml | 4 +- intermediate/file-processing/pom.xml | 4 +- intermediate/mail-attachments/pom.xml | 4 +- intermediate/monitoring/pom.xml | 4 +- intermediate/multipart-http/pom.xml | 4 +- intermediate/rest-http/pom.xml | 4 +- intermediate/retry-and-more/pom.xml | 4 +- .../splitter-aggregator-reaper/pom.xml | 4 +- intermediate/stored-procedures-derby/pom.xml | 4 +- intermediate/stored-procedures-ms/pom.xml | 4 +- intermediate/stored-procedures-oracle/pom.xml | 4 +- .../stored-procedures-postgresql/pom.xml | 4 +- intermediate/tcp-async-bi-directional/pom.xml | 88 +++++++++---------- .../tcp-client-server-multiplex/pom.xml | 4 +- intermediate/testcontainers-rabbitmq/pom.xml | 88 +++++++++---------- intermediate/travel/pom.xml | 4 +- intermediate/tx-synch/pom.xml | 4 +- 66 files changed, 763 insertions(+), 763 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 1312660b8..2e9164771 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 1958635b7..103907abf 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 2ced7638e..ccd0df908 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -117,207 +117,207 @@ org.springframework.integration spring-integration-file - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-syslog - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-smb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jdbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jmx - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ws - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-redis - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-r2dbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-webflux - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-sftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-rsocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mqtt - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-event - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-kafka - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-groovy - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-cassandra - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-scripting - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xmpp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-websocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-graphql - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-feed - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jpa - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zeromq - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-http - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zookeeper - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ip - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-hazelcast - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test-support - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-amqp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mail - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-security - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-camel - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xml - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-core - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jms - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mongodb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stream - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stomp - 6.0.3 + 6.0.4 org.springframework.boot spring-boot-dependencies - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT import pom @@ -338,14 +338,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom @@ -362,7 +362,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index d6358c0a9..486cd51bc 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -87,7 +87,7 @@ org.apache.groovy groovy-jsr223 - 4.0.9 + 4.0.10 compile @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 481ed384d..3330c62f9 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 64ab67910..9c9c178ee 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -156,14 +156,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 7f795baa1..1dbc07d05 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 26c3bfd11..3a910c854 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -144,207 +144,207 @@ org.springframework.integration spring-integration-file - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-syslog - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-smb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jdbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jmx - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ws - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-redis - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-r2dbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-webflux - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-sftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-rsocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mqtt - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-event - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-kafka - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-groovy - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-cassandra - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-scripting - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xmpp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-websocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-graphql - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-feed - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jpa - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zeromq - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-http - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zookeeper - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ip - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-hazelcast - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test-support - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-amqp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mail - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-security - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-camel - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xml - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-core - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jms - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mongodb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stream - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stomp - 6.0.3 + 6.0.4 org.springframework.boot spring-boot-dependencies - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT import pom @@ -365,14 +365,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom @@ -389,7 +389,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 0e32712ba..b7f4a1e4c 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index f51dc320a..86e8724ce 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -325,14 +325,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 25fed4676..2d4374878 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -127,207 +127,207 @@ org.springframework.integration spring-integration-file - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-syslog - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-smb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jdbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jmx - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ws - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-redis - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-r2dbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-webflux - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-sftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-rsocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mqtt - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-event - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-kafka - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-groovy - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-cassandra - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-scripting - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xmpp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-websocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-graphql - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-feed - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jpa - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zeromq - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-http - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zookeeper - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ip - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-hazelcast - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test-support - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-amqp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mail - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-security - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-camel - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xml - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-core - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jms - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mongodb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stream - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stomp - 6.0.3 + 6.0.4 org.springframework.boot spring-boot-dependencies - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT import pom @@ -348,14 +348,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom @@ -372,7 +372,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 02b7c41cb..49b5ae142 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index d3e11a169..8880461d0 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -137,207 +137,207 @@ org.springframework.integration spring-integration-file - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-syslog - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-smb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jdbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jmx - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ws - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-redis - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-r2dbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-webflux - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-sftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-rsocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mqtt - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-event - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-kafka - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-groovy - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-cassandra - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-scripting - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xmpp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-websocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-graphql - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-feed - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jpa - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zeromq - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-http - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zookeeper - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ip - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-hazelcast - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test-support - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-amqp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mail - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-security - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-camel - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xml - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-core - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jms - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mongodb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stream - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stomp - 6.0.3 + 6.0.4 org.springframework.boot spring-boot-dependencies - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT import pom @@ -358,14 +358,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom @@ -382,7 +382,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index f2fb675b0..5842a43d1 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index f32a557b1..479624fa8 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 83ec3cf20..06a8e4d9b 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index a95baec6d..07a23373d 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index a912d4377..fa57c6764 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -150,14 +150,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index c18474b74..4168e442a 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index b798a4e0e..224fb9bdb 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index d2bcd2a64..9118cc134 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index be7171c9d..ca6092df5 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index a5916f3ce..ccba5e14d 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 2aa91426d..4d5f11e2c 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -134,207 +134,207 @@ org.springframework.integration spring-integration-file - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-syslog - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-smb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jdbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jmx - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ws - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-redis - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-r2dbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-webflux - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-sftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-rsocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mqtt - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-event - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-kafka - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-groovy - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-cassandra - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-scripting - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xmpp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-websocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-graphql - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-feed - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jpa - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zeromq - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-http - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zookeeper - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ip - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-hazelcast - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test-support - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-amqp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mail - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-security - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-camel - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xml - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-core - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jms - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mongodb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stream - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stomp - 6.0.3 + 6.0.4 org.springframework.boot spring-boot-dependencies - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT import pom @@ -355,14 +355,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom @@ -379,7 +379,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index d022d4ac8..99bffb33b 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -134,207 +134,207 @@ org.springframework.integration spring-integration-file - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-syslog - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-smb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jdbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jmx - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ws - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-redis - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-r2dbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-webflux - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-sftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-rsocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mqtt - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-event - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-kafka - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-groovy - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-cassandra - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-scripting - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xmpp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-websocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-graphql - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-feed - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jpa - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zeromq - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-http - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zookeeper - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ip - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-hazelcast - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test-support - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-amqp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mail - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-security - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-camel - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xml - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-core - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jms - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mongodb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stream - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stomp - 6.0.3 + 6.0.4 org.springframework.boot spring-boot-dependencies - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT import pom @@ -355,14 +355,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom @@ -379,7 +379,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index b6b4f410b..08b7e5fb5 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 903e5f1e3..effa3be32 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index f881324e2..c5ab23600 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -122,207 +122,207 @@ org.springframework.integration spring-integration-file - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-syslog - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-smb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jdbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jmx - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ws - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-redis - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-r2dbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-webflux - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-sftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-rsocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mqtt - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-event - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-kafka - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-groovy - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-cassandra - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-scripting - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xmpp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-websocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-graphql - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-feed - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jpa - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zeromq - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-http - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zookeeper - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ip - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-hazelcast - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test-support - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-amqp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mail - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-security - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-camel - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xml - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-core - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jms - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mongodb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stream - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stomp - 6.0.3 + 6.0.4 org.springframework.boot spring-boot-dependencies - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT import pom @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom @@ -367,7 +367,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index fe7e45a8c..a3c040c13 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 8740889b7..fdbcf7b19 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 4a0a44823..87006d1ab 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index d6329f9dc..17d7e2204 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 33a5f238f..dc5701ffb 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -122,207 +122,207 @@ org.springframework.integration spring-integration-file - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-syslog - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-smb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jdbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jmx - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ws - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-redis - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-r2dbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-webflux - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-sftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-rsocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mqtt - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-event - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-kafka - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-groovy - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-cassandra - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-scripting - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xmpp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-websocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-graphql - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-feed - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jpa - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zeromq - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-http - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zookeeper - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ip - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-hazelcast - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test-support - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-amqp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mail - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-security - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-camel - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xml - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-core - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jms - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mongodb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stream - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stomp - 6.0.3 + 6.0.4 org.springframework.boot spring-boot-dependencies - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT import pom @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom @@ -367,7 +367,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 9f8da5926..818ef2d3b 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 20b4e3b94..eadb5bb2e 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -122,207 +122,207 @@ org.springframework.integration spring-integration-file - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-syslog - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-smb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jdbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jmx - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ws - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-redis - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-r2dbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-webflux - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-sftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-rsocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mqtt - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-event - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-kafka - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-groovy - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-cassandra - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-scripting - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xmpp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-websocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-graphql - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-feed - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jpa - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zeromq - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-http - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zookeeper - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ip - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-hazelcast - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test-support - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-amqp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mail - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-security - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-camel - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xml - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-core - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jms - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mongodb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stream - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stomp - 6.0.3 + 6.0.4 org.springframework.boot spring-boot-dependencies - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT import pom @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom @@ -367,7 +367,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 1fd2365cd..787e0c4e0 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -141,14 +141,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 385b19321..cf7d54c81 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -127,14 +127,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index c6ff306d5..2cfbd1260 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -117,207 +117,207 @@ org.springframework.integration spring-integration-file - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-syslog - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-smb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jdbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jmx - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ws - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-redis - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-r2dbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-webflux - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-sftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-rsocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mqtt - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-event - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-kafka - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-groovy - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-cassandra - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-scripting - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xmpp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-websocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-graphql - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-feed - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jpa - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zeromq - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-http - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zookeeper - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ip - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-hazelcast - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test-support - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-amqp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mail - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-security - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-camel - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xml - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-core - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jms - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mongodb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stream - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stomp - 6.0.3 + 6.0.4 org.springframework.boot spring-boot-dependencies - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT import pom @@ -338,14 +338,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom @@ -362,7 +362,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 39ba62493..412a51423 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -168,14 +168,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index bbf53184d..409276550 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index df2f44dc7..950c903b5 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 09660f00a..1c9eb8022 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/build.gradle b/build.gradle index a534d342d..0d7f73a18 100644 --- a/build.gradle +++ b/build.gradle @@ -236,7 +236,7 @@ subprojects { subproject -> hibernateValidatorVersion = '8.0.0.Final' ftpServerVersion = '1.2.0' flexjsonVersion = '2.0' - groovyVersion = '4.0.9' + groovyVersion = '4.0.10' hsqldbVersion = '2.7.1' h2Version = '2.1.214' jacksonVersion = '2.14.2' @@ -260,11 +260,11 @@ subprojects { subproject -> postgresVersion = '42.5.4' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.1' - springIntegrationVersion = '6.0.3' + springIntegrationVersion = '6.0.4' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.0.5' + springVersion = '6.0.7' springSecurityVersion = '6.0.2' springWebFlowVersion = '2.4.8.RELEASE' testcontainersVersion = '1.17.6' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index d3b8f5b42..c130d3242 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -128,207 +128,207 @@ org.springframework.integration spring-integration-file - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-syslog - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-smb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jdbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jmx - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ws - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-redis - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-r2dbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-webflux - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-sftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-rsocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mqtt - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-event - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-kafka - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-groovy - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-cassandra - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-scripting - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xmpp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-websocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-graphql - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-feed - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jpa - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zeromq - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-http - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zookeeper - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ip - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-hazelcast - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test-support - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-amqp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mail - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-security - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-camel - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xml - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-core - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jms - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mongodb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stream - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stomp - 6.0.3 + 6.0.4 org.springframework.boot spring-boot-dependencies - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT import pom @@ -349,14 +349,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom @@ -373,7 +373,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index d24528100..7889751cb 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -128,207 +128,207 @@ org.springframework.integration spring-integration-file - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-syslog - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-smb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jdbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jmx - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ws - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-redis - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-r2dbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-webflux - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-sftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-rsocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mqtt - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-event - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-kafka - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-groovy - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-cassandra - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-scripting - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xmpp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-websocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-graphql - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-feed - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jpa - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zeromq - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-http - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zookeeper - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ip - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-hazelcast - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test-support - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-amqp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mail - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-security - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-camel - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xml - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-core - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jms - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mongodb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stream - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stomp - 6.0.3 + 6.0.4 org.springframework.boot spring-boot-dependencies - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT import pom @@ -349,14 +349,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom @@ -373,7 +373,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 5e3afd096..ed675c27f 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -150,207 +150,207 @@ org.springframework.integration spring-integration-file - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-syslog - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-smb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jdbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jmx - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ws - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-redis - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-r2dbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-webflux - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-sftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-rsocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mqtt - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-event - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-kafka - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-groovy - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-cassandra - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-scripting - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xmpp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-websocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-graphql - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-feed - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jpa - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zeromq - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-http - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zookeeper - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ip - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-hazelcast - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test-support - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-amqp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mail - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-security - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-camel - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xml - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-core - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jms - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mongodb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stream - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stomp - 6.0.3 + 6.0.4 org.springframework.boot spring-boot-dependencies - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT import pom @@ -371,14 +371,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom @@ -395,7 +395,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/gradle.properties b/gradle.properties index 434212ce5..1d547b4be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ version=6.0.0 -springBootVersion=3.0.3-SNAPSHOT +springBootVersion=3.0.5-SNAPSHOT org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8 org.gradle.caching=true org.gradle.parallel=true diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index e3e5dd42c..1601e5640 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index fdd834791..e3f8e36b8 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 82edcfa7c..0646b89b9 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 237998a4c..6a02072c7 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 183141bd9..b69374611 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index e1519ae05..74941c365 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index cd9d27111..949064bc4 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 21216076b..af32a4e2d 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -211,14 +211,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 28017c302..0c2786c1d 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index aab55b89e..9811dc5e6 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 30f9f2c35..d8465f460 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 1d6f08f4f..b3d436814 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index f48845257..f7e413116 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index e28a7bb51..7787aacf9 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -144,14 +144,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index f56c4fe86..a741f5f6d 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -117,207 +117,207 @@ org.springframework.integration spring-integration-file - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-syslog - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-smb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jdbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jmx - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ws - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-redis - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-r2dbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-webflux - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-sftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-rsocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mqtt - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-event - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-kafka - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-groovy - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-cassandra - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-scripting - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xmpp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-websocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-graphql - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-feed - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jpa - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zeromq - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-http - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zookeeper - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ip - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-hazelcast - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test-support - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-amqp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mail - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-security - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-camel - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xml - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-core - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jms - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mongodb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stream - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stomp - 6.0.3 + 6.0.4 org.springframework.boot spring-boot-dependencies - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT import pom @@ -338,14 +338,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom @@ -362,7 +362,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index a0da2a645..d1c12e962 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 9d0d2a262..dad66fddf 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -144,202 +144,202 @@ org.springframework.integration spring-integration-jdbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ws - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-redis - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-r2dbc - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-rsocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-event - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-cassandra - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-scripting - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-websocket - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-graphql - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jpa - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-http - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zookeeper - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ip - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mail - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-camel - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mongodb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stream - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-stomp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-file - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-syslog - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-smb - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jmx - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-webflux - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-sftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-mqtt - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-ftp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-kafka - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-groovy - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xmpp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-feed - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-zeromq - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-hazelcast - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-test-support - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-amqp - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-security - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-xml - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-core - 6.0.3 + 6.0.4 org.springframework.integration spring-integration-jms - 6.0.3 + 6.0.4 org.springframework.cloud @@ -351,7 +351,7 @@ org.springframework.boot spring-boot-dependencies - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT import pom @@ -372,14 +372,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom @@ -396,7 +396,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.3-SNAPSHOT + 3.0.5-SNAPSHOT diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 6e30f2f81..1a20acefb 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -136,14 +136,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index c96eb6dec..46b150b36 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.5 + 6.0.7 import pom org.springframework.integration spring-integration-bom - 6.0.3 + 6.0.4 import pom From c127ab066a772aa7718ca61b146267ef225af0cd Mon Sep 17 00:00:00 2001 From: abilan Date: Wed, 19 Apr 2023 15:34:50 -0400 Subject: [PATCH 322/356] Upgrade to latest deps --- advanced/advanced-testing-examples/pom.xml | 4 +- advanced/dynamic-ftp/pom.xml | 4 +- advanced/dynamic-tcp-client/pom.xml | 84 +++++++++---------- applications/cafe-scripted/pom.xml | 4 +- applications/cafe/cafe-amqp/pom.xml | 4 +- applications/cafe/cafe-jms/pom.xml | 4 +- applications/cafe/cafe-si/pom.xml | 4 +- applications/file-split-ftp/pom.xml | 84 +++++++++---------- applications/loan-broker/pom.xml | 4 +- applications/loanshark/pom.xml | 4 +- applications/stomp-chat/pom.xml | 84 +++++++++---------- basic/amqp/pom.xml | 4 +- basic/barrier/pom.xml | 84 +++++++++---------- basic/control-bus/pom.xml | 4 +- basic/enricher/pom.xml | 4 +- basic/feed/pom.xml | 4 +- basic/file/pom.xml | 4 +- basic/ftp/pom.xml | 4 +- basic/helloworld/pom.xml | 4 +- basic/http/pom.xml | 4 +- basic/jdbc/pom.xml | 4 +- basic/jms/pom.xml | 4 +- basic/jmx/pom.xml | 4 +- basic/jpa/pom.xml | 84 +++++++++---------- basic/kafka/pom.xml | 84 +++++++++---------- basic/mail/pom.xml | 4 +- basic/mongodb/pom.xml | 4 +- basic/mqtt/pom.xml | 84 +++++++++---------- basic/oddeven/pom.xml | 4 +- basic/quote/pom.xml | 4 +- basic/sftp/pom.xml | 4 +- basic/tcp-amqp/pom.xml | 4 +- basic/tcp-broadcast/pom.xml | 84 +++++++++---------- basic/tcp-client-server/pom.xml | 4 +- basic/tcp-with-headers/pom.xml | 84 +++++++++---------- basic/testing-examples/pom.xml | 4 +- basic/twitter/pom.xml | 4 +- basic/web-sockets/pom.xml | 84 +++++++++---------- basic/ws-inbound-gateway/pom.xml | 4 +- basic/ws-outbound-gateway/pom.xml | 4 +- basic/xml/pom.xml | 4 +- basic/xmpp/pom.xml | 4 +- build.gradle | 6 +- dsl/cafe-dsl/pom.xml | 84 +++++++++---------- dsl/kafka-dsl/pom.xml | 84 +++++++++---------- dsl/si4demo/pom.xml | 84 +++++++++---------- intermediate/async-gateway/pom.xml | 4 +- intermediate/dynamic-poller/pom.xml | 4 +- intermediate/errorhandling/pom.xml | 4 +- intermediate/file-processing/pom.xml | 4 +- intermediate/mail-attachments/pom.xml | 4 +- intermediate/monitoring/pom.xml | 4 +- intermediate/multipart-http/pom.xml | 4 +- intermediate/rest-http/pom.xml | 8 +- intermediate/retry-and-more/pom.xml | 4 +- .../splitter-aggregator-reaper/pom.xml | 4 +- intermediate/stored-procedures-derby/pom.xml | 4 +- intermediate/stored-procedures-ms/pom.xml | 4 +- intermediate/stored-procedures-oracle/pom.xml | 4 +- .../stored-procedures-postgresql/pom.xml | 4 +- intermediate/tcp-async-bi-directional/pom.xml | 84 +++++++++---------- .../tcp-client-server-multiplex/pom.xml | 4 +- intermediate/testcontainers-rabbitmq/pom.xml | 84 +++++++++---------- intermediate/travel/pom.xml | 4 +- intermediate/tx-synch/pom.xml | 4 +- 65 files changed, 733 insertions(+), 733 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 2e9164771..5d33b2939 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 103907abf..f9c6573f1 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index ccd0df908..bf625f93f 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -117,202 +117,202 @@ org.springframework.integration spring-integration-file - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-syslog - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-smb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jdbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jmx - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ws - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-redis - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-r2dbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-webflux - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-sftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-rsocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mqtt - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-event - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-kafka - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-groovy - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-cassandra - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-scripting - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xmpp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-websocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-graphql - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-feed - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jpa - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zeromq - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-http - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zookeeper - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ip - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-hazelcast - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test-support - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-amqp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mail - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-security - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-camel - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xml - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-core - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jms - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mongodb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stream - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stomp - 6.0.4 + 6.0.5 org.springframework.boot @@ -338,14 +338,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 486cd51bc..a433ab1bb 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 3330c62f9..21d845d33 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 9c9c178ee..3c53eca2a 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -156,14 +156,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 1dbc07d05..2884d1ca0 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 3a910c854..25c53f0e2 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -144,202 +144,202 @@ org.springframework.integration spring-integration-file - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-syslog - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-smb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jdbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jmx - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ws - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-redis - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-r2dbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-webflux - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-sftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-rsocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mqtt - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-event - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-kafka - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-groovy - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-cassandra - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-scripting - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xmpp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-websocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-graphql - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-feed - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jpa - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zeromq - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-http - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zookeeper - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ip - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-hazelcast - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test-support - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-amqp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mail - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-security - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-camel - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xml - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-core - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jms - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mongodb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stream - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stomp - 6.0.4 + 6.0.5 org.springframework.boot @@ -365,14 +365,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index b7f4a1e4c..e7eaf449c 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 86e8724ce..52d96dab4 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -325,14 +325,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 2d4374878..669daae78 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -127,202 +127,202 @@ org.springframework.integration spring-integration-file - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-syslog - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-smb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jdbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jmx - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ws - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-redis - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-r2dbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-webflux - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-sftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-rsocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mqtt - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-event - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-kafka - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-groovy - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-cassandra - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-scripting - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xmpp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-websocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-graphql - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-feed - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jpa - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zeromq - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-http - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zookeeper - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ip - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-hazelcast - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test-support - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-amqp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mail - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-security - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-camel - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xml - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-core - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jms - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mongodb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stream - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stomp - 6.0.4 + 6.0.5 org.springframework.boot @@ -348,14 +348,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 49b5ae142..16ba93787 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 8880461d0..abeb7b555 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -137,202 +137,202 @@ org.springframework.integration spring-integration-file - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-syslog - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-smb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jdbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jmx - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ws - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-redis - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-r2dbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-webflux - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-sftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-rsocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mqtt - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-event - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-kafka - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-groovy - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-cassandra - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-scripting - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xmpp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-websocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-graphql - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-feed - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jpa - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zeromq - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-http - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zookeeper - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ip - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-hazelcast - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test-support - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-amqp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mail - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-security - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-camel - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xml - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-core - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jms - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mongodb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stream - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stomp - 6.0.4 + 6.0.5 org.springframework.boot @@ -358,14 +358,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 5842a43d1..b72d49542 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 479624fa8..0b339d7b8 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 06a8e4d9b..dcc155df9 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 07a23373d..8048f2f7c 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index fa57c6764..fbd0b05f5 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -150,14 +150,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 4168e442a..2ca3f0256 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 224fb9bdb..dc16d7c39 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 9118cc134..cb19a743c 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index ca6092df5..34b5f505f 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index ccba5e14d..6754cd231 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 4d5f11e2c..c433a3621 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -134,202 +134,202 @@ org.springframework.integration spring-integration-file - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-syslog - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-smb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jdbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jmx - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ws - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-redis - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-r2dbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-webflux - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-sftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-rsocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mqtt - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-event - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-kafka - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-groovy - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-cassandra - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-scripting - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xmpp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-websocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-graphql - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-feed - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jpa - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zeromq - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-http - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zookeeper - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ip - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-hazelcast - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test-support - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-amqp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mail - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-security - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-camel - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xml - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-core - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jms - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mongodb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stream - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stomp - 6.0.4 + 6.0.5 org.springframework.boot @@ -355,14 +355,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 99bffb33b..cd231d624 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -134,202 +134,202 @@ org.springframework.integration spring-integration-file - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-syslog - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-smb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jdbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jmx - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ws - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-redis - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-r2dbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-webflux - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-sftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-rsocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mqtt - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-event - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-kafka - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-groovy - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-cassandra - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-scripting - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xmpp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-websocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-graphql - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-feed - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jpa - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zeromq - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-http - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zookeeper - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ip - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-hazelcast - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test-support - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-amqp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mail - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-security - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-camel - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xml - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-core - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jms - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mongodb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stream - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stomp - 6.0.4 + 6.0.5 org.springframework.boot @@ -355,14 +355,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 08b7e5fb5..a0acd53c7 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index effa3be32..c9bbb76ef 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index c5ab23600..38a70f79c 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -122,202 +122,202 @@ org.springframework.integration spring-integration-file - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-syslog - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-smb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jdbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jmx - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ws - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-redis - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-r2dbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-webflux - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-sftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-rsocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mqtt - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-event - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-kafka - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-groovy - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-cassandra - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-scripting - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xmpp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-websocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-graphql - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-feed - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jpa - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zeromq - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-http - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zookeeper - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ip - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-hazelcast - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test-support - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-amqp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mail - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-security - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-camel - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xml - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-core - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jms - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mongodb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stream - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stomp - 6.0.4 + 6.0.5 org.springframework.boot @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index a3c040c13..1a37b2887 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index fdbcf7b19..90294cbb2 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 87006d1ab..a6dfd9c16 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 17d7e2204..22748b92b 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index dc5701ffb..44aab5a40 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -122,202 +122,202 @@ org.springframework.integration spring-integration-file - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-syslog - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-smb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jdbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jmx - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ws - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-redis - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-r2dbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-webflux - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-sftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-rsocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mqtt - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-event - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-kafka - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-groovy - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-cassandra - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-scripting - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xmpp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-websocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-graphql - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-feed - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jpa - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zeromq - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-http - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zookeeper - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ip - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-hazelcast - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test-support - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-amqp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mail - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-security - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-camel - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xml - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-core - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jms - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mongodb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stream - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stomp - 6.0.4 + 6.0.5 org.springframework.boot @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 818ef2d3b..47c2aa755 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index eadb5bb2e..71a9ceda7 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -122,202 +122,202 @@ org.springframework.integration spring-integration-file - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-syslog - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-smb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jdbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jmx - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ws - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-redis - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-r2dbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-webflux - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-sftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-rsocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mqtt - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-event - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-kafka - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-groovy - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-cassandra - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-scripting - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xmpp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-websocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-graphql - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-feed - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jpa - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zeromq - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-http - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zookeeper - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ip - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-hazelcast - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test-support - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-amqp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mail - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-security - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-camel - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xml - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-core - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jms - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mongodb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stream - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stomp - 6.0.4 + 6.0.5 org.springframework.boot @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 787e0c4e0..d7bc667c2 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -141,14 +141,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index cf7d54c81..69d657641 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -127,14 +127,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 2cfbd1260..f13012e02 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -117,202 +117,202 @@ org.springframework.integration spring-integration-file - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-syslog - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-smb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jdbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jmx - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ws - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-redis - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-r2dbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-webflux - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-sftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-rsocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mqtt - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-event - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-kafka - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-groovy - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-cassandra - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-scripting - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xmpp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-websocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-graphql - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-feed - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jpa - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zeromq - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-http - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zookeeper - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ip - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-hazelcast - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test-support - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-amqp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mail - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-security - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-camel - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xml - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-core - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jms - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mongodb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stream - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stomp - 6.0.4 + 6.0.5 org.springframework.boot @@ -338,14 +338,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 412a51423..e2cf5c7b8 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -168,14 +168,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 409276550..32826d81e 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 950c903b5..815444925 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 1c9eb8022..59787870c 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/build.gradle b/build.gradle index 0d7f73a18..b1424d6c4 100644 --- a/build.gradle +++ b/build.gradle @@ -260,12 +260,12 @@ subprojects { subproject -> postgresVersion = '42.5.4' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.1' - springIntegrationVersion = '6.0.4' + springIntegrationVersion = '6.0.5' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.0.7' - springSecurityVersion = '6.0.2' + springVersion = '6.0.8' + springSecurityVersion = '6.0.3' springWebFlowVersion = '2.4.8.RELEASE' testcontainersVersion = '1.17.6' tilesJspVersion = '2.2.1' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index c130d3242..b5e86790e 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -128,202 +128,202 @@ org.springframework.integration spring-integration-file - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-syslog - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-smb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jdbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jmx - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ws - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-redis - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-r2dbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-webflux - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-sftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-rsocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mqtt - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-event - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-kafka - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-groovy - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-cassandra - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-scripting - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xmpp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-websocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-graphql - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-feed - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jpa - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zeromq - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-http - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zookeeper - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ip - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-hazelcast - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test-support - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-amqp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mail - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-security - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-camel - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xml - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-core - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jms - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mongodb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stream - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stomp - 6.0.4 + 6.0.5 org.springframework.boot @@ -349,14 +349,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 7889751cb..be5a96cdc 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -128,202 +128,202 @@ org.springframework.integration spring-integration-file - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-syslog - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-smb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jdbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jmx - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ws - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-redis - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-r2dbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-webflux - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-sftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-rsocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mqtt - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-event - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-kafka - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-groovy - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-cassandra - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-scripting - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xmpp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-websocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-graphql - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-feed - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jpa - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zeromq - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-http - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zookeeper - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ip - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-hazelcast - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test-support - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-amqp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mail - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-security - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-camel - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xml - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-core - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jms - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mongodb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stream - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stomp - 6.0.4 + 6.0.5 org.springframework.boot @@ -349,14 +349,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index ed675c27f..af5ad2084 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -150,202 +150,202 @@ org.springframework.integration spring-integration-file - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-syslog - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-smb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jdbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jmx - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ws - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-redis - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-r2dbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-webflux - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-sftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-rsocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mqtt - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-event - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-kafka - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-groovy - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-cassandra - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-scripting - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xmpp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-websocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-graphql - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-feed - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jpa - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zeromq - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-http - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zookeeper - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ip - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-hazelcast - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test-support - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-amqp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mail - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-security - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-camel - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xml - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-core - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jms - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mongodb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stream - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stomp - 6.0.4 + 6.0.5 org.springframework.boot @@ -371,14 +371,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 1601e5640..a79c21f74 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index e3f8e36b8..810840fea 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 0646b89b9..a8d978eac 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 6a02072c7..e41a75414 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index b69374611..22207550f 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 74941c365..51c943814 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 949064bc4..ac70bcf74 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index af32a4e2d..8698a8a88 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -95,13 +95,13 @@ org.springframework.security spring-security-web - 6.0.2 + 6.0.3 compile org.springframework.security spring-security-config - 6.0.2 + 6.0.3 compile @@ -211,14 +211,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 0c2786c1d..4764dcfbb 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 9811dc5e6..335b57907 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index d8465f460..984cb196a 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index b3d436814..1722788ec 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index f7e413116..2c8aa0d42 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 7787aacf9..4bfddf16e 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -144,14 +144,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index a741f5f6d..902ce3c92 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -117,202 +117,202 @@ org.springframework.integration spring-integration-file - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-syslog - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-smb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jdbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jmx - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ws - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-redis - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-r2dbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-webflux - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-sftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-rsocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mqtt - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-event - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-kafka - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-groovy - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-cassandra - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-scripting - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xmpp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-websocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-graphql - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-feed - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jpa - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zeromq - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-http - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zookeeper - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ip - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-hazelcast - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test-support - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-amqp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mail - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-security - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-camel - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xml - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-core - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jms - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mongodb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stream - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stomp - 6.0.4 + 6.0.5 org.springframework.boot @@ -338,14 +338,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index d1c12e962..546647296 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index dad66fddf..c9a46a458 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -144,202 +144,202 @@ org.springframework.integration spring-integration-jdbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ws - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-redis - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-r2dbc - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-rsocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-event - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-cassandra - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-scripting - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-websocket - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-graphql - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jpa - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-http - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zookeeper - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ip - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mail - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-camel - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mongodb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stream - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-stomp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-file - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-syslog - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-smb - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jmx - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-webflux - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-sftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-mqtt - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-ftp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-kafka - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-groovy - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xmpp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-feed - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-zeromq - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-hazelcast - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-test-support - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-amqp - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-security - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-xml - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-core - 6.0.4 + 6.0.5 org.springframework.integration spring-integration-jms - 6.0.4 + 6.0.5 org.springframework.cloud @@ -372,14 +372,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 1a20acefb..c10240587 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -136,14 +136,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 46b150b36..a02e9df77 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.7 + 6.0.8 import pom org.springframework.integration spring-integration-bom - 6.0.4 + 6.0.5 import pom From 48b17463f5d3c7436f08069f5f086ad4f1b99705 Mon Sep 17 00:00:00 2001 From: abilan Date: Tue, 16 May 2023 17:50:10 -0400 Subject: [PATCH 323/356] Upgrade to Spring Integration 6.1.0 --- advanced/advanced-testing-examples/pom.xml | 14 +-- advanced/dynamic-ftp/pom.xml | 14 +-- advanced/dynamic-tcp-client/pom.xml | 101 +++++++++-------- applications/cafe-scripted/pom.xml | 16 +-- applications/cafe/cafe-amqp/pom.xml | 16 +-- applications/cafe/cafe-jms/pom.xml | 20 ++-- applications/cafe/cafe-si/pom.xml | 14 +-- applications/file-split-ftp/pom.xml | 101 +++++++++-------- applications/loan-broker/pom.xml | 14 +-- applications/loanshark/pom.xml | 28 ++--- applications/stomp-chat/pom.xml | 101 +++++++++-------- basic/amqp/pom.xml | 14 +-- basic/barrier/pom.xml | 101 +++++++++-------- basic/control-bus/pom.xml | 14 +-- basic/enricher/pom.xml | 14 +-- basic/feed/pom.xml | 14 +-- basic/file/pom.xml | 14 +-- basic/ftp/pom.xml | 14 +-- basic/helloworld/pom.xml | 14 +-- basic/http/pom.xml | 26 ++--- basic/jdbc/pom.xml | 14 +-- basic/jms/pom.xml | 18 +-- basic/jmx/pom.xml | 14 +-- basic/jpa/pom.xml | 101 +++++++++-------- basic/kafka/pom.xml | 103 +++++++++-------- basic/mail/pom.xml | 14 +-- basic/mongodb/pom.xml | 16 +-- basic/mqtt/pom.xml | 101 +++++++++-------- basic/oddeven/pom.xml | 14 +-- basic/quote/pom.xml | 14 +-- basic/sftp/pom.xml | 14 +-- basic/tcp-amqp/pom.xml | 14 +-- basic/tcp-broadcast/pom.xml | 101 +++++++++-------- .../tcpbroadcast/TcpBroadcastApplication.java | 5 +- basic/tcp-client-server/pom.xml | 14 +-- basic/tcp-with-headers/pom.xml | 101 +++++++++-------- basic/testing-examples/pom.xml | 14 +-- basic/twitter/pom.xml | 14 +-- basic/web-sockets/pom.xml | 101 +++++++++-------- basic/ws-inbound-gateway/pom.xml | 26 ++--- basic/ws-outbound-gateway/pom.xml | 14 +-- basic/xml/pom.xml | 14 +-- basic/xmpp/pom.xml | 14 +-- build.gradle | 44 ++++---- dsl/cafe-dsl/pom.xml | 103 +++++++++-------- .../samples/dsl/cafe/lambda/Application.java | 5 +- dsl/kafka-dsl/pom.xml | 103 +++++++++-------- dsl/si4demo/pom.xml | 101 +++++++++-------- gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.jar | Bin 59821 -> 62076 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 25 +++-- gradlew.bat | 15 ++- intermediate/async-gateway/pom.xml | 14 +-- intermediate/dynamic-poller/pom.xml | 14 +-- intermediate/errorhandling/pom.xml | 14 +-- intermediate/file-processing/pom.xml | 14 +-- intermediate/mail-attachments/pom.xml | 14 +-- intermediate/monitoring/pom.xml | 26 ++--- intermediate/multipart-http/pom.xml | 26 ++--- intermediate/rest-http/pom.xml | 30 ++--- intermediate/retry-and-more/pom.xml | 16 +-- .../splitter-aggregator-reaper/pom.xml | 14 +-- intermediate/stored-procedures-derby/pom.xml | 14 +-- intermediate/stored-procedures-ms/pom.xml | 14 +-- intermediate/stored-procedures-oracle/pom.xml | 14 +-- .../stored-procedures-postgresql/pom.xml | 16 +-- intermediate/tcp-async-bi-directional/pom.xml | 101 +++++++++-------- .../TcpAsyncBiDirectionalApplication.java | 14 ++- .../tcp-client-server-multiplex/pom.xml | 14 +-- intermediate/testcontainers-rabbitmq/pom.xml | 105 +++++++++--------- intermediate/travel/pom.xml | 14 +-- intermediate/tx-synch/pom.xml | 14 +-- 73 files changed, 1260 insertions(+), 1164 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 5d33b2939..d03ddd02a 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples advanced-testing-examples - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index f9c6573f1..7b56b5b04 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-ftp - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index bf625f93f..8834c1e06 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-tcp-client - 6.0.0 + 6.1.0 jar https://github.com/spring-projects/spring-integration-samples @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -117,235 +117,240 @@ org.springframework.integration spring-integration-file - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-syslog - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-smb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jdbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jmx - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ws - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-redis - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-r2dbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-webflux - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-sftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-rsocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mqtt - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-event - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-kafka - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-groovy - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-cassandra - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-scripting - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xmpp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-websocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-graphql - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-feed - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jpa - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zeromq - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-http - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zookeeper - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ip - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-hazelcast - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test-support - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-amqp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mail - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-security - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-camel - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xml - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-core - 6.0.5 + 6.1.0 + + + org.springframework.integration + spring-integration-zip + 6.1.0 org.springframework.integration spring-integration-jms - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mongodb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stream - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stomp - 6.0.5 + 6.1.0 org.springframework.boot spring-boot-dependencies - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT import pom org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom @@ -362,7 +367,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index a433ab1bb..53f0ca807 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-scripted - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -87,13 +87,13 @@ org.apache.groovy groovy-jsr223 - 4.0.10 + 4.0.12 compile org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -111,7 +111,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -145,28 +145,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 21d845d33..11c536df1 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-amqp - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -55,7 +55,7 @@ org.springframework.integration.samples cafe-si - 6.0.0 + 6.1.0 compile @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 3c53eca2a..acde52f04 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-jms - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -55,13 +55,13 @@ org.springframework.integration.samples cafe-si - 6.0.0 + 6.1.0 compile org.apache.activemq artemis-server - 2.27.1 + 2.28.0 compile @@ -73,7 +73,7 @@ org.apache.activemq artemis-jakarta-client - 2.27.1 + 2.28.0 compile @@ -90,7 +90,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -108,7 +108,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -142,28 +142,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 2884d1ca0..356e4c689 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-si - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -117,28 +117,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 25c53f0e2..02eec1a05 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file-split-ftp - 6.0.0 + 6.1.0 jar https://github.com/spring-projects/spring-integration-samples @@ -99,7 +99,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -144,235 +144,240 @@ org.springframework.integration spring-integration-file - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-syslog - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-smb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jdbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jmx - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ws - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-redis - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-r2dbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-webflux - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-sftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-rsocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mqtt - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-event - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-kafka - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-groovy - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-cassandra - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-scripting - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xmpp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-websocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-graphql - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-feed - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jpa - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zeromq - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-http - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zookeeper - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ip - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-hazelcast - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test-support - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-amqp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mail - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-security - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-camel - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xml - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-core - 6.0.5 + 6.1.0 + + + org.springframework.integration + spring-integration-zip + 6.1.0 org.springframework.integration spring-integration-jms - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mongodb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stream - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stomp - 6.0.5 + 6.1.0 org.springframework.boot spring-boot-dependencies - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT import pom org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom @@ -389,7 +394,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index e7eaf449c..85a36642b 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loan-broker - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 52d96dab4..bd233891d 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loanshark - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -167,7 +167,7 @@ org.hibernate.orm hibernate-core - 6.1.7.Final + 6.2.2.Final compile @@ -183,9 +183,9 @@ compile - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + 5.0.0 runtime @@ -199,9 +199,9 @@ - javax.websocket - javax.websocket-api - 1.0 + jakarta.websocket + jakarta.websocket-api + 2.0.0 runtime @@ -217,7 +217,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 runtime @@ -277,7 +277,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -311,28 +311,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 669daae78..83be2c490 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stomp-chat - 6.0.0 + 6.1.0 jar https://github.com/spring-projects/spring-integration-samples @@ -88,7 +88,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -127,235 +127,240 @@ org.springframework.integration spring-integration-file - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-syslog - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-smb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jdbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jmx - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ws - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-redis - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-r2dbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-webflux - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-sftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-rsocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mqtt - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-event - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-kafka - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-groovy - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-cassandra - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-scripting - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xmpp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-websocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-graphql - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-feed - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jpa - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zeromq - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-http - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zookeeper - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ip - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-hazelcast - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test-support - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-amqp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mail - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-security - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-camel - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xml - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-core - 6.0.5 + 6.1.0 + + + org.springframework.integration + spring-integration-zip + 6.1.0 org.springframework.integration spring-integration-jms - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mongodb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stream - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stomp - 6.0.5 + 6.1.0 org.springframework.boot spring-boot-dependencies - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT import pom org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom @@ -372,7 +377,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 16ba93787..8e5100e77 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples amqp - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index abeb7b555..9f09a78b5 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples barrier - 6.0.0 + 6.1.0 jar https://github.com/spring-projects/spring-integration-samples @@ -93,7 +93,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -137,235 +137,240 @@ org.springframework.integration spring-integration-file - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-syslog - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-smb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jdbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jmx - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ws - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-redis - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-r2dbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-webflux - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-sftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-rsocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mqtt - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-event - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-kafka - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-groovy - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-cassandra - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-scripting - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xmpp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-websocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-graphql - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-feed - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jpa - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zeromq - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-http - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zookeeper - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ip - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-hazelcast - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test-support - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-amqp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mail - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-security - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-camel - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xml - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-core - 6.0.5 + 6.1.0 + + + org.springframework.integration + spring-integration-zip + 6.1.0 org.springframework.integration spring-integration-jms - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mongodb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stream - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stomp - 6.0.5 + 6.1.0 org.springframework.boot spring-boot-dependencies - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT import pom org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom @@ -382,7 +387,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index b72d49542..c8a621acc 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples control-bus - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 0b339d7b8..68f62d5bc 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples enricher - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index dcc155df9..940f6470d 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples feed - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 8048f2f7c..9f79b4a21 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index fbd0b05f5..8e2155966 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ftp - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -96,7 +96,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,7 +112,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 test @@ -136,28 +136,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 2ca3f0256..9ceff2c4a 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples helloworld - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index dc16d7c39..a3b4e4a42 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples http - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -88,13 +88,13 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + 5.0.0 runtime @@ -108,9 +108,9 @@ - javax.websocket - javax.websocket-api - 1.0 + jakarta.websocket + jakarta.websocket-api + 2.0.0 runtime @@ -138,7 +138,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -172,28 +172,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index cb19a743c..a77b10562 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jdbc - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 34b5f505f..6a3dd9364 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jms - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -71,7 +71,7 @@ org.apache.activemq artemis-server - 2.27.1 + 2.28.0 compile @@ -83,13 +83,13 @@ org.apache.activemq artemis-jakarta-client - 2.27.1 + 2.28.0 compile org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -107,7 +107,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -141,28 +141,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 6754cd231..b15f45cc4 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jmx - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -117,28 +117,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index c433a3621..138327064 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jpa - 6.0.0 + 6.1.0 jar https://github.com/spring-projects/spring-integration-samples @@ -95,7 +95,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -134,235 +134,240 @@ org.springframework.integration spring-integration-file - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-syslog - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-smb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jdbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jmx - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ws - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-redis - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-r2dbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-webflux - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-sftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-rsocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mqtt - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-event - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-kafka - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-groovy - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-cassandra - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-scripting - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xmpp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-websocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-graphql - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-feed - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jpa - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zeromq - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-http - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zookeeper - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ip - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-hazelcast - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test-support - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-amqp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mail - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-security - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-camel - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xml - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-core - 6.0.5 + 6.1.0 + + + org.springframework.integration + spring-integration-zip + 6.1.0 org.springframework.integration spring-integration-jms - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mongodb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stream - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stomp - 6.0.5 + 6.1.0 org.springframework.boot spring-boot-dependencies - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT import pom org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom @@ -379,7 +384,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index cd231d624..c23f51f55 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples kafka - 6.0.0 + 6.1.0 jar https://github.com/spring-projects/spring-integration-samples @@ -77,7 +77,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -95,7 +95,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -134,235 +134,240 @@ org.springframework.integration spring-integration-file - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-syslog - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-smb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jdbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jmx - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ws - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-redis - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-r2dbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-webflux - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-sftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-rsocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mqtt - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-event - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-kafka - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-groovy - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-cassandra - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-scripting - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xmpp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-websocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-graphql - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-feed - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jpa - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zeromq - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-http - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zookeeper - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ip - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-hazelcast - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test-support - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-amqp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mail - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-security - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-camel - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xml - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-core - 6.0.5 + 6.1.0 + + + org.springframework.integration + spring-integration-zip + 6.1.0 org.springframework.integration spring-integration-jms - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mongodb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stream - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stomp - 6.0.5 + 6.1.0 org.springframework.boot spring-boot-dependencies - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT import pom org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom @@ -379,7 +384,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index a0acd53c7..0f39ce373 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index c9bbb76ef..098a37a56 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mongodb - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,13 +60,13 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile org.mongodb mongodb-driver-sync - 4.8.2 + 4.9.1 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 38a70f79c..bbbaf6431 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mqtt - 6.0.0 + 6.1.0 jar https://github.com/spring-projects/spring-integration-samples @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -122,235 +122,240 @@ org.springframework.integration spring-integration-file - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-syslog - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-smb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jdbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jmx - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ws - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-redis - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-r2dbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-webflux - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-sftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-rsocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mqtt - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-event - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-kafka - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-groovy - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-cassandra - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-scripting - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xmpp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-websocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-graphql - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-feed - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jpa - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zeromq - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-http - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zookeeper - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ip - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-hazelcast - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test-support - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-amqp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mail - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-security - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-camel - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xml - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-core - 6.0.5 + 6.1.0 + + + org.springframework.integration + spring-integration-zip + 6.1.0 org.springframework.integration spring-integration-jms - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mongodb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stream - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stomp - 6.0.5 + 6.1.0 org.springframework.boot spring-boot-dependencies - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT import pom org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom @@ -367,7 +372,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 1a37b2887..baa09f61c 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples oddeven - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 90294cbb2..db456b8ae 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples quote - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index a6dfd9c16..601236acd 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples sftp - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 22748b92b..419980153 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-amqp - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 runtime @@ -95,7 +95,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -129,28 +129,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 44aab5a40..ca169b7d0 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-broadcast - 6.0.0 + 6.1.0 jar https://github.com/spring-projects/spring-integration-samples @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -122,235 +122,240 @@ org.springframework.integration spring-integration-file - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-syslog - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-smb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jdbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jmx - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ws - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-redis - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-r2dbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-webflux - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-sftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-rsocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mqtt - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-event - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-kafka - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-groovy - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-cassandra - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-scripting - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xmpp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-websocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-graphql - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-feed - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jpa - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zeromq - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-http - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zookeeper - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ip - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-hazelcast - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test-support - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-amqp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mail - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-security - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-camel - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xml - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-core - 6.0.5 + 6.1.0 + + + org.springframework.integration + spring-integration-zip + 6.1.0 org.springframework.integration spring-integration-jms - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mongodb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stream - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stomp - 6.0.5 + 6.1.0 org.springframework.boot spring-boot-dependencies - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT import pom org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom @@ -367,7 +372,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java b/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java index 1d21bab2c..06c640884 100644 --- a/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java +++ b/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java @@ -38,6 +38,7 @@ import org.springframework.integration.dsl.IntegrationFlow; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.dsl.Tcp; +import org.springframework.integration.ip.dsl.TcpNetServerConnectionFactorySpec; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; import org.springframework.integration.ip.tcp.connection.TcpConnectionServerListeningEvent; import org.springframework.integration.ip.tcp.serializer.ByteArrayCrLfSerializer; @@ -63,8 +64,8 @@ public static class Config { * Server connection factory. */ @Bean - public AbstractServerConnectionFactory serverFactory() { - return Tcp.netServer(PORT).get(); + public TcpNetServerConnectionFactorySpec serverFactory() { + return Tcp.netServer(PORT); } /* diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 47c2aa755..e1657d078 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 71a9ceda7..aa20bdbe3 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-with-headers - 6.0.0 + 6.1.0 jar https://github.com/spring-projects/spring-integration-samples @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -122,235 +122,240 @@ org.springframework.integration spring-integration-file - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-syslog - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-smb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jdbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jmx - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ws - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-redis - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-r2dbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-webflux - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-sftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-rsocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mqtt - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-event - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-kafka - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-groovy - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-cassandra - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-scripting - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xmpp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-websocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-graphql - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-feed - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jpa - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zeromq - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-http - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zookeeper - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ip - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-hazelcast - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test-support - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-amqp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mail - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-security - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-camel - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xml - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-core - 6.0.5 + 6.1.0 + + + org.springframework.integration + spring-integration-zip + 6.1.0 org.springframework.integration spring-integration-jms - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mongodb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stream - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stomp - 6.0.5 + 6.1.0 org.springframework.boot spring-boot-dependencies - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT import pom org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom @@ -367,7 +372,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index d7bc667c2..c9dd54652 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testing-examples - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -93,7 +93,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -127,28 +127,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 69d657641..17bfb4473 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples twitter - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -61,7 +61,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -79,7 +79,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -113,28 +113,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index f13012e02..fbd0151bf 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples web-sockets - 6.0.0 + 6.1.0 jar https://github.com/spring-projects/spring-integration-samples @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -117,235 +117,240 @@ org.springframework.integration spring-integration-file - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-syslog - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-smb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jdbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jmx - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ws - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-redis - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-r2dbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-webflux - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-sftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-rsocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mqtt - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-event - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-kafka - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-groovy - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-cassandra - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-scripting - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xmpp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-websocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-graphql - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-feed - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jpa - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zeromq - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-http - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zookeeper - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ip - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-hazelcast - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test-support - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-amqp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mail - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-security - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-camel - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xml - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-core - 6.0.5 + 6.1.0 + + + org.springframework.integration + spring-integration-zip + 6.1.0 org.springframework.integration spring-integration-jms - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mongodb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stream - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stomp - 6.0.5 + 6.1.0 org.springframework.boot spring-boot-dependencies - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT import pom org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom @@ -362,7 +367,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index e2cf5c7b8..4829ae9df 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-inbound-gateway - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -70,13 +70,13 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + 5.0.0 runtime @@ -90,9 +90,9 @@ - javax.websocket - javax.websocket-api - 1.0 + jakarta.websocket + jakarta.websocket-api + 2.0.0 runtime @@ -120,7 +120,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -154,28 +154,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 32826d81e..4d933df3d 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-outbound-gateway - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -117,28 +117,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 815444925..6d8036eab 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xml - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 59787870c..8167f38e1 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xmpp - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/build.gradle b/build.gradle index b1424d6c4..c0921014b 100644 --- a/build.gradle +++ b/build.gradle @@ -9,11 +9,11 @@ buildscript { dependencies { classpath 'io.spring.gradle:dependency-management-plugin:1.1.0' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" - classpath 'gradle.plugin.org.gretty:gretty:2.3.1' + classpath 'org.gretty:gretty:4.0.3' } } plugins { - id 'org.sonarqube' version '2.8' + id 'org.sonarqube' version '4.0.0.2929' } description = 'Spring Integration Samples' @@ -221,7 +221,7 @@ subprojects { subproject -> ext { apacheSshdVersion = '2.9.2' - artemisVersion = '2.27.1' + artemisVersion = '2.28.0' aspectjVersion = '1.9.19' commonsDigesterVersion = '2.1' commonsDbcpVersion = '2.9.0' @@ -232,15 +232,14 @@ subprojects { subproject -> c3p0Version = '0.9.5.5' derbyVersion = '10.16.1.1' hamcrestVersion = '2.2' - hibernateVersion = '6.1.7.Final' + hibernateVersion = '6.2.2.Final' hibernateValidatorVersion = '8.0.0.Final' ftpServerVersion = '1.2.0' flexjsonVersion = '2.0' - groovyVersion = '4.0.10' + groovyVersion = '4.0.12' hsqldbVersion = '2.7.1' h2Version = '2.1.214' - jacksonVersion = '2.14.2' - mailVersion = '1.0.0' + jacksonVersion = '2.15.0' jaxbVersion = '4.0.2' jodaTimeVersion = '1.6' jtaVersion = '2.0.0' @@ -250,24 +249,25 @@ subprojects { subproject -> jpaApiVersion = '3.0.2' jstlVersion = '1.2' junitVersion = '4.13.2' - junitJupiterVersion = '5.9.2' + junitJupiterVersion = '5.9.3' jythonVersion = '2.7.3' - log4jVersion = '2.19.0' - mockitoVersion = '4.10.0' - mongoDriverVersion = '4.8.2' + log4jVersion = '2.20.0' + mailVersion = '1.0.0' + mockitoVersion = '5.3.1' + mongoDriverVersion = '4.9.1' openJpaVersion = '2.4.0' oracleDriverVersion = '19.3.0.0' - postgresVersion = '42.5.4' + postgresVersion = '42.6.0' slf4jVersion = '1.7.30' - springCloudVersion = '2022.0.1' - springIntegrationVersion = '6.0.5' + springCloudVersion = '2022.0.2' + springIntegrationVersion = '6.1.0' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.0.8' - springSecurityVersion = '6.0.3' + springVersion = '6.0.9' + springSecurityVersion = '6.1.0' springWebFlowVersion = '2.4.8.RELEASE' - testcontainersVersion = '1.17.6' + testcontainersVersion = '1.18.1' tilesJspVersion = '2.2.1' } @@ -306,14 +306,16 @@ subprojects { subproject -> [compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg] jacocoTestReport { + onlyIf { System.properties['sonar.host.url'] } + dependsOn test reports { - xml.enabled true - csv.enabled false - html.enabled false - xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml") + xml.required = true + html.required = false } } + rootProject.tasks['sonarqube'].dependsOn jacocoTestReport + test { useJUnitPlatform() // suppress all console output during testing unless running `gradle -i` diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index b5e86790e..50f9c18b6 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-dsl - 6.0.0 + 6.1.0 jar https://github.com/spring-projects/spring-integration-samples @@ -56,7 +56,7 @@ org.springframework.integration.samples cafe-si - 6.0.0 + 6.1.0 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -128,235 +128,240 @@ org.springframework.integration spring-integration-file - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-syslog - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-smb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jdbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jmx - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ws - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-redis - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-r2dbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-webflux - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-sftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-rsocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mqtt - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-event - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-kafka - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-groovy - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-cassandra - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-scripting - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xmpp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-websocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-graphql - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-feed - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jpa - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zeromq - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-http - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zookeeper - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ip - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-hazelcast - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test-support - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-amqp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mail - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-security - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-camel - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xml - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-core - 6.0.5 + 6.1.0 + + + org.springframework.integration + spring-integration-zip + 6.1.0 org.springframework.integration spring-integration-jms - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mongodb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stream - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stomp - 6.0.5 + 6.1.0 org.springframework.boot spring-boot-dependencies - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT import pom org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom @@ -373,7 +378,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java index 302e38e42..b059eb4bb 100644 --- a/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java +++ b/dsl/cafe-dsl/src/main/java/org/springframework/integration/samples/dsl/cafe/lambda/Application.java @@ -28,6 +28,7 @@ import org.springframework.integration.annotation.Gateway; import org.springframework.integration.annotation.MessagingGateway; import org.springframework.integration.dsl.IntegrationFlow; +import org.springframework.integration.dsl.PollerSpec; import org.springframework.integration.dsl.Pollers; import org.springframework.integration.samples.cafe.Delivery; import org.springframework.integration.samples.cafe.Drink; @@ -73,8 +74,8 @@ public interface Cafe { private final AtomicInteger coldDrinkCounter = new AtomicInteger(); @Bean(name = PollerMetadata.DEFAULT_POLLER) - public PollerMetadata poller() { - return Pollers.fixedDelay(1000).get(); + public PollerSpec poller() { + return Pollers.fixedDelay(1000); } @Bean diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index be5a96cdc..be0315fd0 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples kafka-dsl - 6.0.0 + 6.1.0 jar https://github.com/spring-projects/spring-integration-samples @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -128,235 +128,240 @@ org.springframework.integration spring-integration-file - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-syslog - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-smb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jdbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jmx - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ws - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-redis - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-r2dbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-webflux - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-sftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-rsocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mqtt - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-event - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-kafka - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-groovy - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-cassandra - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-scripting - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xmpp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-websocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-graphql - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-feed - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jpa - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zeromq - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-http - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zookeeper - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ip - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-hazelcast - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test-support - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-amqp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mail - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-security - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-camel - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xml - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-core - 6.0.5 + 6.1.0 + + + org.springframework.integration + spring-integration-zip + 6.1.0 org.springframework.integration spring-integration-jms - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mongodb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stream - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stomp - 6.0.5 + 6.1.0 org.springframework.boot spring-boot-dependencies - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT import pom org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom @@ -373,7 +378,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index af5ad2084..d68790f2c 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples si4demo - 6.0.0 + 6.1.0 jar https://github.com/spring-projects/spring-integration-samples @@ -111,7 +111,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -150,235 +150,240 @@ org.springframework.integration spring-integration-file - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-syslog - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-smb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jdbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jmx - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ws - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-redis - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-r2dbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-webflux - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-sftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-rsocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mqtt - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-event - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-kafka - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-groovy - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-cassandra - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-scripting - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xmpp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-websocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-graphql - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-feed - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jpa - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zeromq - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-http - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zookeeper - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ip - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-hazelcast - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test-support - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-amqp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mail - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-security - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-camel - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xml - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-core - 6.0.5 + 6.1.0 + + + org.springframework.integration + spring-integration-zip + 6.1.0 org.springframework.integration spring-integration-jms - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mongodb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stream - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stomp - 6.0.5 + 6.1.0 org.springframework.boot spring-boot-dependencies - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT import pom org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom @@ -395,7 +400,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/gradle.properties b/gradle.properties index 1d547b4be..eeabde2b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -version=6.0.0 -springBootVersion=3.0.5-SNAPSHOT +version=6.1.0 +springBootVersion=3.1.0-SNAPSHOT org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8 org.gradle.caching=true org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927a4d4fb3f96a785543079b8df6723c946b..c1962a79e29d3e0ab67b14947c167a862655af9b 100644 GIT binary patch delta 40199 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 delta 37942 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/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f93..6689b85be 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index a79c21f74..9a08290f7 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples async-gateway - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 810840fea..a20351da8 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-poller - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index a8d978eac..3eb7716c5 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples errorhandling - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index e41a75414..d3c1fc632 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file-processing - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 22207550f..14c715c7e 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail-attachments - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -77,7 +77,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -95,7 +95,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -129,28 +129,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 51c943814..ee83c34ce 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples monitoring - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -82,13 +82,13 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + 5.0.0 runtime @@ -102,9 +102,9 @@ - javax.websocket - javax.websocket-api - 1.0 + jakarta.websocket + jakarta.websocket-api + 2.0.0 runtime @@ -132,7 +132,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -166,28 +166,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index ac70bcf74..02261b36a 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples multipart-http - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -82,13 +82,13 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + 5.0.0 runtime @@ -102,9 +102,9 @@ - javax.websocket - javax.websocket-api - 1.0 + jakarta.websocket + jakarta.websocket-api + 2.0.0 runtime @@ -132,7 +132,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -166,28 +166,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 8698a8a88..cd185fd69 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples rest-http - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -95,19 +95,19 @@ org.springframework.security spring-security-web - 6.0.3 + 6.1.0 compile org.springframework.security spring-security-config - 6.0.3 + 6.1.0 compile org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -117,9 +117,9 @@ compile - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + 5.0.0 runtime @@ -133,9 +133,9 @@ - javax.websocket - javax.websocket-api - 1.0 + jakarta.websocket + jakarta.websocket-api + 2.0.0 runtime @@ -163,7 +163,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -197,28 +197,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 4764dcfbb..419cec0c1 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples retry-and-more - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -75,7 +75,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 compile @@ -93,7 +93,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -111,7 +111,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -145,28 +145,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 335b57907..72efe426f 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 984cb196a..fce7dfc3d 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-derby - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -72,7 +72,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -90,7 +90,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -124,28 +124,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 1722788ec..2522fa14d 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-ms - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -72,7 +72,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -90,7 +90,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -124,28 +124,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 2c8aa0d42..2b6f9147a 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-oracle - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 4bfddf16e..f0ada72f0 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-postgresql - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.postgresql postgresql - 42.5.4 + 42.6.0 compile @@ -78,7 +78,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -96,7 +96,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -130,28 +130,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 902ce3c92..ae31a5b35 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-async-bi-directional - 6.0.0 + 6.1.0 jar https://github.com/spring-projects/spring-integration-samples @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -117,235 +117,240 @@ org.springframework.integration spring-integration-file - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-syslog - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-smb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jdbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jmx - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ws - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-redis - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-r2dbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-webflux - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-sftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-rsocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mqtt - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-event - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-kafka - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-groovy - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-cassandra - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-scripting - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xmpp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-websocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-graphql - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-feed - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jpa - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zeromq - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-http - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zookeeper - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ip - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-hazelcast - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test-support - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-amqp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mail - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-security - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-camel - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xml - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-core - 6.0.5 + 6.1.0 + + + org.springframework.integration + spring-integration-zip + 6.1.0 org.springframework.integration spring-integration-jms - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mongodb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stream - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stomp - 6.0.5 + 6.1.0 org.springframework.boot spring-boot-dependencies - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT import pom org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom @@ -362,7 +367,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java b/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java index 41ab7fb3e..d1d594de5 100644 --- a/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java +++ b/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java @@ -30,6 +30,8 @@ import org.springframework.integration.dsl.Transformers; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.dsl.Tcp; +import org.springframework.integration.ip.dsl.TcpNetClientConnectionFactorySpec; +import org.springframework.integration.ip.dsl.TcpNetServerConnectionFactorySpec; import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; import org.springframework.integration.ip.tcp.connection.TcpConnectionCloseEvent; @@ -59,8 +61,8 @@ public static void main(String[] args) { class ClientPeer { @Bean - public AbstractClientConnectionFactory client1(SampleProperties properties) { - return Tcp.netClient("localhost", properties.getServerPort()).get(); + public TcpNetClientConnectionFactorySpec client1(SampleProperties properties) { + return Tcp.netClient("localhost", properties.getServerPort()); } @Bean @@ -80,8 +82,8 @@ public IntegrationFlow client1In(AbstractClientConnectionFactory client1) { } @Bean - public AbstractClientConnectionFactory client2(SampleProperties properties) { - return Tcp.netClient("localhost", properties.getServerPort()).get(); + public TcpNetClientConnectionFactorySpec client2(SampleProperties properties) { + return Tcp.netClient("localhost", properties.getServerPort()); } @Bean @@ -108,8 +110,8 @@ class ServerPeer { private final Set clients = ConcurrentHashMap.newKeySet(); @Bean - public AbstractServerConnectionFactory server(SampleProperties properties) { - return Tcp.netServer(properties.getServerPort()).get(); + public TcpNetServerConnectionFactorySpec server(SampleProperties properties) { + return Tcp.netServer(properties.getServerPort()); } @Bean diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 546647296..dfa5fc075 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index c9a46a458..bf30e71e9 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testcontainers-rabbitmq - 6.0.0 + 6.1.0 jar https://github.com/spring-projects/spring-integration-samples @@ -83,7 +83,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -114,7 +114,7 @@ org.testcontainers junit-jupiter - 1.17.6 + 1.18.1 test @@ -144,242 +144,247 @@ org.springframework.integration spring-integration-jdbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ws - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-redis - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-r2dbc - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-rsocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-event - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-cassandra - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-scripting - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-websocket - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-graphql - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jpa - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-http - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zookeeper - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ip - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mail - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-camel - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mongodb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stream - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-stomp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-file - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-syslog - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-smb - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-jmx - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-webflux - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-sftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-mqtt - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-ftp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-kafka - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-groovy - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xmpp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-feed - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-zeromq - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-hazelcast - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-test-support - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-amqp - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-security - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-xml - 6.0.5 + 6.1.0 org.springframework.integration spring-integration-core - 6.0.5 + 6.1.0 + + + org.springframework.integration + spring-integration-zip + 6.1.0 org.springframework.integration spring-integration-jms - 6.0.5 + 6.1.0 org.springframework.cloud spring-cloud-dependencies - 2022.0.1 + 2022.0.2 import pom org.springframework.boot spring-boot-dependencies - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT import pom org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom @@ -396,7 +401,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.5-SNAPSHOT + 3.1.0-SNAPSHOT diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index c10240587..3d6bb3846 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples travel - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -70,7 +70,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -88,7 +88,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -122,28 +122,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index a02e9df77..999e39d4f 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tx-synch - 6.0.0 + 6.1.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.19.0 + 2.20.0 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 4.10.0 + 5.3.1 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.9.2 + 5.9.3 import pom com.fasterxml.jackson jackson-bom - 2.14.2 + 2.15.0 import pom org.springframework spring-framework-bom - 6.0.8 + 6.0.9 import pom org.springframework.integration spring-integration-bom - 6.0.5 + 6.1.0 import pom From 0873d409438907d49270d4581bcd503d558c5254 Mon Sep 17 00:00:00 2001 From: abilan Date: Tue, 20 Jun 2023 15:05:37 -0400 Subject: [PATCH 324/356] Upgrade to Spring Integration 6.1.1 --- advanced/advanced-testing-examples/pom.xml | 4 +- advanced/dynamic-ftp/pom.xml | 4 +- advanced/dynamic-tcp-client/pom.xml | 90 +++++++++---------- applications/cafe-scripted/pom.xml | 4 +- applications/cafe/cafe-amqp/pom.xml | 4 +- applications/cafe/cafe-jms/pom.xml | 4 +- applications/cafe/cafe-si/pom.xml | 4 +- applications/file-split-ftp/pom.xml | 90 +++++++++---------- applications/loan-broker/pom.xml | 4 +- applications/loanshark/pom.xml | 4 +- applications/stomp-chat/pom.xml | 90 +++++++++---------- basic/amqp/pom.xml | 4 +- basic/barrier/pom.xml | 90 +++++++++---------- basic/control-bus/pom.xml | 4 +- basic/enricher/pom.xml | 4 +- basic/feed/pom.xml | 4 +- basic/file/pom.xml | 4 +- basic/ftp/pom.xml | 4 +- basic/helloworld/pom.xml | 4 +- basic/http/pom.xml | 4 +- basic/jdbc/pom.xml | 4 +- basic/jms/pom.xml | 4 +- basic/jmx/pom.xml | 4 +- basic/jpa/pom.xml | 90 +++++++++---------- basic/kafka/pom.xml | 90 +++++++++---------- basic/mail/pom.xml | 4 +- basic/mongodb/pom.xml | 4 +- basic/mqtt/pom.xml | 90 +++++++++---------- basic/oddeven/pom.xml | 4 +- basic/quote/pom.xml | 4 +- basic/sftp/pom.xml | 4 +- basic/tcp-amqp/pom.xml | 4 +- basic/tcp-broadcast/pom.xml | 90 +++++++++---------- basic/tcp-client-server/pom.xml | 4 +- basic/tcp-with-headers/pom.xml | 90 +++++++++---------- basic/testing-examples/pom.xml | 4 +- basic/twitter/pom.xml | 4 +- basic/web-sockets/pom.xml | 90 +++++++++---------- basic/ws-inbound-gateway/pom.xml | 4 +- basic/ws-outbound-gateway/pom.xml | 4 +- basic/xml/pom.xml | 4 +- basic/xmpp/pom.xml | 4 +- build.gradle | 6 +- dsl/cafe-dsl/pom.xml | 90 +++++++++---------- dsl/kafka-dsl/pom.xml | 90 +++++++++---------- dsl/si4demo/pom.xml | 90 +++++++++---------- gradle.properties | 2 +- intermediate/async-gateway/pom.xml | 4 +- intermediate/dynamic-poller/pom.xml | 4 +- intermediate/errorhandling/pom.xml | 4 +- intermediate/file-processing/pom.xml | 4 +- intermediate/mail-attachments/pom.xml | 4 +- intermediate/monitoring/pom.xml | 4 +- intermediate/multipart-http/pom.xml | 4 +- intermediate/rest-http/pom.xml | 8 +- intermediate/retry-and-more/pom.xml | 4 +- .../splitter-aggregator-reaper/pom.xml | 4 +- intermediate/stored-procedures-derby/pom.xml | 4 +- intermediate/stored-procedures-ms/pom.xml | 4 +- intermediate/stored-procedures-oracle/pom.xml | 4 +- .../stored-procedures-postgresql/pom.xml | 4 +- intermediate/tcp-async-bi-directional/pom.xml | 90 +++++++++---------- .../tcp-client-server-multiplex/pom.xml | 4 +- intermediate/testcontainers-rabbitmq/pom.xml | 90 +++++++++---------- intermediate/travel/pom.xml | 4 +- intermediate/tx-synch/pom.xml | 4 +- 66 files changed, 779 insertions(+), 779 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index d03ddd02a..d798db545 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 7b56b5b04..64abe5d5b 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 8834c1e06..a3a56b804 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -117,212 +117,212 @@ org.springframework.integration spring-integration-file - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-syslog - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-smb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jdbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jmx - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ws - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-redis - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-r2dbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-webflux - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-sftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-rsocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mqtt - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-event - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-kafka - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-groovy - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-cassandra - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-scripting - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xmpp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-websocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-graphql - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-feed - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jpa - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zeromq - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-http - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zookeeper - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-hazelcast - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test-support - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-amqp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mail - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-security - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-camel - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xml - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-core - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jms - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mongodb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stream - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stomp - 6.1.0 + 6.1.1 org.springframework.boot spring-boot-dependencies - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT import pom @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom @@ -367,7 +367,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 53f0ca807..dae804434 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 11c536df1..795139cea 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index acde52f04..ccfa14648 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -156,14 +156,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 356e4c689..637278536 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 02eec1a05..b07ddb107 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -144,212 +144,212 @@ org.springframework.integration spring-integration-file - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-syslog - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-smb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jdbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jmx - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ws - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-redis - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-r2dbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-webflux - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-sftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-rsocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mqtt - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-event - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-kafka - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-groovy - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-cassandra - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-scripting - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xmpp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-websocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-graphql - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-feed - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jpa - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zeromq - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-http - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zookeeper - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-hazelcast - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test-support - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-amqp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mail - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-security - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-camel - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xml - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-core - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jms - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mongodb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stream - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stomp - 6.1.0 + 6.1.1 org.springframework.boot spring-boot-dependencies - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT import pom @@ -370,14 +370,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom @@ -394,7 +394,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 85a36642b..12adba3a1 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index bd233891d..bd93aab67 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -325,14 +325,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 83be2c490..915940a8b 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -127,212 +127,212 @@ org.springframework.integration spring-integration-file - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-syslog - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-smb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jdbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jmx - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ws - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-redis - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-r2dbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-webflux - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-sftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-rsocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mqtt - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-event - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-kafka - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-groovy - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-cassandra - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-scripting - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xmpp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-websocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-graphql - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-feed - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jpa - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zeromq - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-http - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zookeeper - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-hazelcast - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test-support - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-amqp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mail - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-security - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-camel - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xml - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-core - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jms - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mongodb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stream - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stomp - 6.1.0 + 6.1.1 org.springframework.boot spring-boot-dependencies - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT import pom @@ -353,14 +353,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom @@ -377,7 +377,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 8e5100e77..3556cf309 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 9f09a78b5..31ab4f3ed 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -137,212 +137,212 @@ org.springframework.integration spring-integration-file - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-syslog - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-smb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jdbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jmx - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ws - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-redis - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-r2dbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-webflux - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-sftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-rsocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mqtt - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-event - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-kafka - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-groovy - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-cassandra - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-scripting - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xmpp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-websocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-graphql - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-feed - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jpa - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zeromq - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-http - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zookeeper - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-hazelcast - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test-support - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-amqp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mail - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-security - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-camel - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xml - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-core - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jms - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mongodb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stream - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stomp - 6.1.0 + 6.1.1 org.springframework.boot spring-boot-dependencies - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT import pom @@ -363,14 +363,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom @@ -387,7 +387,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index c8a621acc..14fab6dbb 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 68f62d5bc..4dcaaa553 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 940f6470d..51ae5134b 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 9f79b4a21..ad3afa5a1 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 8e2155966..f8866029b 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -150,14 +150,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 9ceff2c4a..5925229e6 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index a3b4e4a42..c10059282 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index a77b10562..c7929a5ed 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 6a3dd9364..e37ab1826 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index b15f45cc4..1ffdac921 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 138327064..513dfa853 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -134,212 +134,212 @@ org.springframework.integration spring-integration-file - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-syslog - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-smb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jdbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jmx - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ws - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-redis - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-r2dbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-webflux - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-sftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-rsocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mqtt - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-event - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-kafka - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-groovy - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-cassandra - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-scripting - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xmpp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-websocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-graphql - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-feed - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jpa - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zeromq - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-http - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zookeeper - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-hazelcast - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test-support - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-amqp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mail - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-security - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-camel - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xml - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-core - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jms - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mongodb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stream - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stomp - 6.1.0 + 6.1.1 org.springframework.boot spring-boot-dependencies - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT import pom @@ -360,14 +360,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom @@ -384,7 +384,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index c23f51f55..14bdc7b36 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -134,212 +134,212 @@ org.springframework.integration spring-integration-file - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-syslog - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-smb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jdbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jmx - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ws - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-redis - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-r2dbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-webflux - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-sftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-rsocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mqtt - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-event - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-kafka - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-groovy - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-cassandra - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-scripting - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xmpp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-websocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-graphql - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-feed - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jpa - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zeromq - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-http - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zookeeper - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-hazelcast - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test-support - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-amqp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mail - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-security - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-camel - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xml - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-core - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jms - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mongodb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stream - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stomp - 6.1.0 + 6.1.1 org.springframework.boot spring-boot-dependencies - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT import pom @@ -360,14 +360,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom @@ -384,7 +384,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 0f39ce373..a9275920b 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 098a37a56..325e84fca 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index bbbaf6431..a9fa605ce 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -122,212 +122,212 @@ org.springframework.integration spring-integration-file - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-syslog - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-smb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jdbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jmx - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ws - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-redis - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-r2dbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-webflux - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-sftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-rsocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mqtt - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-event - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-kafka - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-groovy - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-cassandra - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-scripting - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xmpp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-websocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-graphql - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-feed - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jpa - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zeromq - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-http - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zookeeper - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-hazelcast - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test-support - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-amqp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mail - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-security - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-camel - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xml - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-core - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jms - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mongodb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stream - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stomp - 6.1.0 + 6.1.1 org.springframework.boot spring-boot-dependencies - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT import pom @@ -348,14 +348,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom @@ -372,7 +372,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index baa09f61c..83b66a456 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index db456b8ae..cdb6c9513 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 601236acd..f4164b92f 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 419980153..a60f44738 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index ca169b7d0..95e5555df 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -122,212 +122,212 @@ org.springframework.integration spring-integration-file - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-syslog - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-smb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jdbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jmx - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ws - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-redis - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-r2dbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-webflux - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-sftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-rsocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mqtt - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-event - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-kafka - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-groovy - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-cassandra - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-scripting - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xmpp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-websocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-graphql - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-feed - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jpa - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zeromq - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-http - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zookeeper - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-hazelcast - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test-support - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-amqp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mail - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-security - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-camel - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xml - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-core - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jms - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mongodb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stream - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stomp - 6.1.0 + 6.1.1 org.springframework.boot spring-boot-dependencies - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT import pom @@ -348,14 +348,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom @@ -372,7 +372,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index e1657d078..d2d0f7e61 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index aa20bdbe3..98c517b2a 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -122,212 +122,212 @@ org.springframework.integration spring-integration-file - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-syslog - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-smb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jdbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jmx - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ws - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-redis - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-r2dbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-webflux - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-sftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-rsocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mqtt - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-event - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-kafka - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-groovy - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-cassandra - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-scripting - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xmpp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-websocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-graphql - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-feed - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jpa - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zeromq - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-http - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zookeeper - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-hazelcast - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test-support - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-amqp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mail - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-security - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-camel - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xml - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-core - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jms - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mongodb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stream - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stomp - 6.1.0 + 6.1.1 org.springframework.boot spring-boot-dependencies - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT import pom @@ -348,14 +348,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom @@ -372,7 +372,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index c9dd54652..581f9cdb1 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -141,14 +141,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 17bfb4473..7289d340c 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -127,14 +127,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index fbd0151bf..034f4dfdd 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -117,212 +117,212 @@ org.springframework.integration spring-integration-file - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-syslog - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-smb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jdbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jmx - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ws - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-redis - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-r2dbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-webflux - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-sftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-rsocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mqtt - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-event - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-kafka - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-groovy - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-cassandra - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-scripting - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xmpp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-websocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-graphql - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-feed - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jpa - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zeromq - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-http - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zookeeper - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-hazelcast - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test-support - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-amqp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mail - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-security - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-camel - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xml - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-core - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jms - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mongodb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stream - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stomp - 6.1.0 + 6.1.1 org.springframework.boot spring-boot-dependencies - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT import pom @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom @@ -367,7 +367,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 4829ae9df..c83544d90 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -168,14 +168,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 4d933df3d..6a25fbe19 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 6d8036eab..0c91ec978 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 8167f38e1..7c7d5faf5 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/build.gradle b/build.gradle index c0921014b..c49275c83 100644 --- a/build.gradle +++ b/build.gradle @@ -260,12 +260,12 @@ subprojects { subproject -> postgresVersion = '42.6.0' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.2' - springIntegrationVersion = '6.1.0' + springIntegrationVersion = '6.1.1' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.0.9' - springSecurityVersion = '6.1.0' + springVersion = '6.0.10' + springSecurityVersion = '6.1.1' springWebFlowVersion = '2.4.8.RELEASE' testcontainersVersion = '1.18.1' tilesJspVersion = '2.2.1' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 50f9c18b6..4860443a8 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -128,212 +128,212 @@ org.springframework.integration spring-integration-file - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-syslog - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-smb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jdbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jmx - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ws - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-redis - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-r2dbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-webflux - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-sftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-rsocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mqtt - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-event - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-kafka - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-groovy - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-cassandra - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-scripting - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xmpp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-websocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-graphql - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-feed - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jpa - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zeromq - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-http - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zookeeper - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-hazelcast - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test-support - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-amqp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mail - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-security - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-camel - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xml - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-core - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jms - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mongodb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stream - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stomp - 6.1.0 + 6.1.1 org.springframework.boot spring-boot-dependencies - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT import pom @@ -354,14 +354,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom @@ -378,7 +378,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index be0315fd0..2a2c828ce 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -128,212 +128,212 @@ org.springframework.integration spring-integration-file - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-syslog - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-smb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jdbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jmx - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ws - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-redis - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-r2dbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-webflux - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-sftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-rsocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mqtt - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-event - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-kafka - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-groovy - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-cassandra - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-scripting - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xmpp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-websocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-graphql - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-feed - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jpa - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zeromq - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-http - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zookeeper - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-hazelcast - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test-support - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-amqp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mail - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-security - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-camel - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xml - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-core - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jms - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mongodb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stream - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stomp - 6.1.0 + 6.1.1 org.springframework.boot spring-boot-dependencies - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT import pom @@ -354,14 +354,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom @@ -378,7 +378,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index d68790f2c..94191d3e4 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -150,212 +150,212 @@ org.springframework.integration spring-integration-file - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-syslog - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-smb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jdbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jmx - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ws - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-redis - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-r2dbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-webflux - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-sftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-rsocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mqtt - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-event - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-kafka - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-groovy - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-cassandra - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-scripting - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xmpp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-websocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-graphql - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-feed - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jpa - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zeromq - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-http - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zookeeper - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-hazelcast - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test-support - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-amqp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mail - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-security - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-camel - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xml - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-core - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jms - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mongodb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stream - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stomp - 6.1.0 + 6.1.1 org.springframework.boot spring-boot-dependencies - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT import pom @@ -376,14 +376,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom @@ -400,7 +400,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/gradle.properties b/gradle.properties index eeabde2b8..45f8815bc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ version=6.1.0 -springBootVersion=3.1.0-SNAPSHOT +springBootVersion=3.1.1-SNAPSHOT org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8 org.gradle.caching=true org.gradle.parallel=true diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 9a08290f7..532ebf70a 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index a20351da8..3b7ab32a5 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 3eb7716c5..2997e8555 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index d3c1fc632..4590c980c 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 14c715c7e..8150979ac 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index ee83c34ce..2bcd45701 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 02261b36a..99812e82d 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index cd185fd69..b09cd71eb 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -95,13 +95,13 @@ org.springframework.security spring-security-web - 6.1.0 + 6.1.1 compile org.springframework.security spring-security-config - 6.1.0 + 6.1.1 compile @@ -211,14 +211,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 419cec0c1..3e632c1ec 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 72efe426f..76b1a542f 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index fce7dfc3d..8b6304137 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 2522fa14d..c41e9f8b9 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 2b6f9147a..cbc69ddac 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index f0ada72f0..d48ca19f0 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -144,14 +144,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index ae31a5b35..05d19f0c9 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -117,212 +117,212 @@ org.springframework.integration spring-integration-file - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-syslog - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-smb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jdbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jmx - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ws - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-redis - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-r2dbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-webflux - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-sftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-rsocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mqtt - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-event - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-kafka - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-groovy - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-cassandra - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-scripting - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xmpp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-websocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-graphql - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-feed - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jpa - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zeromq - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-http - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zookeeper - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-hazelcast - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test-support - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-amqp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mail - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-security - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-camel - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xml - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-core - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jms - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mongodb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stream - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stomp - 6.1.0 + 6.1.1 org.springframework.boot spring-boot-dependencies - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT import pom @@ -343,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom @@ -367,7 +367,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index dfa5fc075..c431ee356 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index bf30e71e9..9686063f5 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -144,207 +144,207 @@ org.springframework.integration spring-integration-jdbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ws - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-redis - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-r2dbc - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-rsocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-event - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-cassandra - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-scripting - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-websocket - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-graphql - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jpa - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-http - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zookeeper - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mail - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-camel - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mongodb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stream - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-stomp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-file - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-syslog - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-smb - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jmx - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-webflux - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-sftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-mqtt - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-ftp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-kafka - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-groovy - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xmpp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-feed - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zeromq - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-hazelcast - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-test-support - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-amqp - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-security - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-xml - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-core - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-zip - 6.1.0 + 6.1.1 org.springframework.integration spring-integration-jms - 6.1.0 + 6.1.1 org.springframework.cloud @@ -356,7 +356,7 @@ org.springframework.boot spring-boot-dependencies - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT import pom @@ -377,14 +377,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom @@ -401,7 +401,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.0-SNAPSHOT + 3.1.1-SNAPSHOT diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 3d6bb3846..0db615e97 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -136,14 +136,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 999e39d4f..0d7a6a62c 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.9 + 6.0.10 import pom org.springframework.integration spring-integration-bom - 6.1.0 + 6.1.1 import pom From 7704dce37f0a5e464cc749a6b25af7532a8a363a Mon Sep 17 00:00:00 2001 From: abilan Date: Mon, 10 Jul 2023 12:00:29 -0400 Subject: [PATCH 325/356] Upgrade to H2 `2.2.220` --- advanced/dynamic-tcp-client/pom.xml | 205 ----------------- applications/file-split-ftp/pom.xml | 205 ----------------- applications/stomp-chat/pom.xml | 205 ----------------- basic/barrier/pom.xml | 205 ----------------- basic/enricher/pom.xml | 2 +- basic/jdbc/pom.xml | 2 +- basic/jpa/pom.xml | 207 +----------------- basic/kafka/pom.xml | 205 ----------------- basic/mqtt/pom.xml | 205 ----------------- basic/tcp-broadcast/pom.xml | 205 ----------------- basic/tcp-with-headers/pom.xml | 205 ----------------- basic/web-sockets/pom.xml | 205 ----------------- build.gradle | 2 +- dsl/cafe-dsl/pom.xml | 205 ----------------- dsl/kafka-dsl/pom.xml | 205 ----------------- dsl/si4demo/pom.xml | 205 ----------------- intermediate/tcp-async-bi-directional/pom.xml | 205 ----------------- intermediate/testcontainers-rabbitmq/pom.xml | 205 ----------------- intermediate/tx-synch/pom.xml | 2 +- 19 files changed, 5 insertions(+), 3080 deletions(-) diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index a3a56b804..0cbae3520 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -114,211 +114,6 @@ - - org.springframework.integration - spring-integration-file - 6.1.1 - - - org.springframework.integration - spring-integration-syslog - 6.1.1 - - - org.springframework.integration - spring-integration-smb - 6.1.1 - - - org.springframework.integration - spring-integration-jdbc - 6.1.1 - - - org.springframework.integration - spring-integration-jmx - 6.1.1 - - - org.springframework.integration - spring-integration-ws - 6.1.1 - - - org.springframework.integration - spring-integration-redis - 6.1.1 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.1 - - - org.springframework.integration - spring-integration-webflux - 6.1.1 - - - org.springframework.integration - spring-integration-sftp - 6.1.1 - - - org.springframework.integration - spring-integration-rsocket - 6.1.1 - - - org.springframework.integration - spring-integration-mqtt - 6.1.1 - - - org.springframework.integration - spring-integration-event - 6.1.1 - - - org.springframework.integration - spring-integration-ftp - 6.1.1 - - - org.springframework.integration - spring-integration-kafka - 6.1.1 - - - org.springframework.integration - spring-integration-groovy - 6.1.1 - - - org.springframework.integration - spring-integration-cassandra - 6.1.1 - - - org.springframework.integration - spring-integration-scripting - 6.1.1 - - - org.springframework.integration - spring-integration-xmpp - 6.1.1 - - - org.springframework.integration - spring-integration-websocket - 6.1.1 - - - org.springframework.integration - spring-integration-graphql - 6.1.1 - - - org.springframework.integration - spring-integration-feed - 6.1.1 - - - org.springframework.integration - spring-integration-jpa - 6.1.1 - - - org.springframework.integration - spring-integration-test - 6.1.1 - - - org.springframework.integration - spring-integration-zeromq - 6.1.1 - - - org.springframework.integration - spring-integration-http - 6.1.1 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.1 - - - org.springframework.integration - spring-integration-ip - 6.1.1 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.1 - - - org.springframework.integration - spring-integration-test-support - 6.1.1 - - - org.springframework.integration - spring-integration-amqp - 6.1.1 - - - org.springframework.integration - spring-integration-mail - 6.1.1 - - - org.springframework.integration - spring-integration-security - 6.1.1 - - - org.springframework.integration - spring-integration-camel - 6.1.1 - - - org.springframework.integration - spring-integration-xml - 6.1.1 - - - org.springframework.integration - spring-integration-core - 6.1.1 - - - org.springframework.integration - spring-integration-zip - 6.1.1 - - - org.springframework.integration - spring-integration-jms - 6.1.1 - - - org.springframework.integration - spring-integration-mongodb - 6.1.1 - - - org.springframework.integration - spring-integration-stream - 6.1.1 - - - org.springframework.integration - spring-integration-stomp - 6.1.1 - org.springframework.boot spring-boot-dependencies diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index b07ddb107..660ec96df 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -141,211 +141,6 @@ - - org.springframework.integration - spring-integration-file - 6.1.1 - - - org.springframework.integration - spring-integration-syslog - 6.1.1 - - - org.springframework.integration - spring-integration-smb - 6.1.1 - - - org.springframework.integration - spring-integration-jdbc - 6.1.1 - - - org.springframework.integration - spring-integration-jmx - 6.1.1 - - - org.springframework.integration - spring-integration-ws - 6.1.1 - - - org.springframework.integration - spring-integration-redis - 6.1.1 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.1 - - - org.springframework.integration - spring-integration-webflux - 6.1.1 - - - org.springframework.integration - spring-integration-sftp - 6.1.1 - - - org.springframework.integration - spring-integration-rsocket - 6.1.1 - - - org.springframework.integration - spring-integration-mqtt - 6.1.1 - - - org.springframework.integration - spring-integration-event - 6.1.1 - - - org.springframework.integration - spring-integration-ftp - 6.1.1 - - - org.springframework.integration - spring-integration-kafka - 6.1.1 - - - org.springframework.integration - spring-integration-groovy - 6.1.1 - - - org.springframework.integration - spring-integration-cassandra - 6.1.1 - - - org.springframework.integration - spring-integration-scripting - 6.1.1 - - - org.springframework.integration - spring-integration-xmpp - 6.1.1 - - - org.springframework.integration - spring-integration-websocket - 6.1.1 - - - org.springframework.integration - spring-integration-graphql - 6.1.1 - - - org.springframework.integration - spring-integration-feed - 6.1.1 - - - org.springframework.integration - spring-integration-jpa - 6.1.1 - - - org.springframework.integration - spring-integration-test - 6.1.1 - - - org.springframework.integration - spring-integration-zeromq - 6.1.1 - - - org.springframework.integration - spring-integration-http - 6.1.1 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.1 - - - org.springframework.integration - spring-integration-ip - 6.1.1 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.1 - - - org.springframework.integration - spring-integration-test-support - 6.1.1 - - - org.springframework.integration - spring-integration-amqp - 6.1.1 - - - org.springframework.integration - spring-integration-mail - 6.1.1 - - - org.springframework.integration - spring-integration-security - 6.1.1 - - - org.springframework.integration - spring-integration-camel - 6.1.1 - - - org.springframework.integration - spring-integration-xml - 6.1.1 - - - org.springframework.integration - spring-integration-core - 6.1.1 - - - org.springframework.integration - spring-integration-zip - 6.1.1 - - - org.springframework.integration - spring-integration-jms - 6.1.1 - - - org.springframework.integration - spring-integration-mongodb - 6.1.1 - - - org.springframework.integration - spring-integration-stream - 6.1.1 - - - org.springframework.integration - spring-integration-stomp - 6.1.1 - org.springframework.boot spring-boot-dependencies diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 915940a8b..d64c504b8 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -124,211 +124,6 @@ - - org.springframework.integration - spring-integration-file - 6.1.1 - - - org.springframework.integration - spring-integration-syslog - 6.1.1 - - - org.springframework.integration - spring-integration-smb - 6.1.1 - - - org.springframework.integration - spring-integration-jdbc - 6.1.1 - - - org.springframework.integration - spring-integration-jmx - 6.1.1 - - - org.springframework.integration - spring-integration-ws - 6.1.1 - - - org.springframework.integration - spring-integration-redis - 6.1.1 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.1 - - - org.springframework.integration - spring-integration-webflux - 6.1.1 - - - org.springframework.integration - spring-integration-sftp - 6.1.1 - - - org.springframework.integration - spring-integration-rsocket - 6.1.1 - - - org.springframework.integration - spring-integration-mqtt - 6.1.1 - - - org.springframework.integration - spring-integration-event - 6.1.1 - - - org.springframework.integration - spring-integration-ftp - 6.1.1 - - - org.springframework.integration - spring-integration-kafka - 6.1.1 - - - org.springframework.integration - spring-integration-groovy - 6.1.1 - - - org.springframework.integration - spring-integration-cassandra - 6.1.1 - - - org.springframework.integration - spring-integration-scripting - 6.1.1 - - - org.springframework.integration - spring-integration-xmpp - 6.1.1 - - - org.springframework.integration - spring-integration-websocket - 6.1.1 - - - org.springframework.integration - spring-integration-graphql - 6.1.1 - - - org.springframework.integration - spring-integration-feed - 6.1.1 - - - org.springframework.integration - spring-integration-jpa - 6.1.1 - - - org.springframework.integration - spring-integration-test - 6.1.1 - - - org.springframework.integration - spring-integration-zeromq - 6.1.1 - - - org.springframework.integration - spring-integration-http - 6.1.1 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.1 - - - org.springframework.integration - spring-integration-ip - 6.1.1 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.1 - - - org.springframework.integration - spring-integration-test-support - 6.1.1 - - - org.springframework.integration - spring-integration-amqp - 6.1.1 - - - org.springframework.integration - spring-integration-mail - 6.1.1 - - - org.springframework.integration - spring-integration-security - 6.1.1 - - - org.springframework.integration - spring-integration-camel - 6.1.1 - - - org.springframework.integration - spring-integration-xml - 6.1.1 - - - org.springframework.integration - spring-integration-core - 6.1.1 - - - org.springframework.integration - spring-integration-zip - 6.1.1 - - - org.springframework.integration - spring-integration-jms - 6.1.1 - - - org.springframework.integration - spring-integration-mongodb - 6.1.1 - - - org.springframework.integration - spring-integration-stream - 6.1.1 - - - org.springframework.integration - spring-integration-stomp - 6.1.1 - org.springframework.boot spring-boot-dependencies diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 31ab4f3ed..a38eb89bc 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -134,211 +134,6 @@ - - org.springframework.integration - spring-integration-file - 6.1.1 - - - org.springframework.integration - spring-integration-syslog - 6.1.1 - - - org.springframework.integration - spring-integration-smb - 6.1.1 - - - org.springframework.integration - spring-integration-jdbc - 6.1.1 - - - org.springframework.integration - spring-integration-jmx - 6.1.1 - - - org.springframework.integration - spring-integration-ws - 6.1.1 - - - org.springframework.integration - spring-integration-redis - 6.1.1 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.1 - - - org.springframework.integration - spring-integration-webflux - 6.1.1 - - - org.springframework.integration - spring-integration-sftp - 6.1.1 - - - org.springframework.integration - spring-integration-rsocket - 6.1.1 - - - org.springframework.integration - spring-integration-mqtt - 6.1.1 - - - org.springframework.integration - spring-integration-event - 6.1.1 - - - org.springframework.integration - spring-integration-ftp - 6.1.1 - - - org.springframework.integration - spring-integration-kafka - 6.1.1 - - - org.springframework.integration - spring-integration-groovy - 6.1.1 - - - org.springframework.integration - spring-integration-cassandra - 6.1.1 - - - org.springframework.integration - spring-integration-scripting - 6.1.1 - - - org.springframework.integration - spring-integration-xmpp - 6.1.1 - - - org.springframework.integration - spring-integration-websocket - 6.1.1 - - - org.springframework.integration - spring-integration-graphql - 6.1.1 - - - org.springframework.integration - spring-integration-feed - 6.1.1 - - - org.springframework.integration - spring-integration-jpa - 6.1.1 - - - org.springframework.integration - spring-integration-test - 6.1.1 - - - org.springframework.integration - spring-integration-zeromq - 6.1.1 - - - org.springframework.integration - spring-integration-http - 6.1.1 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.1 - - - org.springframework.integration - spring-integration-ip - 6.1.1 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.1 - - - org.springframework.integration - spring-integration-test-support - 6.1.1 - - - org.springframework.integration - spring-integration-amqp - 6.1.1 - - - org.springframework.integration - spring-integration-mail - 6.1.1 - - - org.springframework.integration - spring-integration-security - 6.1.1 - - - org.springframework.integration - spring-integration-camel - 6.1.1 - - - org.springframework.integration - spring-integration-xml - 6.1.1 - - - org.springframework.integration - spring-integration-core - 6.1.1 - - - org.springframework.integration - spring-integration-zip - 6.1.1 - - - org.springframework.integration - spring-integration-jms - 6.1.1 - - - org.springframework.integration - spring-integration-mongodb - 6.1.1 - - - org.springframework.integration - spring-integration-stream - 6.1.1 - - - org.springframework.integration - spring-integration-stomp - 6.1.1 - org.springframework.boot spring-boot-dependencies diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 4dcaaa553..a5dc8da4c 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -60,7 +60,7 @@ com.h2database h2 - 2.1.214 + 2.2.220 compile diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index c7929a5ed..94aff3534 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -60,7 +60,7 @@ com.h2database h2 - 2.1.214 + 2.2.220 compile diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 513dfa853..8c4617002 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -66,7 +66,7 @@ com.h2database h2 - 2.1.214 + 2.2.220 compile @@ -131,211 +131,6 @@ - - org.springframework.integration - spring-integration-file - 6.1.1 - - - org.springframework.integration - spring-integration-syslog - 6.1.1 - - - org.springframework.integration - spring-integration-smb - 6.1.1 - - - org.springframework.integration - spring-integration-jdbc - 6.1.1 - - - org.springframework.integration - spring-integration-jmx - 6.1.1 - - - org.springframework.integration - spring-integration-ws - 6.1.1 - - - org.springframework.integration - spring-integration-redis - 6.1.1 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.1 - - - org.springframework.integration - spring-integration-webflux - 6.1.1 - - - org.springframework.integration - spring-integration-sftp - 6.1.1 - - - org.springframework.integration - spring-integration-rsocket - 6.1.1 - - - org.springframework.integration - spring-integration-mqtt - 6.1.1 - - - org.springframework.integration - spring-integration-event - 6.1.1 - - - org.springframework.integration - spring-integration-ftp - 6.1.1 - - - org.springframework.integration - spring-integration-kafka - 6.1.1 - - - org.springframework.integration - spring-integration-groovy - 6.1.1 - - - org.springframework.integration - spring-integration-cassandra - 6.1.1 - - - org.springframework.integration - spring-integration-scripting - 6.1.1 - - - org.springframework.integration - spring-integration-xmpp - 6.1.1 - - - org.springframework.integration - spring-integration-websocket - 6.1.1 - - - org.springframework.integration - spring-integration-graphql - 6.1.1 - - - org.springframework.integration - spring-integration-feed - 6.1.1 - - - org.springframework.integration - spring-integration-jpa - 6.1.1 - - - org.springframework.integration - spring-integration-test - 6.1.1 - - - org.springframework.integration - spring-integration-zeromq - 6.1.1 - - - org.springframework.integration - spring-integration-http - 6.1.1 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.1 - - - org.springframework.integration - spring-integration-ip - 6.1.1 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.1 - - - org.springframework.integration - spring-integration-test-support - 6.1.1 - - - org.springframework.integration - spring-integration-amqp - 6.1.1 - - - org.springframework.integration - spring-integration-mail - 6.1.1 - - - org.springframework.integration - spring-integration-security - 6.1.1 - - - org.springframework.integration - spring-integration-camel - 6.1.1 - - - org.springframework.integration - spring-integration-xml - 6.1.1 - - - org.springframework.integration - spring-integration-core - 6.1.1 - - - org.springframework.integration - spring-integration-zip - 6.1.1 - - - org.springframework.integration - spring-integration-jms - 6.1.1 - - - org.springframework.integration - spring-integration-mongodb - 6.1.1 - - - org.springframework.integration - spring-integration-stream - 6.1.1 - - - org.springframework.integration - spring-integration-stomp - 6.1.1 - org.springframework.boot spring-boot-dependencies diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 14bdc7b36..36d9d0b8d 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -131,211 +131,6 @@ - - org.springframework.integration - spring-integration-file - 6.1.1 - - - org.springframework.integration - spring-integration-syslog - 6.1.1 - - - org.springframework.integration - spring-integration-smb - 6.1.1 - - - org.springframework.integration - spring-integration-jdbc - 6.1.1 - - - org.springframework.integration - spring-integration-jmx - 6.1.1 - - - org.springframework.integration - spring-integration-ws - 6.1.1 - - - org.springframework.integration - spring-integration-redis - 6.1.1 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.1 - - - org.springframework.integration - spring-integration-webflux - 6.1.1 - - - org.springframework.integration - spring-integration-sftp - 6.1.1 - - - org.springframework.integration - spring-integration-rsocket - 6.1.1 - - - org.springframework.integration - spring-integration-mqtt - 6.1.1 - - - org.springframework.integration - spring-integration-event - 6.1.1 - - - org.springframework.integration - spring-integration-ftp - 6.1.1 - - - org.springframework.integration - spring-integration-kafka - 6.1.1 - - - org.springframework.integration - spring-integration-groovy - 6.1.1 - - - org.springframework.integration - spring-integration-cassandra - 6.1.1 - - - org.springframework.integration - spring-integration-scripting - 6.1.1 - - - org.springframework.integration - spring-integration-xmpp - 6.1.1 - - - org.springframework.integration - spring-integration-websocket - 6.1.1 - - - org.springframework.integration - spring-integration-graphql - 6.1.1 - - - org.springframework.integration - spring-integration-feed - 6.1.1 - - - org.springframework.integration - spring-integration-jpa - 6.1.1 - - - org.springframework.integration - spring-integration-test - 6.1.1 - - - org.springframework.integration - spring-integration-zeromq - 6.1.1 - - - org.springframework.integration - spring-integration-http - 6.1.1 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.1 - - - org.springframework.integration - spring-integration-ip - 6.1.1 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.1 - - - org.springframework.integration - spring-integration-test-support - 6.1.1 - - - org.springframework.integration - spring-integration-amqp - 6.1.1 - - - org.springframework.integration - spring-integration-mail - 6.1.1 - - - org.springframework.integration - spring-integration-security - 6.1.1 - - - org.springframework.integration - spring-integration-camel - 6.1.1 - - - org.springframework.integration - spring-integration-xml - 6.1.1 - - - org.springframework.integration - spring-integration-core - 6.1.1 - - - org.springframework.integration - spring-integration-zip - 6.1.1 - - - org.springframework.integration - spring-integration-jms - 6.1.1 - - - org.springframework.integration - spring-integration-mongodb - 6.1.1 - - - org.springframework.integration - spring-integration-stream - 6.1.1 - - - org.springframework.integration - spring-integration-stomp - 6.1.1 - org.springframework.boot spring-boot-dependencies diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index a9fa605ce..1688886f5 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -119,211 +119,6 @@ - - org.springframework.integration - spring-integration-file - 6.1.1 - - - org.springframework.integration - spring-integration-syslog - 6.1.1 - - - org.springframework.integration - spring-integration-smb - 6.1.1 - - - org.springframework.integration - spring-integration-jdbc - 6.1.1 - - - org.springframework.integration - spring-integration-jmx - 6.1.1 - - - org.springframework.integration - spring-integration-ws - 6.1.1 - - - org.springframework.integration - spring-integration-redis - 6.1.1 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.1 - - - org.springframework.integration - spring-integration-webflux - 6.1.1 - - - org.springframework.integration - spring-integration-sftp - 6.1.1 - - - org.springframework.integration - spring-integration-rsocket - 6.1.1 - - - org.springframework.integration - spring-integration-mqtt - 6.1.1 - - - org.springframework.integration - spring-integration-event - 6.1.1 - - - org.springframework.integration - spring-integration-ftp - 6.1.1 - - - org.springframework.integration - spring-integration-kafka - 6.1.1 - - - org.springframework.integration - spring-integration-groovy - 6.1.1 - - - org.springframework.integration - spring-integration-cassandra - 6.1.1 - - - org.springframework.integration - spring-integration-scripting - 6.1.1 - - - org.springframework.integration - spring-integration-xmpp - 6.1.1 - - - org.springframework.integration - spring-integration-websocket - 6.1.1 - - - org.springframework.integration - spring-integration-graphql - 6.1.1 - - - org.springframework.integration - spring-integration-feed - 6.1.1 - - - org.springframework.integration - spring-integration-jpa - 6.1.1 - - - org.springframework.integration - spring-integration-test - 6.1.1 - - - org.springframework.integration - spring-integration-zeromq - 6.1.1 - - - org.springframework.integration - spring-integration-http - 6.1.1 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.1 - - - org.springframework.integration - spring-integration-ip - 6.1.1 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.1 - - - org.springframework.integration - spring-integration-test-support - 6.1.1 - - - org.springframework.integration - spring-integration-amqp - 6.1.1 - - - org.springframework.integration - spring-integration-mail - 6.1.1 - - - org.springframework.integration - spring-integration-security - 6.1.1 - - - org.springframework.integration - spring-integration-camel - 6.1.1 - - - org.springframework.integration - spring-integration-xml - 6.1.1 - - - org.springframework.integration - spring-integration-core - 6.1.1 - - - org.springframework.integration - spring-integration-zip - 6.1.1 - - - org.springframework.integration - spring-integration-jms - 6.1.1 - - - org.springframework.integration - spring-integration-mongodb - 6.1.1 - - - org.springframework.integration - spring-integration-stream - 6.1.1 - - - org.springframework.integration - spring-integration-stomp - 6.1.1 - org.springframework.boot spring-boot-dependencies diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 95e5555df..91d18997c 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -119,211 +119,6 @@ - - org.springframework.integration - spring-integration-file - 6.1.1 - - - org.springframework.integration - spring-integration-syslog - 6.1.1 - - - org.springframework.integration - spring-integration-smb - 6.1.1 - - - org.springframework.integration - spring-integration-jdbc - 6.1.1 - - - org.springframework.integration - spring-integration-jmx - 6.1.1 - - - org.springframework.integration - spring-integration-ws - 6.1.1 - - - org.springframework.integration - spring-integration-redis - 6.1.1 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.1 - - - org.springframework.integration - spring-integration-webflux - 6.1.1 - - - org.springframework.integration - spring-integration-sftp - 6.1.1 - - - org.springframework.integration - spring-integration-rsocket - 6.1.1 - - - org.springframework.integration - spring-integration-mqtt - 6.1.1 - - - org.springframework.integration - spring-integration-event - 6.1.1 - - - org.springframework.integration - spring-integration-ftp - 6.1.1 - - - org.springframework.integration - spring-integration-kafka - 6.1.1 - - - org.springframework.integration - spring-integration-groovy - 6.1.1 - - - org.springframework.integration - spring-integration-cassandra - 6.1.1 - - - org.springframework.integration - spring-integration-scripting - 6.1.1 - - - org.springframework.integration - spring-integration-xmpp - 6.1.1 - - - org.springframework.integration - spring-integration-websocket - 6.1.1 - - - org.springframework.integration - spring-integration-graphql - 6.1.1 - - - org.springframework.integration - spring-integration-feed - 6.1.1 - - - org.springframework.integration - spring-integration-jpa - 6.1.1 - - - org.springframework.integration - spring-integration-test - 6.1.1 - - - org.springframework.integration - spring-integration-zeromq - 6.1.1 - - - org.springframework.integration - spring-integration-http - 6.1.1 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.1 - - - org.springframework.integration - spring-integration-ip - 6.1.1 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.1 - - - org.springframework.integration - spring-integration-test-support - 6.1.1 - - - org.springframework.integration - spring-integration-amqp - 6.1.1 - - - org.springframework.integration - spring-integration-mail - 6.1.1 - - - org.springframework.integration - spring-integration-security - 6.1.1 - - - org.springframework.integration - spring-integration-camel - 6.1.1 - - - org.springframework.integration - spring-integration-xml - 6.1.1 - - - org.springframework.integration - spring-integration-core - 6.1.1 - - - org.springframework.integration - spring-integration-zip - 6.1.1 - - - org.springframework.integration - spring-integration-jms - 6.1.1 - - - org.springframework.integration - spring-integration-mongodb - 6.1.1 - - - org.springframework.integration - spring-integration-stream - 6.1.1 - - - org.springframework.integration - spring-integration-stomp - 6.1.1 - org.springframework.boot spring-boot-dependencies diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 98c517b2a..1e81bf405 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -119,211 +119,6 @@ - - org.springframework.integration - spring-integration-file - 6.1.1 - - - org.springframework.integration - spring-integration-syslog - 6.1.1 - - - org.springframework.integration - spring-integration-smb - 6.1.1 - - - org.springframework.integration - spring-integration-jdbc - 6.1.1 - - - org.springframework.integration - spring-integration-jmx - 6.1.1 - - - org.springframework.integration - spring-integration-ws - 6.1.1 - - - org.springframework.integration - spring-integration-redis - 6.1.1 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.1 - - - org.springframework.integration - spring-integration-webflux - 6.1.1 - - - org.springframework.integration - spring-integration-sftp - 6.1.1 - - - org.springframework.integration - spring-integration-rsocket - 6.1.1 - - - org.springframework.integration - spring-integration-mqtt - 6.1.1 - - - org.springframework.integration - spring-integration-event - 6.1.1 - - - org.springframework.integration - spring-integration-ftp - 6.1.1 - - - org.springframework.integration - spring-integration-kafka - 6.1.1 - - - org.springframework.integration - spring-integration-groovy - 6.1.1 - - - org.springframework.integration - spring-integration-cassandra - 6.1.1 - - - org.springframework.integration - spring-integration-scripting - 6.1.1 - - - org.springframework.integration - spring-integration-xmpp - 6.1.1 - - - org.springframework.integration - spring-integration-websocket - 6.1.1 - - - org.springframework.integration - spring-integration-graphql - 6.1.1 - - - org.springframework.integration - spring-integration-feed - 6.1.1 - - - org.springframework.integration - spring-integration-jpa - 6.1.1 - - - org.springframework.integration - spring-integration-test - 6.1.1 - - - org.springframework.integration - spring-integration-zeromq - 6.1.1 - - - org.springframework.integration - spring-integration-http - 6.1.1 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.1 - - - org.springframework.integration - spring-integration-ip - 6.1.1 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.1 - - - org.springframework.integration - spring-integration-test-support - 6.1.1 - - - org.springframework.integration - spring-integration-amqp - 6.1.1 - - - org.springframework.integration - spring-integration-mail - 6.1.1 - - - org.springframework.integration - spring-integration-security - 6.1.1 - - - org.springframework.integration - spring-integration-camel - 6.1.1 - - - org.springframework.integration - spring-integration-xml - 6.1.1 - - - org.springframework.integration - spring-integration-core - 6.1.1 - - - org.springframework.integration - spring-integration-zip - 6.1.1 - - - org.springframework.integration - spring-integration-jms - 6.1.1 - - - org.springframework.integration - spring-integration-mongodb - 6.1.1 - - - org.springframework.integration - spring-integration-stream - 6.1.1 - - - org.springframework.integration - spring-integration-stomp - 6.1.1 - org.springframework.boot spring-boot-dependencies diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 034f4dfdd..0c014f80d 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -114,211 +114,6 @@ - - org.springframework.integration - spring-integration-file - 6.1.1 - - - org.springframework.integration - spring-integration-syslog - 6.1.1 - - - org.springframework.integration - spring-integration-smb - 6.1.1 - - - org.springframework.integration - spring-integration-jdbc - 6.1.1 - - - org.springframework.integration - spring-integration-jmx - 6.1.1 - - - org.springframework.integration - spring-integration-ws - 6.1.1 - - - org.springframework.integration - spring-integration-redis - 6.1.1 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.1 - - - org.springframework.integration - spring-integration-webflux - 6.1.1 - - - org.springframework.integration - spring-integration-sftp - 6.1.1 - - - org.springframework.integration - spring-integration-rsocket - 6.1.1 - - - org.springframework.integration - spring-integration-mqtt - 6.1.1 - - - org.springframework.integration - spring-integration-event - 6.1.1 - - - org.springframework.integration - spring-integration-ftp - 6.1.1 - - - org.springframework.integration - spring-integration-kafka - 6.1.1 - - - org.springframework.integration - spring-integration-groovy - 6.1.1 - - - org.springframework.integration - spring-integration-cassandra - 6.1.1 - - - org.springframework.integration - spring-integration-scripting - 6.1.1 - - - org.springframework.integration - spring-integration-xmpp - 6.1.1 - - - org.springframework.integration - spring-integration-websocket - 6.1.1 - - - org.springframework.integration - spring-integration-graphql - 6.1.1 - - - org.springframework.integration - spring-integration-feed - 6.1.1 - - - org.springframework.integration - spring-integration-jpa - 6.1.1 - - - org.springframework.integration - spring-integration-test - 6.1.1 - - - org.springframework.integration - spring-integration-zeromq - 6.1.1 - - - org.springframework.integration - spring-integration-http - 6.1.1 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.1 - - - org.springframework.integration - spring-integration-ip - 6.1.1 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.1 - - - org.springframework.integration - spring-integration-test-support - 6.1.1 - - - org.springframework.integration - spring-integration-amqp - 6.1.1 - - - org.springframework.integration - spring-integration-mail - 6.1.1 - - - org.springframework.integration - spring-integration-security - 6.1.1 - - - org.springframework.integration - spring-integration-camel - 6.1.1 - - - org.springframework.integration - spring-integration-xml - 6.1.1 - - - org.springframework.integration - spring-integration-core - 6.1.1 - - - org.springframework.integration - spring-integration-zip - 6.1.1 - - - org.springframework.integration - spring-integration-jms - 6.1.1 - - - org.springframework.integration - spring-integration-mongodb - 6.1.1 - - - org.springframework.integration - spring-integration-stream - 6.1.1 - - - org.springframework.integration - spring-integration-stomp - 6.1.1 - org.springframework.boot spring-boot-dependencies diff --git a/build.gradle b/build.gradle index c49275c83..9f49b556d 100644 --- a/build.gradle +++ b/build.gradle @@ -238,7 +238,7 @@ subprojects { subproject -> flexjsonVersion = '2.0' groovyVersion = '4.0.12' hsqldbVersion = '2.7.1' - h2Version = '2.1.214' + h2Version = '2.2.220' jacksonVersion = '2.15.0' jaxbVersion = '4.0.2' jodaTimeVersion = '1.6' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 4860443a8..88b7a2600 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -125,211 +125,6 @@ - - org.springframework.integration - spring-integration-file - 6.1.1 - - - org.springframework.integration - spring-integration-syslog - 6.1.1 - - - org.springframework.integration - spring-integration-smb - 6.1.1 - - - org.springframework.integration - spring-integration-jdbc - 6.1.1 - - - org.springframework.integration - spring-integration-jmx - 6.1.1 - - - org.springframework.integration - spring-integration-ws - 6.1.1 - - - org.springframework.integration - spring-integration-redis - 6.1.1 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.1 - - - org.springframework.integration - spring-integration-webflux - 6.1.1 - - - org.springframework.integration - spring-integration-sftp - 6.1.1 - - - org.springframework.integration - spring-integration-rsocket - 6.1.1 - - - org.springframework.integration - spring-integration-mqtt - 6.1.1 - - - org.springframework.integration - spring-integration-event - 6.1.1 - - - org.springframework.integration - spring-integration-ftp - 6.1.1 - - - org.springframework.integration - spring-integration-kafka - 6.1.1 - - - org.springframework.integration - spring-integration-groovy - 6.1.1 - - - org.springframework.integration - spring-integration-cassandra - 6.1.1 - - - org.springframework.integration - spring-integration-scripting - 6.1.1 - - - org.springframework.integration - spring-integration-xmpp - 6.1.1 - - - org.springframework.integration - spring-integration-websocket - 6.1.1 - - - org.springframework.integration - spring-integration-graphql - 6.1.1 - - - org.springframework.integration - spring-integration-feed - 6.1.1 - - - org.springframework.integration - spring-integration-jpa - 6.1.1 - - - org.springframework.integration - spring-integration-test - 6.1.1 - - - org.springframework.integration - spring-integration-zeromq - 6.1.1 - - - org.springframework.integration - spring-integration-http - 6.1.1 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.1 - - - org.springframework.integration - spring-integration-ip - 6.1.1 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.1 - - - org.springframework.integration - spring-integration-test-support - 6.1.1 - - - org.springframework.integration - spring-integration-amqp - 6.1.1 - - - org.springframework.integration - spring-integration-mail - 6.1.1 - - - org.springframework.integration - spring-integration-security - 6.1.1 - - - org.springframework.integration - spring-integration-camel - 6.1.1 - - - org.springframework.integration - spring-integration-xml - 6.1.1 - - - org.springframework.integration - spring-integration-core - 6.1.1 - - - org.springframework.integration - spring-integration-zip - 6.1.1 - - - org.springframework.integration - spring-integration-jms - 6.1.1 - - - org.springframework.integration - spring-integration-mongodb - 6.1.1 - - - org.springframework.integration - spring-integration-stream - 6.1.1 - - - org.springframework.integration - spring-integration-stomp - 6.1.1 - org.springframework.boot spring-boot-dependencies diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 2a2c828ce..8ac66bd5a 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -125,211 +125,6 @@ - - org.springframework.integration - spring-integration-file - 6.1.1 - - - org.springframework.integration - spring-integration-syslog - 6.1.1 - - - org.springframework.integration - spring-integration-smb - 6.1.1 - - - org.springframework.integration - spring-integration-jdbc - 6.1.1 - - - org.springframework.integration - spring-integration-jmx - 6.1.1 - - - org.springframework.integration - spring-integration-ws - 6.1.1 - - - org.springframework.integration - spring-integration-redis - 6.1.1 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.1 - - - org.springframework.integration - spring-integration-webflux - 6.1.1 - - - org.springframework.integration - spring-integration-sftp - 6.1.1 - - - org.springframework.integration - spring-integration-rsocket - 6.1.1 - - - org.springframework.integration - spring-integration-mqtt - 6.1.1 - - - org.springframework.integration - spring-integration-event - 6.1.1 - - - org.springframework.integration - spring-integration-ftp - 6.1.1 - - - org.springframework.integration - spring-integration-kafka - 6.1.1 - - - org.springframework.integration - spring-integration-groovy - 6.1.1 - - - org.springframework.integration - spring-integration-cassandra - 6.1.1 - - - org.springframework.integration - spring-integration-scripting - 6.1.1 - - - org.springframework.integration - spring-integration-xmpp - 6.1.1 - - - org.springframework.integration - spring-integration-websocket - 6.1.1 - - - org.springframework.integration - spring-integration-graphql - 6.1.1 - - - org.springframework.integration - spring-integration-feed - 6.1.1 - - - org.springframework.integration - spring-integration-jpa - 6.1.1 - - - org.springframework.integration - spring-integration-test - 6.1.1 - - - org.springframework.integration - spring-integration-zeromq - 6.1.1 - - - org.springframework.integration - spring-integration-http - 6.1.1 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.1 - - - org.springframework.integration - spring-integration-ip - 6.1.1 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.1 - - - org.springframework.integration - spring-integration-test-support - 6.1.1 - - - org.springframework.integration - spring-integration-amqp - 6.1.1 - - - org.springframework.integration - spring-integration-mail - 6.1.1 - - - org.springframework.integration - spring-integration-security - 6.1.1 - - - org.springframework.integration - spring-integration-camel - 6.1.1 - - - org.springframework.integration - spring-integration-xml - 6.1.1 - - - org.springframework.integration - spring-integration-core - 6.1.1 - - - org.springframework.integration - spring-integration-zip - 6.1.1 - - - org.springframework.integration - spring-integration-jms - 6.1.1 - - - org.springframework.integration - spring-integration-mongodb - 6.1.1 - - - org.springframework.integration - spring-integration-stream - 6.1.1 - - - org.springframework.integration - spring-integration-stomp - 6.1.1 - org.springframework.boot spring-boot-dependencies diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 94191d3e4..7c900d983 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -147,211 +147,6 @@ - - org.springframework.integration - spring-integration-file - 6.1.1 - - - org.springframework.integration - spring-integration-syslog - 6.1.1 - - - org.springframework.integration - spring-integration-smb - 6.1.1 - - - org.springframework.integration - spring-integration-jdbc - 6.1.1 - - - org.springframework.integration - spring-integration-jmx - 6.1.1 - - - org.springframework.integration - spring-integration-ws - 6.1.1 - - - org.springframework.integration - spring-integration-redis - 6.1.1 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.1 - - - org.springframework.integration - spring-integration-webflux - 6.1.1 - - - org.springframework.integration - spring-integration-sftp - 6.1.1 - - - org.springframework.integration - spring-integration-rsocket - 6.1.1 - - - org.springframework.integration - spring-integration-mqtt - 6.1.1 - - - org.springframework.integration - spring-integration-event - 6.1.1 - - - org.springframework.integration - spring-integration-ftp - 6.1.1 - - - org.springframework.integration - spring-integration-kafka - 6.1.1 - - - org.springframework.integration - spring-integration-groovy - 6.1.1 - - - org.springframework.integration - spring-integration-cassandra - 6.1.1 - - - org.springframework.integration - spring-integration-scripting - 6.1.1 - - - org.springframework.integration - spring-integration-xmpp - 6.1.1 - - - org.springframework.integration - spring-integration-websocket - 6.1.1 - - - org.springframework.integration - spring-integration-graphql - 6.1.1 - - - org.springframework.integration - spring-integration-feed - 6.1.1 - - - org.springframework.integration - spring-integration-jpa - 6.1.1 - - - org.springframework.integration - spring-integration-test - 6.1.1 - - - org.springframework.integration - spring-integration-zeromq - 6.1.1 - - - org.springframework.integration - spring-integration-http - 6.1.1 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.1 - - - org.springframework.integration - spring-integration-ip - 6.1.1 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.1 - - - org.springframework.integration - spring-integration-test-support - 6.1.1 - - - org.springframework.integration - spring-integration-amqp - 6.1.1 - - - org.springframework.integration - spring-integration-mail - 6.1.1 - - - org.springframework.integration - spring-integration-security - 6.1.1 - - - org.springframework.integration - spring-integration-camel - 6.1.1 - - - org.springframework.integration - spring-integration-xml - 6.1.1 - - - org.springframework.integration - spring-integration-core - 6.1.1 - - - org.springframework.integration - spring-integration-zip - 6.1.1 - - - org.springframework.integration - spring-integration-jms - 6.1.1 - - - org.springframework.integration - spring-integration-mongodb - 6.1.1 - - - org.springframework.integration - spring-integration-stream - 6.1.1 - - - org.springframework.integration - spring-integration-stomp - 6.1.1 - org.springframework.boot spring-boot-dependencies diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 05d19f0c9..b5c844dec 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -114,211 +114,6 @@ - - org.springframework.integration - spring-integration-file - 6.1.1 - - - org.springframework.integration - spring-integration-syslog - 6.1.1 - - - org.springframework.integration - spring-integration-smb - 6.1.1 - - - org.springframework.integration - spring-integration-jdbc - 6.1.1 - - - org.springframework.integration - spring-integration-jmx - 6.1.1 - - - org.springframework.integration - spring-integration-ws - 6.1.1 - - - org.springframework.integration - spring-integration-redis - 6.1.1 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.1 - - - org.springframework.integration - spring-integration-webflux - 6.1.1 - - - org.springframework.integration - spring-integration-sftp - 6.1.1 - - - org.springframework.integration - spring-integration-rsocket - 6.1.1 - - - org.springframework.integration - spring-integration-mqtt - 6.1.1 - - - org.springframework.integration - spring-integration-event - 6.1.1 - - - org.springframework.integration - spring-integration-ftp - 6.1.1 - - - org.springframework.integration - spring-integration-kafka - 6.1.1 - - - org.springframework.integration - spring-integration-groovy - 6.1.1 - - - org.springframework.integration - spring-integration-cassandra - 6.1.1 - - - org.springframework.integration - spring-integration-scripting - 6.1.1 - - - org.springframework.integration - spring-integration-xmpp - 6.1.1 - - - org.springframework.integration - spring-integration-websocket - 6.1.1 - - - org.springframework.integration - spring-integration-graphql - 6.1.1 - - - org.springframework.integration - spring-integration-feed - 6.1.1 - - - org.springframework.integration - spring-integration-jpa - 6.1.1 - - - org.springframework.integration - spring-integration-test - 6.1.1 - - - org.springframework.integration - spring-integration-zeromq - 6.1.1 - - - org.springframework.integration - spring-integration-http - 6.1.1 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.1 - - - org.springframework.integration - spring-integration-ip - 6.1.1 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.1 - - - org.springframework.integration - spring-integration-test-support - 6.1.1 - - - org.springframework.integration - spring-integration-amqp - 6.1.1 - - - org.springframework.integration - spring-integration-mail - 6.1.1 - - - org.springframework.integration - spring-integration-security - 6.1.1 - - - org.springframework.integration - spring-integration-camel - 6.1.1 - - - org.springframework.integration - spring-integration-xml - 6.1.1 - - - org.springframework.integration - spring-integration-core - 6.1.1 - - - org.springframework.integration - spring-integration-zip - 6.1.1 - - - org.springframework.integration - spring-integration-jms - 6.1.1 - - - org.springframework.integration - spring-integration-mongodb - 6.1.1 - - - org.springframework.integration - spring-integration-stream - 6.1.1 - - - org.springframework.integration - spring-integration-stomp - 6.1.1 - org.springframework.boot spring-boot-dependencies diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 9686063f5..0809c2558 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -141,211 +141,6 @@ - - org.springframework.integration - spring-integration-jdbc - 6.1.1 - - - org.springframework.integration - spring-integration-ws - 6.1.1 - - - org.springframework.integration - spring-integration-redis - 6.1.1 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.1 - - - org.springframework.integration - spring-integration-rsocket - 6.1.1 - - - org.springframework.integration - spring-integration-event - 6.1.1 - - - org.springframework.integration - spring-integration-cassandra - 6.1.1 - - - org.springframework.integration - spring-integration-scripting - 6.1.1 - - - org.springframework.integration - spring-integration-websocket - 6.1.1 - - - org.springframework.integration - spring-integration-graphql - 6.1.1 - - - org.springframework.integration - spring-integration-jpa - 6.1.1 - - - org.springframework.integration - spring-integration-test - 6.1.1 - - - org.springframework.integration - spring-integration-http - 6.1.1 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.1 - - - org.springframework.integration - spring-integration-ip - 6.1.1 - - - org.springframework.integration - spring-integration-mail - 6.1.1 - - - org.springframework.integration - spring-integration-camel - 6.1.1 - - - org.springframework.integration - spring-integration-mongodb - 6.1.1 - - - org.springframework.integration - spring-integration-stream - 6.1.1 - - - org.springframework.integration - spring-integration-stomp - 6.1.1 - - - org.springframework.integration - spring-integration-file - 6.1.1 - - - org.springframework.integration - spring-integration-syslog - 6.1.1 - - - org.springframework.integration - spring-integration-smb - 6.1.1 - - - org.springframework.integration - spring-integration-jmx - 6.1.1 - - - org.springframework.integration - spring-integration-webflux - 6.1.1 - - - org.springframework.integration - spring-integration-sftp - 6.1.1 - - - org.springframework.integration - spring-integration-mqtt - 6.1.1 - - - org.springframework.integration - spring-integration-ftp - 6.1.1 - - - org.springframework.integration - spring-integration-kafka - 6.1.1 - - - org.springframework.integration - spring-integration-groovy - 6.1.1 - - - org.springframework.integration - spring-integration-xmpp - 6.1.1 - - - org.springframework.integration - spring-integration-feed - 6.1.1 - - - org.springframework.integration - spring-integration-zeromq - 6.1.1 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.1 - - - org.springframework.integration - spring-integration-test-support - 6.1.1 - - - org.springframework.integration - spring-integration-amqp - 6.1.1 - - - org.springframework.integration - spring-integration-security - 6.1.1 - - - org.springframework.integration - spring-integration-xml - 6.1.1 - - - org.springframework.integration - spring-integration-core - 6.1.1 - - - org.springframework.integration - spring-integration-zip - 6.1.1 - - - org.springframework.integration - spring-integration-jms - 6.1.1 - org.springframework.cloud spring-cloud-dependencies diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 0d7a6a62c..e1f23a3a6 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -65,7 +65,7 @@ com.h2database h2 - 2.1.214 + 2.2.220 compile From 99731080bb49ad34424a1a504d122ac4f27d8790 Mon Sep 17 00:00:00 2001 From: abilan Date: Wed, 12 Jul 2023 13:19:13 -0400 Subject: [PATCH 326/356] Upgrade to Spring WebFlow 3.0.0 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 9f49b556d..ddfe4119f 100644 --- a/build.gradle +++ b/build.gradle @@ -266,7 +266,7 @@ subprojects { subproject -> springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' springVersion = '6.0.10' springSecurityVersion = '6.1.1' - springWebFlowVersion = '2.4.8.RELEASE' + springWebFlowVersion = '3.0.0' testcontainersVersion = '1.18.1' tilesJspVersion = '2.2.1' } @@ -469,7 +469,7 @@ project('loanshark') { api "org.hibernate:hibernate-validator:$hibernateValidatorVersion" api "org.eclipse.persistence:org.eclipse.persistence.jpa:$jpaApiVersion" api "org.hibernate.orm:hibernate-core:$hibernateVersion" - api "org.springframework.webflow:spring-js:$springWebFlowVersion" + api "org.springframework.webflow:spring-js-resources:$springWebFlowVersion" api "org.slf4j:slf4j-api:$slf4jVersion" runtimeOnly "org.apache.logging.log4j:log4j-core:$log4jVersion" From 72f863186442cc81ae7d717bd027fd30f4bdcf4e Mon Sep 17 00:00:00 2001 From: abilan Date: Thu, 20 Jul 2023 09:19:35 -0400 Subject: [PATCH 327/356] Upgrade to some latest deps --- advanced/advanced-testing-examples/pom.xml | 4 +- advanced/dynamic-ftp/pom.xml | 4 +- advanced/dynamic-tcp-client/pom.xml | 209 ++++++++++++++++- applications/cafe-scripted/pom.xml | 4 +- applications/cafe/cafe-amqp/pom.xml | 4 +- applications/cafe/cafe-jms/pom.xml | 4 +- applications/cafe/cafe-si/pom.xml | 4 +- applications/file-split-ftp/pom.xml | 209 ++++++++++++++++- applications/loan-broker/pom.xml | 4 +- applications/loanshark/pom.xml | 8 +- applications/stomp-chat/pom.xml | 209 ++++++++++++++++- basic/amqp/pom.xml | 4 +- basic/barrier/pom.xml | 209 ++++++++++++++++- basic/control-bus/pom.xml | 4 +- basic/enricher/pom.xml | 4 +- basic/feed/pom.xml | 4 +- basic/file/pom.xml | 4 +- basic/ftp/pom.xml | 4 +- basic/helloworld/pom.xml | 4 +- basic/http/pom.xml | 4 +- basic/jdbc/pom.xml | 4 +- basic/jms/pom.xml | 4 +- basic/jmx/pom.xml | 4 +- basic/jpa/pom.xml | 209 ++++++++++++++++- basic/kafka/pom.xml | 209 ++++++++++++++++- basic/mail/pom.xml | 4 +- basic/mongodb/pom.xml | 4 +- basic/mqtt/pom.xml | 209 ++++++++++++++++- basic/oddeven/pom.xml | 4 +- basic/quote/pom.xml | 4 +- basic/sftp/pom.xml | 4 +- basic/tcp-amqp/pom.xml | 4 +- basic/tcp-broadcast/pom.xml | 209 ++++++++++++++++- basic/tcp-client-server/pom.xml | 4 +- basic/tcp-with-headers/pom.xml | 209 ++++++++++++++++- basic/testing-examples/pom.xml | 4 +- basic/twitter/pom.xml | 4 +- basic/web-sockets/pom.xml | 209 ++++++++++++++++- basic/ws-inbound-gateway/pom.xml | 4 +- basic/ws-outbound-gateway/pom.xml | 4 +- basic/xml/pom.xml | 4 +- basic/xmpp/pom.xml | 4 +- build.gradle | 12 +- dsl/cafe-dsl/pom.xml | 209 ++++++++++++++++- dsl/kafka-dsl/pom.xml | 209 ++++++++++++++++- dsl/si4demo/pom.xml | 209 ++++++++++++++++- intermediate/async-gateway/pom.xml | 4 +- intermediate/dynamic-poller/pom.xml | 4 +- intermediate/errorhandling/pom.xml | 4 +- intermediate/file-processing/pom.xml | 4 +- intermediate/mail-attachments/pom.xml | 4 +- intermediate/monitoring/pom.xml | 4 +- intermediate/multipart-http/pom.xml | 4 +- intermediate/rest-http/pom.xml | 8 +- intermediate/retry-and-more/pom.xml | 4 +- .../splitter-aggregator-reaper/pom.xml | 4 +- intermediate/stored-procedures-derby/pom.xml | 4 +- intermediate/stored-procedures-ms/pom.xml | 4 +- intermediate/stored-procedures-oracle/pom.xml | 4 +- .../stored-procedures-postgresql/pom.xml | 4 +- intermediate/tcp-async-bi-directional/pom.xml | 209 ++++++++++++++++- .../tcp-client-server-multiplex/pom.xml | 4 +- intermediate/testcontainers-rabbitmq/pom.xml | 211 +++++++++++++++++- intermediate/travel/pom.xml | 4 +- intermediate/tx-synch/pom.xml | 4 +- 65 files changed, 3213 insertions(+), 140 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index d798db545..cb98083fc 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 64abe5d5b..cf50c3ec8 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 0cbae3520..c253e7822 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -114,6 +114,211 @@ + + org.springframework.integration + spring-integration-file + 6.1.2 + + + org.springframework.integration + spring-integration-syslog + 6.1.2 + + + org.springframework.integration + spring-integration-smb + 6.1.2 + + + org.springframework.integration + spring-integration-jdbc + 6.1.2 + + + org.springframework.integration + spring-integration-jmx + 6.1.2 + + + org.springframework.integration + spring-integration-ws + 6.1.2 + + + org.springframework.integration + spring-integration-redis + 6.1.2 + + + org.springframework.integration + spring-integration-r2dbc + 6.1.2 + + + org.springframework.integration + spring-integration-webflux + 6.1.2 + + + org.springframework.integration + spring-integration-sftp + 6.1.2 + + + org.springframework.integration + spring-integration-rsocket + 6.1.2 + + + org.springframework.integration + spring-integration-mqtt + 6.1.2 + + + org.springframework.integration + spring-integration-event + 6.1.2 + + + org.springframework.integration + spring-integration-ftp + 6.1.2 + + + org.springframework.integration + spring-integration-kafka + 6.1.2 + + + org.springframework.integration + spring-integration-groovy + 6.1.2 + + + org.springframework.integration + spring-integration-cassandra + 6.1.2 + + + org.springframework.integration + spring-integration-scripting + 6.1.2 + + + org.springframework.integration + spring-integration-xmpp + 6.1.2 + + + org.springframework.integration + spring-integration-websocket + 6.1.2 + + + org.springframework.integration + spring-integration-graphql + 6.1.2 + + + org.springframework.integration + spring-integration-feed + 6.1.2 + + + org.springframework.integration + spring-integration-jpa + 6.1.2 + + + org.springframework.integration + spring-integration-test + 6.1.2 + + + org.springframework.integration + spring-integration-zeromq + 6.1.2 + + + org.springframework.integration + spring-integration-http + 6.1.2 + + + org.springframework.integration + spring-integration-zookeeper + 6.1.2 + + + org.springframework.integration + spring-integration-ip + 6.1.2 + + + org.springframework.integration + spring-integration-hazelcast + 6.1.2 + + + org.springframework.integration + spring-integration-test-support + 6.1.2 + + + org.springframework.integration + spring-integration-amqp + 6.1.2 + + + org.springframework.integration + spring-integration-mail + 6.1.2 + + + org.springframework.integration + spring-integration-security + 6.1.2 + + + org.springframework.integration + spring-integration-camel + 6.1.2 + + + org.springframework.integration + spring-integration-xml + 6.1.2 + + + org.springframework.integration + spring-integration-core + 6.1.2 + + + org.springframework.integration + spring-integration-zip + 6.1.2 + + + org.springframework.integration + spring-integration-jms + 6.1.2 + + + org.springframework.integration + spring-integration-mongodb + 6.1.2 + + + org.springframework.integration + spring-integration-stream + 6.1.2 + + + org.springframework.integration + spring-integration-stomp + 6.1.2 + org.springframework.boot spring-boot-dependencies @@ -138,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index dae804434..c5ffa707e 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 795139cea..a98985649 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index ccfa14648..3629b33dc 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -156,14 +156,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 637278536..5b03979fe 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 660ec96df..13df45e33 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -141,6 +141,211 @@ + + org.springframework.integration + spring-integration-file + 6.1.2 + + + org.springframework.integration + spring-integration-syslog + 6.1.2 + + + org.springframework.integration + spring-integration-smb + 6.1.2 + + + org.springframework.integration + spring-integration-jdbc + 6.1.2 + + + org.springframework.integration + spring-integration-jmx + 6.1.2 + + + org.springframework.integration + spring-integration-ws + 6.1.2 + + + org.springframework.integration + spring-integration-redis + 6.1.2 + + + org.springframework.integration + spring-integration-r2dbc + 6.1.2 + + + org.springframework.integration + spring-integration-webflux + 6.1.2 + + + org.springframework.integration + spring-integration-sftp + 6.1.2 + + + org.springframework.integration + spring-integration-rsocket + 6.1.2 + + + org.springframework.integration + spring-integration-mqtt + 6.1.2 + + + org.springframework.integration + spring-integration-event + 6.1.2 + + + org.springframework.integration + spring-integration-ftp + 6.1.2 + + + org.springframework.integration + spring-integration-kafka + 6.1.2 + + + org.springframework.integration + spring-integration-groovy + 6.1.2 + + + org.springframework.integration + spring-integration-cassandra + 6.1.2 + + + org.springframework.integration + spring-integration-scripting + 6.1.2 + + + org.springframework.integration + spring-integration-xmpp + 6.1.2 + + + org.springframework.integration + spring-integration-websocket + 6.1.2 + + + org.springframework.integration + spring-integration-graphql + 6.1.2 + + + org.springframework.integration + spring-integration-feed + 6.1.2 + + + org.springframework.integration + spring-integration-jpa + 6.1.2 + + + org.springframework.integration + spring-integration-test + 6.1.2 + + + org.springframework.integration + spring-integration-zeromq + 6.1.2 + + + org.springframework.integration + spring-integration-http + 6.1.2 + + + org.springframework.integration + spring-integration-zookeeper + 6.1.2 + + + org.springframework.integration + spring-integration-ip + 6.1.2 + + + org.springframework.integration + spring-integration-hazelcast + 6.1.2 + + + org.springframework.integration + spring-integration-test-support + 6.1.2 + + + org.springframework.integration + spring-integration-amqp + 6.1.2 + + + org.springframework.integration + spring-integration-mail + 6.1.2 + + + org.springframework.integration + spring-integration-security + 6.1.2 + + + org.springframework.integration + spring-integration-camel + 6.1.2 + + + org.springframework.integration + spring-integration-xml + 6.1.2 + + + org.springframework.integration + spring-integration-core + 6.1.2 + + + org.springframework.integration + spring-integration-zip + 6.1.2 + + + org.springframework.integration + spring-integration-jms + 6.1.2 + + + org.springframework.integration + spring-integration-mongodb + 6.1.2 + + + org.springframework.integration + spring-integration-stream + 6.1.2 + + + org.springframework.integration + spring-integration-stomp + 6.1.2 + org.springframework.boot spring-boot-dependencies @@ -165,14 +370,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 12adba3a1..4cea44c0e 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index bd93aab67..d13a3a5fe 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -172,8 +172,8 @@ org.springframework.webflow - spring-js - 2.4.8.RELEASE + spring-js-resources + 3.0.0 compile @@ -325,14 +325,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index d64c504b8..59bc72d40 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -124,6 +124,211 @@ + + org.springframework.integration + spring-integration-file + 6.1.2 + + + org.springframework.integration + spring-integration-syslog + 6.1.2 + + + org.springframework.integration + spring-integration-smb + 6.1.2 + + + org.springframework.integration + spring-integration-jdbc + 6.1.2 + + + org.springframework.integration + spring-integration-jmx + 6.1.2 + + + org.springframework.integration + spring-integration-ws + 6.1.2 + + + org.springframework.integration + spring-integration-redis + 6.1.2 + + + org.springframework.integration + spring-integration-r2dbc + 6.1.2 + + + org.springframework.integration + spring-integration-webflux + 6.1.2 + + + org.springframework.integration + spring-integration-sftp + 6.1.2 + + + org.springframework.integration + spring-integration-rsocket + 6.1.2 + + + org.springframework.integration + spring-integration-mqtt + 6.1.2 + + + org.springframework.integration + spring-integration-event + 6.1.2 + + + org.springframework.integration + spring-integration-ftp + 6.1.2 + + + org.springframework.integration + spring-integration-kafka + 6.1.2 + + + org.springframework.integration + spring-integration-groovy + 6.1.2 + + + org.springframework.integration + spring-integration-cassandra + 6.1.2 + + + org.springframework.integration + spring-integration-scripting + 6.1.2 + + + org.springframework.integration + spring-integration-xmpp + 6.1.2 + + + org.springframework.integration + spring-integration-websocket + 6.1.2 + + + org.springframework.integration + spring-integration-graphql + 6.1.2 + + + org.springframework.integration + spring-integration-feed + 6.1.2 + + + org.springframework.integration + spring-integration-jpa + 6.1.2 + + + org.springframework.integration + spring-integration-test + 6.1.2 + + + org.springframework.integration + spring-integration-zeromq + 6.1.2 + + + org.springframework.integration + spring-integration-http + 6.1.2 + + + org.springframework.integration + spring-integration-zookeeper + 6.1.2 + + + org.springframework.integration + spring-integration-ip + 6.1.2 + + + org.springframework.integration + spring-integration-hazelcast + 6.1.2 + + + org.springframework.integration + spring-integration-test-support + 6.1.2 + + + org.springframework.integration + spring-integration-amqp + 6.1.2 + + + org.springframework.integration + spring-integration-mail + 6.1.2 + + + org.springframework.integration + spring-integration-security + 6.1.2 + + + org.springframework.integration + spring-integration-camel + 6.1.2 + + + org.springframework.integration + spring-integration-xml + 6.1.2 + + + org.springframework.integration + spring-integration-core + 6.1.2 + + + org.springframework.integration + spring-integration-zip + 6.1.2 + + + org.springframework.integration + spring-integration-jms + 6.1.2 + + + org.springframework.integration + spring-integration-mongodb + 6.1.2 + + + org.springframework.integration + spring-integration-stream + 6.1.2 + + + org.springframework.integration + spring-integration-stomp + 6.1.2 + org.springframework.boot spring-boot-dependencies @@ -148,14 +353,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 3556cf309..07d639b1d 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index a38eb89bc..7e0b45803 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -134,6 +134,211 @@ + + org.springframework.integration + spring-integration-file + 6.1.2 + + + org.springframework.integration + spring-integration-syslog + 6.1.2 + + + org.springframework.integration + spring-integration-smb + 6.1.2 + + + org.springframework.integration + spring-integration-jdbc + 6.1.2 + + + org.springframework.integration + spring-integration-jmx + 6.1.2 + + + org.springframework.integration + spring-integration-ws + 6.1.2 + + + org.springframework.integration + spring-integration-redis + 6.1.2 + + + org.springframework.integration + spring-integration-r2dbc + 6.1.2 + + + org.springframework.integration + spring-integration-webflux + 6.1.2 + + + org.springframework.integration + spring-integration-sftp + 6.1.2 + + + org.springframework.integration + spring-integration-rsocket + 6.1.2 + + + org.springframework.integration + spring-integration-mqtt + 6.1.2 + + + org.springframework.integration + spring-integration-event + 6.1.2 + + + org.springframework.integration + spring-integration-ftp + 6.1.2 + + + org.springframework.integration + spring-integration-kafka + 6.1.2 + + + org.springframework.integration + spring-integration-groovy + 6.1.2 + + + org.springframework.integration + spring-integration-cassandra + 6.1.2 + + + org.springframework.integration + spring-integration-scripting + 6.1.2 + + + org.springframework.integration + spring-integration-xmpp + 6.1.2 + + + org.springframework.integration + spring-integration-websocket + 6.1.2 + + + org.springframework.integration + spring-integration-graphql + 6.1.2 + + + org.springframework.integration + spring-integration-feed + 6.1.2 + + + org.springframework.integration + spring-integration-jpa + 6.1.2 + + + org.springframework.integration + spring-integration-test + 6.1.2 + + + org.springframework.integration + spring-integration-zeromq + 6.1.2 + + + org.springframework.integration + spring-integration-http + 6.1.2 + + + org.springframework.integration + spring-integration-zookeeper + 6.1.2 + + + org.springframework.integration + spring-integration-ip + 6.1.2 + + + org.springframework.integration + spring-integration-hazelcast + 6.1.2 + + + org.springframework.integration + spring-integration-test-support + 6.1.2 + + + org.springframework.integration + spring-integration-amqp + 6.1.2 + + + org.springframework.integration + spring-integration-mail + 6.1.2 + + + org.springframework.integration + spring-integration-security + 6.1.2 + + + org.springframework.integration + spring-integration-camel + 6.1.2 + + + org.springframework.integration + spring-integration-xml + 6.1.2 + + + org.springframework.integration + spring-integration-core + 6.1.2 + + + org.springframework.integration + spring-integration-zip + 6.1.2 + + + org.springframework.integration + spring-integration-jms + 6.1.2 + + + org.springframework.integration + spring-integration-mongodb + 6.1.2 + + + org.springframework.integration + spring-integration-stream + 6.1.2 + + + org.springframework.integration + spring-integration-stomp + 6.1.2 + org.springframework.boot spring-boot-dependencies @@ -158,14 +363,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 14fab6dbb..7c002595c 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index a5dc8da4c..6c4670b0b 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 51ae5134b..3d4fb1ff8 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index ad3afa5a1..b5b0101a1 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index f8866029b..d90533d82 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -150,14 +150,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 5925229e6..1c5334733 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index c10059282..a2a2eb532 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 94aff3534..3782c0b84 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index e37ab1826..68a2a94ca 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 1ffdac921..7971bcc35 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 8c4617002..a6bcbc2cc 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -131,6 +131,211 @@ + + org.springframework.integration + spring-integration-file + 6.1.2 + + + org.springframework.integration + spring-integration-syslog + 6.1.2 + + + org.springframework.integration + spring-integration-smb + 6.1.2 + + + org.springframework.integration + spring-integration-jdbc + 6.1.2 + + + org.springframework.integration + spring-integration-jmx + 6.1.2 + + + org.springframework.integration + spring-integration-ws + 6.1.2 + + + org.springframework.integration + spring-integration-redis + 6.1.2 + + + org.springframework.integration + spring-integration-r2dbc + 6.1.2 + + + org.springframework.integration + spring-integration-webflux + 6.1.2 + + + org.springframework.integration + spring-integration-sftp + 6.1.2 + + + org.springframework.integration + spring-integration-rsocket + 6.1.2 + + + org.springframework.integration + spring-integration-mqtt + 6.1.2 + + + org.springframework.integration + spring-integration-event + 6.1.2 + + + org.springframework.integration + spring-integration-ftp + 6.1.2 + + + org.springframework.integration + spring-integration-kafka + 6.1.2 + + + org.springframework.integration + spring-integration-groovy + 6.1.2 + + + org.springframework.integration + spring-integration-cassandra + 6.1.2 + + + org.springframework.integration + spring-integration-scripting + 6.1.2 + + + org.springframework.integration + spring-integration-xmpp + 6.1.2 + + + org.springframework.integration + spring-integration-websocket + 6.1.2 + + + org.springframework.integration + spring-integration-graphql + 6.1.2 + + + org.springframework.integration + spring-integration-feed + 6.1.2 + + + org.springframework.integration + spring-integration-jpa + 6.1.2 + + + org.springframework.integration + spring-integration-test + 6.1.2 + + + org.springframework.integration + spring-integration-zeromq + 6.1.2 + + + org.springframework.integration + spring-integration-http + 6.1.2 + + + org.springframework.integration + spring-integration-zookeeper + 6.1.2 + + + org.springframework.integration + spring-integration-ip + 6.1.2 + + + org.springframework.integration + spring-integration-hazelcast + 6.1.2 + + + org.springframework.integration + spring-integration-test-support + 6.1.2 + + + org.springframework.integration + spring-integration-amqp + 6.1.2 + + + org.springframework.integration + spring-integration-mail + 6.1.2 + + + org.springframework.integration + spring-integration-security + 6.1.2 + + + org.springframework.integration + spring-integration-camel + 6.1.2 + + + org.springframework.integration + spring-integration-xml + 6.1.2 + + + org.springframework.integration + spring-integration-core + 6.1.2 + + + org.springframework.integration + spring-integration-zip + 6.1.2 + + + org.springframework.integration + spring-integration-jms + 6.1.2 + + + org.springframework.integration + spring-integration-mongodb + 6.1.2 + + + org.springframework.integration + spring-integration-stream + 6.1.2 + + + org.springframework.integration + spring-integration-stomp + 6.1.2 + org.springframework.boot spring-boot-dependencies @@ -155,14 +360,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 36d9d0b8d..803d8e79d 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -131,6 +131,211 @@ + + org.springframework.integration + spring-integration-file + 6.1.2 + + + org.springframework.integration + spring-integration-syslog + 6.1.2 + + + org.springframework.integration + spring-integration-smb + 6.1.2 + + + org.springframework.integration + spring-integration-jdbc + 6.1.2 + + + org.springframework.integration + spring-integration-jmx + 6.1.2 + + + org.springframework.integration + spring-integration-ws + 6.1.2 + + + org.springframework.integration + spring-integration-redis + 6.1.2 + + + org.springframework.integration + spring-integration-r2dbc + 6.1.2 + + + org.springframework.integration + spring-integration-webflux + 6.1.2 + + + org.springframework.integration + spring-integration-sftp + 6.1.2 + + + org.springframework.integration + spring-integration-rsocket + 6.1.2 + + + org.springframework.integration + spring-integration-mqtt + 6.1.2 + + + org.springframework.integration + spring-integration-event + 6.1.2 + + + org.springframework.integration + spring-integration-ftp + 6.1.2 + + + org.springframework.integration + spring-integration-kafka + 6.1.2 + + + org.springframework.integration + spring-integration-groovy + 6.1.2 + + + org.springframework.integration + spring-integration-cassandra + 6.1.2 + + + org.springframework.integration + spring-integration-scripting + 6.1.2 + + + org.springframework.integration + spring-integration-xmpp + 6.1.2 + + + org.springframework.integration + spring-integration-websocket + 6.1.2 + + + org.springframework.integration + spring-integration-graphql + 6.1.2 + + + org.springframework.integration + spring-integration-feed + 6.1.2 + + + org.springframework.integration + spring-integration-jpa + 6.1.2 + + + org.springframework.integration + spring-integration-test + 6.1.2 + + + org.springframework.integration + spring-integration-zeromq + 6.1.2 + + + org.springframework.integration + spring-integration-http + 6.1.2 + + + org.springframework.integration + spring-integration-zookeeper + 6.1.2 + + + org.springframework.integration + spring-integration-ip + 6.1.2 + + + org.springframework.integration + spring-integration-hazelcast + 6.1.2 + + + org.springframework.integration + spring-integration-test-support + 6.1.2 + + + org.springframework.integration + spring-integration-amqp + 6.1.2 + + + org.springframework.integration + spring-integration-mail + 6.1.2 + + + org.springframework.integration + spring-integration-security + 6.1.2 + + + org.springframework.integration + spring-integration-camel + 6.1.2 + + + org.springframework.integration + spring-integration-xml + 6.1.2 + + + org.springframework.integration + spring-integration-core + 6.1.2 + + + org.springframework.integration + spring-integration-zip + 6.1.2 + + + org.springframework.integration + spring-integration-jms + 6.1.2 + + + org.springframework.integration + spring-integration-mongodb + 6.1.2 + + + org.springframework.integration + spring-integration-stream + 6.1.2 + + + org.springframework.integration + spring-integration-stomp + 6.1.2 + org.springframework.boot spring-boot-dependencies @@ -155,14 +360,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index a9275920b..5ff8b2526 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 325e84fca..bf5844414 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 1688886f5..e0ade77e4 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -119,6 +119,211 @@ + + org.springframework.integration + spring-integration-file + 6.1.2 + + + org.springframework.integration + spring-integration-syslog + 6.1.2 + + + org.springframework.integration + spring-integration-smb + 6.1.2 + + + org.springframework.integration + spring-integration-jdbc + 6.1.2 + + + org.springframework.integration + spring-integration-jmx + 6.1.2 + + + org.springframework.integration + spring-integration-ws + 6.1.2 + + + org.springframework.integration + spring-integration-redis + 6.1.2 + + + org.springframework.integration + spring-integration-r2dbc + 6.1.2 + + + org.springframework.integration + spring-integration-webflux + 6.1.2 + + + org.springframework.integration + spring-integration-sftp + 6.1.2 + + + org.springframework.integration + spring-integration-rsocket + 6.1.2 + + + org.springframework.integration + spring-integration-mqtt + 6.1.2 + + + org.springframework.integration + spring-integration-event + 6.1.2 + + + org.springframework.integration + spring-integration-ftp + 6.1.2 + + + org.springframework.integration + spring-integration-kafka + 6.1.2 + + + org.springframework.integration + spring-integration-groovy + 6.1.2 + + + org.springframework.integration + spring-integration-cassandra + 6.1.2 + + + org.springframework.integration + spring-integration-scripting + 6.1.2 + + + org.springframework.integration + spring-integration-xmpp + 6.1.2 + + + org.springframework.integration + spring-integration-websocket + 6.1.2 + + + org.springframework.integration + spring-integration-graphql + 6.1.2 + + + org.springframework.integration + spring-integration-feed + 6.1.2 + + + org.springframework.integration + spring-integration-jpa + 6.1.2 + + + org.springframework.integration + spring-integration-test + 6.1.2 + + + org.springframework.integration + spring-integration-zeromq + 6.1.2 + + + org.springframework.integration + spring-integration-http + 6.1.2 + + + org.springframework.integration + spring-integration-zookeeper + 6.1.2 + + + org.springframework.integration + spring-integration-ip + 6.1.2 + + + org.springframework.integration + spring-integration-hazelcast + 6.1.2 + + + org.springframework.integration + spring-integration-test-support + 6.1.2 + + + org.springframework.integration + spring-integration-amqp + 6.1.2 + + + org.springframework.integration + spring-integration-mail + 6.1.2 + + + org.springframework.integration + spring-integration-security + 6.1.2 + + + org.springframework.integration + spring-integration-camel + 6.1.2 + + + org.springframework.integration + spring-integration-xml + 6.1.2 + + + org.springframework.integration + spring-integration-core + 6.1.2 + + + org.springframework.integration + spring-integration-zip + 6.1.2 + + + org.springframework.integration + spring-integration-jms + 6.1.2 + + + org.springframework.integration + spring-integration-mongodb + 6.1.2 + + + org.springframework.integration + spring-integration-stream + 6.1.2 + + + org.springframework.integration + spring-integration-stomp + 6.1.2 + org.springframework.boot spring-boot-dependencies @@ -143,14 +348,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 83b66a456..448213fbc 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index cdb6c9513..fa2ce55fb 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index f4164b92f..0283d7818 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index a60f44738..00c508db3 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 91d18997c..b39592bef 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -119,6 +119,211 @@ + + org.springframework.integration + spring-integration-file + 6.1.2 + + + org.springframework.integration + spring-integration-syslog + 6.1.2 + + + org.springframework.integration + spring-integration-smb + 6.1.2 + + + org.springframework.integration + spring-integration-jdbc + 6.1.2 + + + org.springframework.integration + spring-integration-jmx + 6.1.2 + + + org.springframework.integration + spring-integration-ws + 6.1.2 + + + org.springframework.integration + spring-integration-redis + 6.1.2 + + + org.springframework.integration + spring-integration-r2dbc + 6.1.2 + + + org.springframework.integration + spring-integration-webflux + 6.1.2 + + + org.springframework.integration + spring-integration-sftp + 6.1.2 + + + org.springframework.integration + spring-integration-rsocket + 6.1.2 + + + org.springframework.integration + spring-integration-mqtt + 6.1.2 + + + org.springframework.integration + spring-integration-event + 6.1.2 + + + org.springframework.integration + spring-integration-ftp + 6.1.2 + + + org.springframework.integration + spring-integration-kafka + 6.1.2 + + + org.springframework.integration + spring-integration-groovy + 6.1.2 + + + org.springframework.integration + spring-integration-cassandra + 6.1.2 + + + org.springframework.integration + spring-integration-scripting + 6.1.2 + + + org.springframework.integration + spring-integration-xmpp + 6.1.2 + + + org.springframework.integration + spring-integration-websocket + 6.1.2 + + + org.springframework.integration + spring-integration-graphql + 6.1.2 + + + org.springframework.integration + spring-integration-feed + 6.1.2 + + + org.springframework.integration + spring-integration-jpa + 6.1.2 + + + org.springframework.integration + spring-integration-test + 6.1.2 + + + org.springframework.integration + spring-integration-zeromq + 6.1.2 + + + org.springframework.integration + spring-integration-http + 6.1.2 + + + org.springframework.integration + spring-integration-zookeeper + 6.1.2 + + + org.springframework.integration + spring-integration-ip + 6.1.2 + + + org.springframework.integration + spring-integration-hazelcast + 6.1.2 + + + org.springframework.integration + spring-integration-test-support + 6.1.2 + + + org.springframework.integration + spring-integration-amqp + 6.1.2 + + + org.springframework.integration + spring-integration-mail + 6.1.2 + + + org.springframework.integration + spring-integration-security + 6.1.2 + + + org.springframework.integration + spring-integration-camel + 6.1.2 + + + org.springframework.integration + spring-integration-xml + 6.1.2 + + + org.springframework.integration + spring-integration-core + 6.1.2 + + + org.springframework.integration + spring-integration-zip + 6.1.2 + + + org.springframework.integration + spring-integration-jms + 6.1.2 + + + org.springframework.integration + spring-integration-mongodb + 6.1.2 + + + org.springframework.integration + spring-integration-stream + 6.1.2 + + + org.springframework.integration + spring-integration-stomp + 6.1.2 + org.springframework.boot spring-boot-dependencies @@ -143,14 +348,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index d2d0f7e61..a0068331c 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 1e81bf405..35bd85bd6 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -119,6 +119,211 @@ + + org.springframework.integration + spring-integration-file + 6.1.2 + + + org.springframework.integration + spring-integration-syslog + 6.1.2 + + + org.springframework.integration + spring-integration-smb + 6.1.2 + + + org.springframework.integration + spring-integration-jdbc + 6.1.2 + + + org.springframework.integration + spring-integration-jmx + 6.1.2 + + + org.springframework.integration + spring-integration-ws + 6.1.2 + + + org.springframework.integration + spring-integration-redis + 6.1.2 + + + org.springframework.integration + spring-integration-r2dbc + 6.1.2 + + + org.springframework.integration + spring-integration-webflux + 6.1.2 + + + org.springframework.integration + spring-integration-sftp + 6.1.2 + + + org.springframework.integration + spring-integration-rsocket + 6.1.2 + + + org.springframework.integration + spring-integration-mqtt + 6.1.2 + + + org.springframework.integration + spring-integration-event + 6.1.2 + + + org.springframework.integration + spring-integration-ftp + 6.1.2 + + + org.springframework.integration + spring-integration-kafka + 6.1.2 + + + org.springframework.integration + spring-integration-groovy + 6.1.2 + + + org.springframework.integration + spring-integration-cassandra + 6.1.2 + + + org.springframework.integration + spring-integration-scripting + 6.1.2 + + + org.springframework.integration + spring-integration-xmpp + 6.1.2 + + + org.springframework.integration + spring-integration-websocket + 6.1.2 + + + org.springframework.integration + spring-integration-graphql + 6.1.2 + + + org.springframework.integration + spring-integration-feed + 6.1.2 + + + org.springframework.integration + spring-integration-jpa + 6.1.2 + + + org.springframework.integration + spring-integration-test + 6.1.2 + + + org.springframework.integration + spring-integration-zeromq + 6.1.2 + + + org.springframework.integration + spring-integration-http + 6.1.2 + + + org.springframework.integration + spring-integration-zookeeper + 6.1.2 + + + org.springframework.integration + spring-integration-ip + 6.1.2 + + + org.springframework.integration + spring-integration-hazelcast + 6.1.2 + + + org.springframework.integration + spring-integration-test-support + 6.1.2 + + + org.springframework.integration + spring-integration-amqp + 6.1.2 + + + org.springframework.integration + spring-integration-mail + 6.1.2 + + + org.springframework.integration + spring-integration-security + 6.1.2 + + + org.springframework.integration + spring-integration-camel + 6.1.2 + + + org.springframework.integration + spring-integration-xml + 6.1.2 + + + org.springframework.integration + spring-integration-core + 6.1.2 + + + org.springframework.integration + spring-integration-zip + 6.1.2 + + + org.springframework.integration + spring-integration-jms + 6.1.2 + + + org.springframework.integration + spring-integration-mongodb + 6.1.2 + + + org.springframework.integration + spring-integration-stream + 6.1.2 + + + org.springframework.integration + spring-integration-stomp + 6.1.2 + org.springframework.boot spring-boot-dependencies @@ -143,14 +348,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 581f9cdb1..5397939e7 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -141,14 +141,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 7289d340c..6e685bd15 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -127,14 +127,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 0c014f80d..db0d9abc5 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -114,6 +114,211 @@ + + org.springframework.integration + spring-integration-file + 6.1.2 + + + org.springframework.integration + spring-integration-syslog + 6.1.2 + + + org.springframework.integration + spring-integration-smb + 6.1.2 + + + org.springframework.integration + spring-integration-jdbc + 6.1.2 + + + org.springframework.integration + spring-integration-jmx + 6.1.2 + + + org.springframework.integration + spring-integration-ws + 6.1.2 + + + org.springframework.integration + spring-integration-redis + 6.1.2 + + + org.springframework.integration + spring-integration-r2dbc + 6.1.2 + + + org.springframework.integration + spring-integration-webflux + 6.1.2 + + + org.springframework.integration + spring-integration-sftp + 6.1.2 + + + org.springframework.integration + spring-integration-rsocket + 6.1.2 + + + org.springframework.integration + spring-integration-mqtt + 6.1.2 + + + org.springframework.integration + spring-integration-event + 6.1.2 + + + org.springframework.integration + spring-integration-ftp + 6.1.2 + + + org.springframework.integration + spring-integration-kafka + 6.1.2 + + + org.springframework.integration + spring-integration-groovy + 6.1.2 + + + org.springframework.integration + spring-integration-cassandra + 6.1.2 + + + org.springframework.integration + spring-integration-scripting + 6.1.2 + + + org.springframework.integration + spring-integration-xmpp + 6.1.2 + + + org.springframework.integration + spring-integration-websocket + 6.1.2 + + + org.springframework.integration + spring-integration-graphql + 6.1.2 + + + org.springframework.integration + spring-integration-feed + 6.1.2 + + + org.springframework.integration + spring-integration-jpa + 6.1.2 + + + org.springframework.integration + spring-integration-test + 6.1.2 + + + org.springframework.integration + spring-integration-zeromq + 6.1.2 + + + org.springframework.integration + spring-integration-http + 6.1.2 + + + org.springframework.integration + spring-integration-zookeeper + 6.1.2 + + + org.springframework.integration + spring-integration-ip + 6.1.2 + + + org.springframework.integration + spring-integration-hazelcast + 6.1.2 + + + org.springframework.integration + spring-integration-test-support + 6.1.2 + + + org.springframework.integration + spring-integration-amqp + 6.1.2 + + + org.springframework.integration + spring-integration-mail + 6.1.2 + + + org.springframework.integration + spring-integration-security + 6.1.2 + + + org.springframework.integration + spring-integration-camel + 6.1.2 + + + org.springframework.integration + spring-integration-xml + 6.1.2 + + + org.springframework.integration + spring-integration-core + 6.1.2 + + + org.springframework.integration + spring-integration-zip + 6.1.2 + + + org.springframework.integration + spring-integration-jms + 6.1.2 + + + org.springframework.integration + spring-integration-mongodb + 6.1.2 + + + org.springframework.integration + spring-integration-stream + 6.1.2 + + + org.springframework.integration + spring-integration-stomp + 6.1.2 + org.springframework.boot spring-boot-dependencies @@ -138,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index c83544d90..2a7d60294 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -168,14 +168,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 6a25fbe19..7e703cf3a 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 0c91ec978..7f7bab826 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 7c7d5faf5..8f76ec545 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/build.gradle b/build.gradle index ddfe4119f..6c8ded25b 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,6 @@ buildscript { repositories { mavenCentral() gradlePluginPortal() - maven { url 'https://repo.spring.io/plugins-release-local' } maven { url 'https://repo.spring.io/milestone' } maven { url 'https://repo.spring.io/snapshot' } } @@ -35,10 +34,9 @@ allprojects { repositories { mavenCentral() - maven { url 'https://repo.spring.io/release' } maven { url 'https://repo.spring.io/milestone' } maven { url 'https://repo.spring.io/snapshot' } -// maven { url 'https://repo.spring.io/libs-staging-local' } + maven { url 'https://repo.spring.io/libs-staging-local' } } } @@ -260,14 +258,14 @@ subprojects { subproject -> postgresVersion = '42.6.0' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.2' - springIntegrationVersion = '6.1.1' + springIntegrationVersion = '6.1.2' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.0.10' - springSecurityVersion = '6.1.1' + springVersion = '6.0.11' + springSecurityVersion = '6.1.2' springWebFlowVersion = '3.0.0' - testcontainersVersion = '1.18.1' + testcontainersVersion = '1.18.3' tilesJspVersion = '2.2.1' } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 88b7a2600..c448bda41 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -125,6 +125,211 @@ + + org.springframework.integration + spring-integration-file + 6.1.2 + + + org.springframework.integration + spring-integration-syslog + 6.1.2 + + + org.springframework.integration + spring-integration-smb + 6.1.2 + + + org.springframework.integration + spring-integration-jdbc + 6.1.2 + + + org.springframework.integration + spring-integration-jmx + 6.1.2 + + + org.springframework.integration + spring-integration-ws + 6.1.2 + + + org.springframework.integration + spring-integration-redis + 6.1.2 + + + org.springframework.integration + spring-integration-r2dbc + 6.1.2 + + + org.springframework.integration + spring-integration-webflux + 6.1.2 + + + org.springframework.integration + spring-integration-sftp + 6.1.2 + + + org.springframework.integration + spring-integration-rsocket + 6.1.2 + + + org.springframework.integration + spring-integration-mqtt + 6.1.2 + + + org.springframework.integration + spring-integration-event + 6.1.2 + + + org.springframework.integration + spring-integration-ftp + 6.1.2 + + + org.springframework.integration + spring-integration-kafka + 6.1.2 + + + org.springframework.integration + spring-integration-groovy + 6.1.2 + + + org.springframework.integration + spring-integration-cassandra + 6.1.2 + + + org.springframework.integration + spring-integration-scripting + 6.1.2 + + + org.springframework.integration + spring-integration-xmpp + 6.1.2 + + + org.springframework.integration + spring-integration-websocket + 6.1.2 + + + org.springframework.integration + spring-integration-graphql + 6.1.2 + + + org.springframework.integration + spring-integration-feed + 6.1.2 + + + org.springframework.integration + spring-integration-jpa + 6.1.2 + + + org.springframework.integration + spring-integration-test + 6.1.2 + + + org.springframework.integration + spring-integration-zeromq + 6.1.2 + + + org.springframework.integration + spring-integration-http + 6.1.2 + + + org.springframework.integration + spring-integration-zookeeper + 6.1.2 + + + org.springframework.integration + spring-integration-ip + 6.1.2 + + + org.springframework.integration + spring-integration-hazelcast + 6.1.2 + + + org.springframework.integration + spring-integration-test-support + 6.1.2 + + + org.springframework.integration + spring-integration-amqp + 6.1.2 + + + org.springframework.integration + spring-integration-mail + 6.1.2 + + + org.springframework.integration + spring-integration-security + 6.1.2 + + + org.springframework.integration + spring-integration-camel + 6.1.2 + + + org.springframework.integration + spring-integration-xml + 6.1.2 + + + org.springframework.integration + spring-integration-core + 6.1.2 + + + org.springframework.integration + spring-integration-zip + 6.1.2 + + + org.springframework.integration + spring-integration-jms + 6.1.2 + + + org.springframework.integration + spring-integration-mongodb + 6.1.2 + + + org.springframework.integration + spring-integration-stream + 6.1.2 + + + org.springframework.integration + spring-integration-stomp + 6.1.2 + org.springframework.boot spring-boot-dependencies @@ -149,14 +354,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 8ac66bd5a..5cd6aac32 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -125,6 +125,211 @@ + + org.springframework.integration + spring-integration-file + 6.1.2 + + + org.springframework.integration + spring-integration-syslog + 6.1.2 + + + org.springframework.integration + spring-integration-smb + 6.1.2 + + + org.springframework.integration + spring-integration-jdbc + 6.1.2 + + + org.springframework.integration + spring-integration-jmx + 6.1.2 + + + org.springframework.integration + spring-integration-ws + 6.1.2 + + + org.springframework.integration + spring-integration-redis + 6.1.2 + + + org.springframework.integration + spring-integration-r2dbc + 6.1.2 + + + org.springframework.integration + spring-integration-webflux + 6.1.2 + + + org.springframework.integration + spring-integration-sftp + 6.1.2 + + + org.springframework.integration + spring-integration-rsocket + 6.1.2 + + + org.springframework.integration + spring-integration-mqtt + 6.1.2 + + + org.springframework.integration + spring-integration-event + 6.1.2 + + + org.springframework.integration + spring-integration-ftp + 6.1.2 + + + org.springframework.integration + spring-integration-kafka + 6.1.2 + + + org.springframework.integration + spring-integration-groovy + 6.1.2 + + + org.springframework.integration + spring-integration-cassandra + 6.1.2 + + + org.springframework.integration + spring-integration-scripting + 6.1.2 + + + org.springframework.integration + spring-integration-xmpp + 6.1.2 + + + org.springframework.integration + spring-integration-websocket + 6.1.2 + + + org.springframework.integration + spring-integration-graphql + 6.1.2 + + + org.springframework.integration + spring-integration-feed + 6.1.2 + + + org.springframework.integration + spring-integration-jpa + 6.1.2 + + + org.springframework.integration + spring-integration-test + 6.1.2 + + + org.springframework.integration + spring-integration-zeromq + 6.1.2 + + + org.springframework.integration + spring-integration-http + 6.1.2 + + + org.springframework.integration + spring-integration-zookeeper + 6.1.2 + + + org.springframework.integration + spring-integration-ip + 6.1.2 + + + org.springframework.integration + spring-integration-hazelcast + 6.1.2 + + + org.springframework.integration + spring-integration-test-support + 6.1.2 + + + org.springframework.integration + spring-integration-amqp + 6.1.2 + + + org.springframework.integration + spring-integration-mail + 6.1.2 + + + org.springframework.integration + spring-integration-security + 6.1.2 + + + org.springframework.integration + spring-integration-camel + 6.1.2 + + + org.springframework.integration + spring-integration-xml + 6.1.2 + + + org.springframework.integration + spring-integration-core + 6.1.2 + + + org.springframework.integration + spring-integration-zip + 6.1.2 + + + org.springframework.integration + spring-integration-jms + 6.1.2 + + + org.springframework.integration + spring-integration-mongodb + 6.1.2 + + + org.springframework.integration + spring-integration-stream + 6.1.2 + + + org.springframework.integration + spring-integration-stomp + 6.1.2 + org.springframework.boot spring-boot-dependencies @@ -149,14 +354,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 7c900d983..4d640c2c1 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -147,6 +147,211 @@ + + org.springframework.integration + spring-integration-file + 6.1.2 + + + org.springframework.integration + spring-integration-syslog + 6.1.2 + + + org.springframework.integration + spring-integration-smb + 6.1.2 + + + org.springframework.integration + spring-integration-jdbc + 6.1.2 + + + org.springframework.integration + spring-integration-jmx + 6.1.2 + + + org.springframework.integration + spring-integration-ws + 6.1.2 + + + org.springframework.integration + spring-integration-redis + 6.1.2 + + + org.springframework.integration + spring-integration-r2dbc + 6.1.2 + + + org.springframework.integration + spring-integration-webflux + 6.1.2 + + + org.springframework.integration + spring-integration-sftp + 6.1.2 + + + org.springframework.integration + spring-integration-rsocket + 6.1.2 + + + org.springframework.integration + spring-integration-mqtt + 6.1.2 + + + org.springframework.integration + spring-integration-event + 6.1.2 + + + org.springframework.integration + spring-integration-ftp + 6.1.2 + + + org.springframework.integration + spring-integration-kafka + 6.1.2 + + + org.springframework.integration + spring-integration-groovy + 6.1.2 + + + org.springframework.integration + spring-integration-cassandra + 6.1.2 + + + org.springframework.integration + spring-integration-scripting + 6.1.2 + + + org.springframework.integration + spring-integration-xmpp + 6.1.2 + + + org.springframework.integration + spring-integration-websocket + 6.1.2 + + + org.springframework.integration + spring-integration-graphql + 6.1.2 + + + org.springframework.integration + spring-integration-feed + 6.1.2 + + + org.springframework.integration + spring-integration-jpa + 6.1.2 + + + org.springframework.integration + spring-integration-test + 6.1.2 + + + org.springframework.integration + spring-integration-zeromq + 6.1.2 + + + org.springframework.integration + spring-integration-http + 6.1.2 + + + org.springframework.integration + spring-integration-zookeeper + 6.1.2 + + + org.springframework.integration + spring-integration-ip + 6.1.2 + + + org.springframework.integration + spring-integration-hazelcast + 6.1.2 + + + org.springframework.integration + spring-integration-test-support + 6.1.2 + + + org.springframework.integration + spring-integration-amqp + 6.1.2 + + + org.springframework.integration + spring-integration-mail + 6.1.2 + + + org.springframework.integration + spring-integration-security + 6.1.2 + + + org.springframework.integration + spring-integration-camel + 6.1.2 + + + org.springframework.integration + spring-integration-xml + 6.1.2 + + + org.springframework.integration + spring-integration-core + 6.1.2 + + + org.springframework.integration + spring-integration-zip + 6.1.2 + + + org.springframework.integration + spring-integration-jms + 6.1.2 + + + org.springframework.integration + spring-integration-mongodb + 6.1.2 + + + org.springframework.integration + spring-integration-stream + 6.1.2 + + + org.springframework.integration + spring-integration-stomp + 6.1.2 + org.springframework.boot spring-boot-dependencies @@ -171,14 +376,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 532ebf70a..6208877d0 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 3b7ab32a5..a0ee9e0d7 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 2997e8555..652d17d8c 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 4590c980c..c23dafba5 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 8150979ac..0eb3b5038 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 2bcd45701..f48075a42 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 99812e82d..4567bfc53 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index b09cd71eb..2156b4517 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -95,13 +95,13 @@ org.springframework.security spring-security-web - 6.1.1 + 6.1.2 compile org.springframework.security spring-security-config - 6.1.1 + 6.1.2 compile @@ -211,14 +211,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 3e632c1ec..a430d6591 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 76b1a542f..09c6c7cf3 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 8b6304137..31eb9401e 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index c41e9f8b9..3eedde2fa 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index cbc69ddac..523f84c70 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index d48ca19f0..7d3dcb797 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -144,14 +144,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index b5c844dec..80d46d7b8 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -114,6 +114,211 @@ + + org.springframework.integration + spring-integration-file + 6.1.2 + + + org.springframework.integration + spring-integration-syslog + 6.1.2 + + + org.springframework.integration + spring-integration-smb + 6.1.2 + + + org.springframework.integration + spring-integration-jdbc + 6.1.2 + + + org.springframework.integration + spring-integration-jmx + 6.1.2 + + + org.springframework.integration + spring-integration-ws + 6.1.2 + + + org.springframework.integration + spring-integration-redis + 6.1.2 + + + org.springframework.integration + spring-integration-r2dbc + 6.1.2 + + + org.springframework.integration + spring-integration-webflux + 6.1.2 + + + org.springframework.integration + spring-integration-sftp + 6.1.2 + + + org.springframework.integration + spring-integration-rsocket + 6.1.2 + + + org.springframework.integration + spring-integration-mqtt + 6.1.2 + + + org.springframework.integration + spring-integration-event + 6.1.2 + + + org.springframework.integration + spring-integration-ftp + 6.1.2 + + + org.springframework.integration + spring-integration-kafka + 6.1.2 + + + org.springframework.integration + spring-integration-groovy + 6.1.2 + + + org.springframework.integration + spring-integration-cassandra + 6.1.2 + + + org.springframework.integration + spring-integration-scripting + 6.1.2 + + + org.springframework.integration + spring-integration-xmpp + 6.1.2 + + + org.springframework.integration + spring-integration-websocket + 6.1.2 + + + org.springframework.integration + spring-integration-graphql + 6.1.2 + + + org.springframework.integration + spring-integration-feed + 6.1.2 + + + org.springframework.integration + spring-integration-jpa + 6.1.2 + + + org.springframework.integration + spring-integration-test + 6.1.2 + + + org.springframework.integration + spring-integration-zeromq + 6.1.2 + + + org.springframework.integration + spring-integration-http + 6.1.2 + + + org.springframework.integration + spring-integration-zookeeper + 6.1.2 + + + org.springframework.integration + spring-integration-ip + 6.1.2 + + + org.springframework.integration + spring-integration-hazelcast + 6.1.2 + + + org.springframework.integration + spring-integration-test-support + 6.1.2 + + + org.springframework.integration + spring-integration-amqp + 6.1.2 + + + org.springframework.integration + spring-integration-mail + 6.1.2 + + + org.springframework.integration + spring-integration-security + 6.1.2 + + + org.springframework.integration + spring-integration-camel + 6.1.2 + + + org.springframework.integration + spring-integration-xml + 6.1.2 + + + org.springframework.integration + spring-integration-core + 6.1.2 + + + org.springframework.integration + spring-integration-zip + 6.1.2 + + + org.springframework.integration + spring-integration-jms + 6.1.2 + + + org.springframework.integration + spring-integration-mongodb + 6.1.2 + + + org.springframework.integration + spring-integration-stream + 6.1.2 + + + org.springframework.integration + spring-integration-stomp + 6.1.2 + org.springframework.boot spring-boot-dependencies @@ -138,14 +343,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index c431ee356..3d8af161b 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 0809c2558..951c634f3 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -114,7 +114,7 @@ org.testcontainers junit-jupiter - 1.18.1 + 1.18.3 test @@ -141,6 +141,211 @@ + + org.springframework.integration + spring-integration-jdbc + 6.1.2 + + + org.springframework.integration + spring-integration-ws + 6.1.2 + + + org.springframework.integration + spring-integration-redis + 6.1.2 + + + org.springframework.integration + spring-integration-r2dbc + 6.1.2 + + + org.springframework.integration + spring-integration-rsocket + 6.1.2 + + + org.springframework.integration + spring-integration-event + 6.1.2 + + + org.springframework.integration + spring-integration-cassandra + 6.1.2 + + + org.springframework.integration + spring-integration-scripting + 6.1.2 + + + org.springframework.integration + spring-integration-websocket + 6.1.2 + + + org.springframework.integration + spring-integration-graphql + 6.1.2 + + + org.springframework.integration + spring-integration-jpa + 6.1.2 + + + org.springframework.integration + spring-integration-test + 6.1.2 + + + org.springframework.integration + spring-integration-http + 6.1.2 + + + org.springframework.integration + spring-integration-zookeeper + 6.1.2 + + + org.springframework.integration + spring-integration-ip + 6.1.2 + + + org.springframework.integration + spring-integration-mail + 6.1.2 + + + org.springframework.integration + spring-integration-camel + 6.1.2 + + + org.springframework.integration + spring-integration-mongodb + 6.1.2 + + + org.springframework.integration + spring-integration-stream + 6.1.2 + + + org.springframework.integration + spring-integration-stomp + 6.1.2 + + + org.springframework.integration + spring-integration-file + 6.1.2 + + + org.springframework.integration + spring-integration-syslog + 6.1.2 + + + org.springframework.integration + spring-integration-smb + 6.1.2 + + + org.springframework.integration + spring-integration-jmx + 6.1.2 + + + org.springframework.integration + spring-integration-webflux + 6.1.2 + + + org.springframework.integration + spring-integration-sftp + 6.1.2 + + + org.springframework.integration + spring-integration-mqtt + 6.1.2 + + + org.springframework.integration + spring-integration-ftp + 6.1.2 + + + org.springframework.integration + spring-integration-kafka + 6.1.2 + + + org.springframework.integration + spring-integration-groovy + 6.1.2 + + + org.springframework.integration + spring-integration-xmpp + 6.1.2 + + + org.springframework.integration + spring-integration-feed + 6.1.2 + + + org.springframework.integration + spring-integration-zeromq + 6.1.2 + + + org.springframework.integration + spring-integration-hazelcast + 6.1.2 + + + org.springframework.integration + spring-integration-test-support + 6.1.2 + + + org.springframework.integration + spring-integration-amqp + 6.1.2 + + + org.springframework.integration + spring-integration-security + 6.1.2 + + + org.springframework.integration + spring-integration-xml + 6.1.2 + + + org.springframework.integration + spring-integration-core + 6.1.2 + + + org.springframework.integration + spring-integration-zip + 6.1.2 + + + org.springframework.integration + spring-integration-jms + 6.1.2 + org.springframework.cloud spring-cloud-dependencies @@ -172,14 +377,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 0db615e97..36ea95925 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -136,14 +136,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index e1f23a3a6..6036f4f6c 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.0.10 + 6.0.11 import pom org.springframework.integration spring-integration-bom - 6.1.1 + 6.1.2 import pom From 3d22d656cc317d4905656d3369dc70a5c2f166ce Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Tue, 15 Aug 2023 14:10:16 -0500 Subject: [PATCH 328/356] Connect build to ge.spring.io (#354) This change publishes a build scan to ge.spring.io for every local build from an authenticated Spring committer and for CI where appropriate access tokens are available. The build will not fail if publishing fails. This change also allows the build to benefit from remote build caching, providing faster builds for all contributors. Additionally, the project will have access to all features of Gradle Enterprise such as: - Dashboards to view all historical build scans, along with performance trends over time - Build failure analytics for enhanced investigation and diagnosis of build failures - Test failure analytics to better understand trends and causes around slow, failing, and flaky tests --- README.md | 2 ++ settings.gradle | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/README.md b/README.md index 7c0345972..7407bd92b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Spring Integration Samples ========================== +[![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.spring.io/scans?search.rootProjectNames=spring-integration-samples) + Welcome to the **Spring Integration Samples** repository which provides **50+ samples** to help you learn [Spring Integration][]. To simplify your experience, the *Spring Integration* samples are split into 4 distinct categories: * Basic diff --git a/settings.gradle b/settings.gradle index 7e8f229c3..2d70559ed 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { url 'https://repo.spring.io/release' } + } +} + +plugins { + id 'com.gradle.enterprise' version '3.14.1' + id 'io.spring.ge.conventions' version '0.0.13' +} + rootProject.name = 'spring-integration-samples' ['advanced', 'applications', 'basic', 'intermediate', 'dsl'].each { From 81da625e3c6f9cb4202c352e6a05819e55587f2b Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 19 Sep 2023 16:55:19 -0400 Subject: [PATCH 329/356] Upgrade to SI-6.1.3 --- advanced/advanced-testing-examples/pom.xml | 2 +- advanced/dynamic-ftp/pom.xml | 2 +- advanced/dynamic-tcp-client/pom.xml | 84 +++++++++++----------- applications/cafe-scripted/pom.xml | 2 +- applications/cafe/cafe-amqp/pom.xml | 2 +- applications/cafe/cafe-jms/pom.xml | 2 +- applications/cafe/cafe-si/pom.xml | 2 +- applications/file-split-ftp/pom.xml | 84 +++++++++++----------- basic/amqp/pom.xml | 2 +- basic/barrier/pom.xml | 84 +++++++++++----------- basic/control-bus/pom.xml | 2 +- basic/enricher/pom.xml | 2 +- basic/feed/pom.xml | 2 +- basic/file/pom.xml | 2 +- basic/ftp/pom.xml | 2 +- build.gradle | 4 +- dsl/cafe-dsl/pom.xml | 84 +++++++++++----------- intermediate/async-gateway/pom.xml | 2 +- intermediate/dynamic-poller/pom.xml | 2 +- intermediate/errorhandling/pom.xml | 2 +- intermediate/file-processing/pom.xml | 2 +- 21 files changed, 186 insertions(+), 186 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index cb98083fc..75d4487f1 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index cf50c3ec8..28dd24057 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index c253e7822..d7237c642 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -117,207 +117,207 @@ org.springframework.integration spring-integration-file - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-syslog - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-smb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jdbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jmx - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ws - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-redis - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-r2dbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-webflux - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-sftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-rsocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mqtt - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-event - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-kafka - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-groovy - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-cassandra - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-scripting - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xmpp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-websocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-graphql - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-feed - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jpa - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zeromq - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-http - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zookeeper - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-hazelcast - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test-support - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-amqp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mail - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-security - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-camel - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xml - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-core - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jms - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mongodb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stream - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stomp - 6.1.2 + 6.1.3 org.springframework.boot @@ -350,7 +350,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index c5ffa707e..368eef59a 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -166,7 +166,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index a98985649..0b766a831 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 3629b33dc..232aae610 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -163,7 +163,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 5b03979fe..dbca46ea4 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -138,7 +138,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 13df45e33..89cba73b8 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -144,207 +144,207 @@ org.springframework.integration spring-integration-file - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-syslog - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-smb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jdbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jmx - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ws - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-redis - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-r2dbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-webflux - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-sftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-rsocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mqtt - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-event - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-kafka - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-groovy - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-cassandra - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-scripting - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xmpp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-websocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-graphql - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-feed - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jpa - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zeromq - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-http - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zookeeper - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-hazelcast - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test-support - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-amqp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mail - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-security - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-camel - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xml - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-core - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jms - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mongodb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stream - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stomp - 6.1.2 + 6.1.3 org.springframework.boot @@ -377,7 +377,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 07d639b1d..1c0411ee0 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 7e0b45803..20a16cfd0 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -137,207 +137,207 @@ org.springframework.integration spring-integration-file - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-syslog - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-smb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jdbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jmx - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ws - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-redis - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-r2dbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-webflux - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-sftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-rsocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mqtt - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-event - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-kafka - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-groovy - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-cassandra - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-scripting - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xmpp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-websocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-graphql - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-feed - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jpa - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zeromq - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-http - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zookeeper - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-hazelcast - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test-support - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-amqp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mail - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-security - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-camel - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xml - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-core - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jms - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mongodb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stream - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stomp - 6.1.2 + 6.1.3 org.springframework.boot @@ -370,7 +370,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 7c002595c..beb1ebc4b 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 6c4670b0b..9eecff2ec 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 3d4fb1ff8..f80b7922b 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index b5b0101a1..43f2882c5 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index d90533d82..8aa283187 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -157,7 +157,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/build.gradle b/build.gradle index 6c8ded25b..21c641267 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ allprojects { mavenCentral() maven { url 'https://repo.spring.io/milestone' } maven { url 'https://repo.spring.io/snapshot' } - maven { url 'https://repo.spring.io/libs-staging-local' } +// maven { url 'https://repo.spring.io/libs-staging-local' } } } @@ -258,7 +258,7 @@ subprojects { subproject -> postgresVersion = '42.6.0' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.2' - springIntegrationVersion = '6.1.2' + springIntegrationVersion = '6.1.3' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index c448bda41..7981cc8f7 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -128,207 +128,207 @@ org.springframework.integration spring-integration-file - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-syslog - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-smb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jdbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jmx - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ws - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-redis - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-r2dbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-webflux - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-sftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-rsocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mqtt - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-event - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-kafka - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-groovy - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-cassandra - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-scripting - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xmpp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-websocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-graphql - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-feed - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jpa - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zeromq - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-http - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zookeeper - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-hazelcast - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test-support - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-amqp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mail - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-security - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-camel - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xml - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-core - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jms - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mongodb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stream - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stomp - 6.1.2 + 6.1.3 org.springframework.boot @@ -361,7 +361,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 6208877d0..8651d9c08 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index a0ee9e0d7..9dd0c583d 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 652d17d8c..bc2ccc8ec 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index c23dafba5..d07019717 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom From 95fe5da2ed7e11a1512b779b45195a086b85b770 Mon Sep 17 00:00:00 2001 From: Christian Tzolov Date: Tue, 17 Oct 2023 15:34:55 +0200 Subject: [PATCH 330/356] add vscode to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 04e4e5459..0c2dc253b 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ build/ /classes .mvn mvnw* +.vscode \ No newline at end of file From 1c98e3fd9936d1ca2c1c6482a97541080a4bafd0 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 26 Oct 2023 15:34:55 -0400 Subject: [PATCH 331/356] GH-356: Add `java.version` to generated poms Fixes https://github.com/spring-projects/spring-integration-samples/issues/356 --- advanced/advanced-testing-examples/pom.xml | 3 + advanced/dynamic-ftp/pom.xml | 3 + advanced/dynamic-tcp-client/pom.xml | 3 + applications/cafe-scripted/pom.xml | 3 + applications/cafe/cafe-amqp/pom.xml | 3 + applications/cafe/cafe-jms/pom.xml | 3 + applications/cafe/cafe-si/pom.xml | 3 + applications/file-split-ftp/pom.xml | 3 + applications/loan-broker/pom.xml | 5 +- applications/loanshark/pom.xml | 5 +- applications/stomp-chat/pom.xml | 87 ++++++++++--------- basic/amqp/pom.xml | 3 + basic/barrier/pom.xml | 3 + basic/control-bus/pom.xml | 3 + basic/enricher/pom.xml | 3 + basic/feed/pom.xml | 3 + basic/file/pom.xml | 3 + basic/ftp/pom.xml | 3 + basic/helloworld/pom.xml | 5 +- basic/http/pom.xml | 5 +- basic/jdbc/pom.xml | 5 +- basic/jms/pom.xml | 5 +- basic/jmx/pom.xml | 5 +- basic/jpa/pom.xml | 87 ++++++++++--------- basic/kafka/pom.xml | 87 ++++++++++--------- basic/mail/pom.xml | 5 +- basic/mongodb/pom.xml | 5 +- basic/mqtt/pom.xml | 87 ++++++++++--------- basic/oddeven/pom.xml | 5 +- basic/quote/pom.xml | 5 +- basic/sftp/pom.xml | 5 +- basic/tcp-amqp/pom.xml | 5 +- basic/tcp-broadcast/pom.xml | 87 ++++++++++--------- basic/tcp-client-server/pom.xml | 5 +- basic/tcp-with-headers/pom.xml | 87 ++++++++++--------- basic/testing-examples/pom.xml | 5 +- basic/twitter/pom.xml | 5 +- basic/web-sockets/pom.xml | 87 ++++++++++--------- basic/ws-inbound-gateway/pom.xml | 5 +- basic/ws-outbound-gateway/pom.xml | 5 +- basic/xml/pom.xml | 5 +- basic/xmpp/pom.xml | 5 +- build.gradle | 1 + dsl/cafe-dsl/pom.xml | 3 + dsl/kafka-dsl/pom.xml | 87 ++++++++++--------- dsl/si4demo/pom.xml | 87 ++++++++++--------- intermediate/async-gateway/pom.xml | 3 + intermediate/dynamic-poller/pom.xml | 3 + intermediate/errorhandling/pom.xml | 3 + intermediate/file-processing/pom.xml | 3 + intermediate/mail-attachments/pom.xml | 5 +- intermediate/monitoring/pom.xml | 5 +- intermediate/multipart-http/pom.xml | 5 +- intermediate/rest-http/pom.xml | 5 +- intermediate/retry-and-more/pom.xml | 5 +- .../splitter-aggregator-reaper/pom.xml | 5 +- intermediate/stored-procedures-derby/pom.xml | 5 +- intermediate/stored-procedures-ms/pom.xml | 5 +- intermediate/stored-procedures-oracle/pom.xml | 5 +- .../stored-procedures-postgresql/pom.xml | 5 +- intermediate/tcp-async-bi-directional/pom.xml | 87 ++++++++++--------- .../tcp-client-server-multiplex/pom.xml | 5 +- intermediate/testcontainers-rabbitmq/pom.xml | 87 ++++++++++--------- intermediate/travel/pom.xml | 5 +- intermediate/tx-synch/pom.xml | 5 +- 65 files changed, 688 insertions(+), 495 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 75d4487f1..41731265f 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -150,6 +150,9 @@ + + 17 + repo.spring.io.milestone diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 28dd24057..fea2fc29d 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -139,6 +139,9 @@ + + 17 + repo.spring.io.milestone diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index d7237c642..1ebab3c0a 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -356,6 +356,9 @@ + + 17 + diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 368eef59a..b1c246ffc 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -172,6 +172,9 @@ + + 17 + repo.spring.io.milestone diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 0b766a831..bdada6ecb 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -145,6 +145,9 @@ + + 17 + repo.spring.io.milestone diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 232aae610..40a699b96 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -169,6 +169,9 @@ + + 17 + repo.spring.io.milestone diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index dbca46ea4..f279aade7 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -144,6 +144,9 @@ + + 17 + repo.spring.io.milestone diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 89cba73b8..57daa6098 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -383,6 +383,9 @@ + + 17 + diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 4cea44c0e..6a17cc9f3 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -133,12 +133,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index d13a3a5fe..4a564e1ba 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -332,12 +332,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 59bc72d40..c647c8d1e 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -127,207 +127,207 @@ org.springframework.integration spring-integration-file - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-syslog - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-smb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jdbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jmx - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ws - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-redis - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-r2dbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-webflux - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-sftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-rsocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mqtt - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-event - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-kafka - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-groovy - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-cassandra - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-scripting - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xmpp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-websocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-graphql - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-feed - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jpa - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zeromq - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-http - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zookeeper - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-hazelcast - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test-support - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-amqp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mail - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-security - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-camel - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xml - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-core - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jms - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mongodb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stream - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stomp - 6.1.2 + 6.1.3 org.springframework.boot @@ -360,12 +360,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 1c0411ee0..dcb3f7356 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -150,6 +150,9 @@ + + 17 + repo.spring.io.milestone diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 20a16cfd0..6ca5598d7 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -376,6 +376,9 @@ + + 17 + diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index beb1ebc4b..ca7c818f0 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -139,6 +139,9 @@ + + 17 + repo.spring.io.milestone diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 9eecff2ec..3ad436f0f 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -145,6 +145,9 @@ + + 17 + repo.spring.io.milestone diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index f80b7922b..5a513c18c 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -139,6 +139,9 @@ + + 17 + repo.spring.io.milestone diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 43f2882c5..ecdd1d57b 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -139,6 +139,9 @@ + + 17 + repo.spring.io.milestone diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 8aa283187..019f589ab 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -163,6 +163,9 @@ + + 17 + repo.spring.io.milestone diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 1c5334733..1e77b229a 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -133,12 +133,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/http/pom.xml b/basic/http/pom.xml index a2a2eb532..436352f9e 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -193,12 +193,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 3782c0b84..eb7cfeb6f 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -139,12 +139,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 68a2a94ca..bce74e85a 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -162,12 +162,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 7971bcc35..f8451c1f3 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -138,12 +138,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index a6bcbc2cc..98fa686ec 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -134,207 +134,207 @@ org.springframework.integration spring-integration-file - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-syslog - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-smb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jdbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jmx - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ws - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-redis - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-r2dbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-webflux - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-sftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-rsocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mqtt - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-event - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-kafka - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-groovy - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-cassandra - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-scripting - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xmpp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-websocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-graphql - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-feed - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jpa - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zeromq - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-http - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zookeeper - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-hazelcast - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test-support - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-amqp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mail - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-security - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-camel - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xml - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-core - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jms - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mongodb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stream - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stomp - 6.1.2 + 6.1.3 org.springframework.boot @@ -367,12 +367,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 803d8e79d..d86591d11 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -134,207 +134,207 @@ org.springframework.integration spring-integration-file - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-syslog - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-smb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jdbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jmx - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ws - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-redis - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-r2dbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-webflux - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-sftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-rsocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mqtt - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-event - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-kafka - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-groovy - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-cassandra - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-scripting - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xmpp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-websocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-graphql - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-feed - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jpa - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zeromq - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-http - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zookeeper - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-hazelcast - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test-support - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-amqp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mail - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-security - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-camel - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xml - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-core - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jms - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mongodb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stream - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stomp - 6.1.2 + 6.1.3 org.springframework.boot @@ -367,12 +367,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 5ff8b2526..63d3ea411 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -144,12 +144,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index bf5844414..cc7242c86 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -139,12 +139,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index e0ade77e4..79d8d69f2 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -122,207 +122,207 @@ org.springframework.integration spring-integration-file - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-syslog - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-smb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jdbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jmx - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ws - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-redis - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-r2dbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-webflux - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-sftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-rsocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mqtt - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-event - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-kafka - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-groovy - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-cassandra - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-scripting - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xmpp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-websocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-graphql - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-feed - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jpa - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zeromq - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-http - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zookeeper - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-hazelcast - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test-support - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-amqp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mail - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-security - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-camel - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xml - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-core - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jms - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mongodb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stream - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stomp - 6.1.2 + 6.1.3 org.springframework.boot @@ -355,12 +355,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 448213fbc..f2dd21198 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -133,12 +133,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index fa2ce55fb..3247124ed 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -133,12 +133,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 0283d7818..4abea527b 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -139,12 +139,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 00c508db3..67bf2c948 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -150,12 +150,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index b39592bef..b035017e1 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -122,207 +122,207 @@ org.springframework.integration spring-integration-file - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-syslog - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-smb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jdbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jmx - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ws - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-redis - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-r2dbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-webflux - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-sftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-rsocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mqtt - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-event - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-kafka - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-groovy - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-cassandra - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-scripting - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xmpp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-websocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-graphql - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-feed - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jpa - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zeromq - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-http - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zookeeper - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-hazelcast - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test-support - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-amqp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mail - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-security - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-camel - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xml - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-core - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jms - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mongodb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stream - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stomp - 6.1.2 + 6.1.3 org.springframework.boot @@ -355,12 +355,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index a0068331c..0c344439b 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -144,12 +144,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 35bd85bd6..bbfa905f8 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -122,207 +122,207 @@ org.springframework.integration spring-integration-file - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-syslog - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-smb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jdbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jmx - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ws - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-redis - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-r2dbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-webflux - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-sftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-rsocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mqtt - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-event - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-kafka - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-groovy - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-cassandra - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-scripting - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xmpp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-websocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-graphql - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-feed - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jpa - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zeromq - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-http - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zookeeper - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-hazelcast - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test-support - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-amqp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mail - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-security - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-camel - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xml - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-core - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jms - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mongodb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stream - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stomp - 6.1.2 + 6.1.3 org.springframework.boot @@ -355,12 +355,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 5397939e7..6d7f798c6 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -148,12 +148,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 6e685bd15..21af08b6f 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -134,12 +134,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index db0d9abc5..e48d55b57 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -117,207 +117,207 @@ org.springframework.integration spring-integration-file - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-syslog - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-smb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jdbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jmx - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ws - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-redis - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-r2dbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-webflux - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-sftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-rsocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mqtt - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-event - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-kafka - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-groovy - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-cassandra - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-scripting - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xmpp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-websocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-graphql - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-feed - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jpa - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zeromq - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-http - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zookeeper - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-hazelcast - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test-support - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-amqp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mail - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-security - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-camel - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xml - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-core - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jms - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mongodb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stream - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stomp - 6.1.2 + 6.1.3 org.springframework.boot @@ -350,12 +350,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 2a7d60294..04c7d987b 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -175,12 +175,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 7e703cf3a..abf9b4f69 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -138,12 +138,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 7f7bab826..c078707a1 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -133,12 +133,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 8f76ec545..3802d8e5d 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -133,12 +133,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/build.gradle b/build.gradle index 21c641267..098f2f928 100644 --- a/build.gradle +++ b/build.gradle @@ -121,6 +121,7 @@ subprojects { subproject -> url = linkIssue } withXml { + asNode().appendNode('properties')appendNode('java.version', java.sourceCompatibility) if (subproject.plugins.hasPlugin('org.akhikhl.gretty')) { asNode().appendNode('packaging', 'war') def plugins = asNode().build?.find()?.plugins?.find() diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 7981cc8f7..9e4f77e51 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -367,6 +367,9 @@ + + 17 + diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 5cd6aac32..260bf3b53 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -128,207 +128,207 @@ org.springframework.integration spring-integration-file - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-syslog - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-smb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jdbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jmx - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ws - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-redis - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-r2dbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-webflux - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-sftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-rsocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mqtt - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-event - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-kafka - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-groovy - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-cassandra - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-scripting - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xmpp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-websocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-graphql - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-feed - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jpa - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zeromq - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-http - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zookeeper - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-hazelcast - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test-support - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-amqp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mail - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-security - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-camel - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xml - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-core - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jms - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mongodb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stream - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stomp - 6.1.2 + 6.1.3 org.springframework.boot @@ -361,12 +361,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 4d640c2c1..e1091248d 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -150,207 +150,207 @@ org.springframework.integration spring-integration-file - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-syslog - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-smb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jdbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jmx - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ws - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-redis - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-r2dbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-webflux - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-sftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-rsocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mqtt - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-event - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-kafka - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-groovy - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-cassandra - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-scripting - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xmpp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-websocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-graphql - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-feed - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jpa - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zeromq - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-http - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zookeeper - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-hazelcast - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test-support - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-amqp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mail - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-security - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-camel - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xml - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-core - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jms - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mongodb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stream - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stomp - 6.1.2 + 6.1.3 org.springframework.boot @@ -383,12 +383,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 8651d9c08..4181f4fb2 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -139,6 +139,9 @@ + + 17 + repo.spring.io.milestone diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 9dd0c583d..745125cb3 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -139,6 +139,9 @@ + + 17 + repo.spring.io.milestone diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index bc2ccc8ec..c56420898 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -139,6 +139,9 @@ + + 17 + repo.spring.io.milestone diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index d07019717..a55577636 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -139,6 +139,9 @@ + + 17 + repo.spring.io.milestone diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 0eb3b5038..1529e9094 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -150,12 +150,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index f48075a42..d012ee855 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -187,12 +187,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 4567bfc53..978d76e7b 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -187,12 +187,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 2156b4517..f6eca7ba9 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -218,12 +218,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index a430d6591..e64ff9384 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -166,12 +166,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 09c6c7cf3..aa86f3878 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -133,12 +133,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 31eb9401e..f290177e1 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -145,12 +145,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 3eedde2fa..9e0b61ebf 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -145,12 +145,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 523f84c70..19f106a7b 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -139,12 +139,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 7d3dcb797..b1360302d 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -151,12 +151,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 80d46d7b8..0004fc167 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -117,207 +117,207 @@ org.springframework.integration spring-integration-file - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-syslog - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-smb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jdbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jmx - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ws - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-redis - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-r2dbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-webflux - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-sftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-rsocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mqtt - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-event - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-kafka - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-groovy - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-cassandra - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-scripting - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xmpp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-websocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-graphql - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-feed - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jpa - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zeromq - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-http - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zookeeper - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-hazelcast - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test-support - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-amqp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mail - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-security - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-camel - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xml - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-core - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jms - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mongodb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stream - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stomp - 6.1.2 + 6.1.3 org.springframework.boot @@ -350,12 +350,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 3d8af161b..945b73e64 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -133,12 +133,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 951c634f3..1eef63bef 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -144,207 +144,207 @@ org.springframework.integration spring-integration-jdbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ws - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-redis - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-r2dbc - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-rsocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-event - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-cassandra - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-scripting - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-websocket - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-graphql - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jpa - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-http - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zookeeper - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mail - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-camel - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mongodb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stream - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-stomp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-file - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-syslog - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-smb - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jmx - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-webflux - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-sftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-mqtt - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-ftp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-kafka - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-groovy - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xmpp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-feed - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zeromq - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-hazelcast - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-test-support - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-amqp - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-security - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-xml - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-core - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-zip - 6.1.2 + 6.1.3 org.springframework.integration spring-integration-jms - 6.1.2 + 6.1.3 org.springframework.cloud @@ -384,12 +384,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 36ea95925..70ad64113 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -143,12 +143,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 6036f4f6c..0b11620a4 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -144,12 +144,15 @@ org.springframework.integration spring-integration-bom - 6.1.2 + 6.1.3 import pom + + 17 + repo.spring.io.milestone From 75d4825be3e926c966f11f9ca443380916188899 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 8 Nov 2023 16:03:14 -0500 Subject: [PATCH 332/356] Migrate CI from Bamboo to GitHub Actions --- .github/ISSUE_TEMPLATE/bug_report.md | 35 ++++++++++++++++++++ .github/ISSUE_TEMPLATE/config.yml | 5 +++ .github/ISSUE_TEMPLATE/feature_request.md | 25 ++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 6 ++++ .github/workflows/ci-snapshot.yml | 29 ++++++++++++++++ .github/workflows/pr-build.yml | 40 +++++++++++++++++++++++ .travis.yml | 17 ---------- build.gradle | 30 ----------------- 8 files changed, 140 insertions(+), 47 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/config.yml create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 .github/workflows/ci-snapshot.yml create mode 100644 .github/workflows/pr-build.yml delete mode 100644 .travis.yml diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..d5cedf3e9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,35 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: 'type: bug, status: waiting-for-triage' +assignees: '' + +--- + +**In what version(s) of Spring Integration are you seeing this issue?** + +For example: + +2.5.3 + +Between 2.5.0 and 3.0.0 + +**Describe the bug** + +A clear and concise description of what the bug is. + +**To Reproduce** + +Steps to reproduce the behavior. + +**Expected behavior** + +A clear and concise description of what you expected to happen. + +**Sample** + +A link to a GitHub repository with a [minimal, reproducible sample](https://stackoverflow.com/help/minimal-reproducible-example). + +Reports that include a sample will take priority over reports that do not. +At times, we may require a sample, so it is good to try and include a sample up front. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..dee93ce52 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: Community Support + url: https://stackoverflow.com/questions/tagged/spring-integration + about: Please ask and answer questions on StackOverflow with the tag spring-integration diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 000000000..381a8977f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,25 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: 'status: waiting-for-triage, type: enhancement' +assignees: '' + +--- + +**Expected Behavior** + + + +**Current Behavior** + + + +**Context** + + diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..abee66f66 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,6 @@ + diff --git a/.github/workflows/ci-snapshot.yml b/.github/workflows/ci-snapshot.yml new file mode 100644 index 000000000..7b5dd9d91 --- /dev/null +++ b/.github/workflows/ci-snapshot.yml @@ -0,0 +1,29 @@ +name: CI SNAPSHOT + +on: + workflow_dispatch: + push: + branches: + - main + +env: + GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} + GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} + GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} + +jobs: + build_snapshot: + runs-on: ubuntu-latest + name: CI Build SNAPSHOT for ${{ github.ref_name }} + steps: + + - uses: actions/checkout@v4 + with: + show-progress: false + + - name: Set up Gradle + uses: spring-io/spring-gradle-build-action@v2 + + - name: Build + run: ./gradlew check + diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml new file mode 100644 index 000000000..1cdc1d144 --- /dev/null +++ b/.github/workflows/pr-build.yml @@ -0,0 +1,40 @@ +name: Pull Request Build + +on: + pull_request: + branches: + - main + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + + - uses: actions/checkout@v4 + with: + show-progress: false + + - name: Set up JDK + uses: actions/setup-java@v3 + with: + distribution: adopt + java-version: 17 + cache: gradle + + - name: Build PR + uses: burrunan/gradle-cache-action@v1 + with: + debug: false + concurrent: true + gradle-build-scan-report: false + arguments: check + + - name: Capture Test Results + if: failure() + uses: actions/upload-artifact@v3 + with: + name: test-results + path: '*/build/reports/tests/**/*.*' + retention-days: 3 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e0891e448..000000000 --- a/.travis.yml +++ /dev/null @@ -1,17 +0,0 @@ -dist: trusty -language: java -jdk: oraclejdk8 -sudo: false -services: - - mongodb - - rabbitmq - - redis-server -before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock -cache: - directories: - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ -install: true -script: - - ./gradlew check --refresh-dependencies --no-daemon diff --git a/build.gradle b/build.gradle index 098f2f928..0ccdb73c8 100644 --- a/build.gradle +++ b/build.gradle @@ -11,9 +11,6 @@ buildscript { classpath 'org.gretty:gretty:4.0.3' } } -plugins { - id 'org.sonarqube' version '4.0.0.2929' -} description = 'Spring Integration Samples' @@ -304,27 +301,10 @@ subprojects { subproject -> ext.xLintArg = '-Xlint:all,-options,-processing' [compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg] - jacocoTestReport { - onlyIf { System.properties['sonar.host.url'] } - dependsOn test - reports { - xml.required = true - html.required = false - } - } - - rootProject.tasks['sonarqube'].dependsOn jacocoTestReport - test { useJUnitPlatform() // suppress all console output during testing unless running `gradle -i` logging.captureStandardOutput(LogLevel.INFO) - jacoco { - destinationFile = file("$buildDir/jacoco.exec") - } - if (System.properties['sonar.host.url']) { - finalizedBy jacocoTestReport - } } } @@ -1554,13 +1534,3 @@ project('tcp-with-headers') { standardInput = System.in } } - -sonarqube { - properties { - property 'sonar.links.homepage', linkHomepage - property 'sonar.links.ci', linkCi - property 'sonar.links.issue', linkIssue - property 'sonar.links.scm', linkScmUrl - property 'sonar.links.scm_dev', linkScmDevConnection - } -} From 08eb3cb7e156340a32bca798fa9f317bf1b2f8ad Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Sun, 19 Nov 2023 11:59:32 -0500 Subject: [PATCH 333/356] PR build GHA from spring-github-workflows repo --- .github/workflows/pr-build.yml | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 1cdc1d144..246f6a7f1 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -6,35 +6,5 @@ on: - main jobs: - build: - - runs-on: ubuntu-latest - - steps: - - - uses: actions/checkout@v4 - with: - show-progress: false - - - name: Set up JDK - uses: actions/setup-java@v3 - with: - distribution: adopt - java-version: 17 - cache: gradle - - - name: Build PR - uses: burrunan/gradle-cache-action@v1 - with: - debug: false - concurrent: true - gradle-build-scan-report: false - arguments: check - - - name: Capture Test Results - if: failure() - uses: actions/upload-artifact@v3 - with: - name: test-results - path: '*/build/reports/tests/**/*.*' - retention-days: 3 + build-pull-request: + uses: artembilan/spring-github-workflows/.github/workflows/spring-gradle-pull-request-build.yml@main From e86ef6b1fced4cb7cde3dfed8ed40c31bae6cdc4 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 21 Nov 2023 15:10:44 -0500 Subject: [PATCH 334/356] Upgrade to Spring Integration 6.1.5 --- advanced/advanced-testing-examples/pom.xml | 168 --------- advanced/dynamic-ftp/pom.xml | 157 -------- advanced/dynamic-tcp-client/pom.xml | 387 ------------------- applications/cafe-scripted/pom.xml | 190 ---------- applications/cafe/cafe-amqp/pom.xml | 163 -------- applications/cafe/cafe-jms/pom.xml | 187 ---------- applications/cafe/cafe-si/pom.xml | 162 -------- applications/file-split-ftp/pom.xml | 414 --------------------- basic/amqp/pom.xml | 168 --------- basic/barrier/pom.xml | 407 -------------------- basic/control-bus/pom.xml | 157 -------- basic/enricher/pom.xml | 163 -------- basic/feed/pom.xml | 157 -------- basic/file/pom.xml | 157 -------- basic/ftp/pom.xml | 181 --------- build.gradle | 2 +- dsl/cafe-dsl/pom.xml | 398 -------------------- intermediate/async-gateway/pom.xml | 157 -------- intermediate/dynamic-poller/pom.xml | 157 -------- intermediate/errorhandling/pom.xml | 157 -------- intermediate/file-processing/pom.xml | 157 -------- 21 files changed, 1 insertion(+), 4245 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 41731265f..e69de29bb 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -1,168 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - advanced-testing-examples - 6.1.0 - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - jakarta.jms - jakarta.jms-api - 3.1.0 - compile - - - org.springframework.integration - spring-integration-jms - compile - - - org.springframework.integration - spring-integration-groovy - compile - - - org.apache.logging.log4j - log4j-core - 2.20.0 - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index fea2fc29d..e69de29bb 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -1,157 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - dynamic-ftp - 6.1.0 - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.integration - spring-integration-ftp - compile - - - org.apache.logging.log4j - log4j-core - 2.20.0 - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 1ebab3c0a..e69de29bb 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -1,387 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - dynamic-tcp-client - 6.1.0 - jar - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.boot - spring-boot-starter-integration - compile - - - org.springframework.integration - spring-integration-ip - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.springframework.integration - spring-integration-file - 6.1.3 - - - org.springframework.integration - spring-integration-syslog - 6.1.3 - - - org.springframework.integration - spring-integration-smb - 6.1.3 - - - org.springframework.integration - spring-integration-jdbc - 6.1.3 - - - org.springframework.integration - spring-integration-jmx - 6.1.3 - - - org.springframework.integration - spring-integration-ws - 6.1.3 - - - org.springframework.integration - spring-integration-redis - 6.1.3 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.3 - - - org.springframework.integration - spring-integration-webflux - 6.1.3 - - - org.springframework.integration - spring-integration-sftp - 6.1.3 - - - org.springframework.integration - spring-integration-rsocket - 6.1.3 - - - org.springframework.integration - spring-integration-mqtt - 6.1.3 - - - org.springframework.integration - spring-integration-event - 6.1.3 - - - org.springframework.integration - spring-integration-ftp - 6.1.3 - - - org.springframework.integration - spring-integration-kafka - 6.1.3 - - - org.springframework.integration - spring-integration-groovy - 6.1.3 - - - org.springframework.integration - spring-integration-cassandra - 6.1.3 - - - org.springframework.integration - spring-integration-scripting - 6.1.3 - - - org.springframework.integration - spring-integration-xmpp - 6.1.3 - - - org.springframework.integration - spring-integration-websocket - 6.1.3 - - - org.springframework.integration - spring-integration-graphql - 6.1.3 - - - org.springframework.integration - spring-integration-feed - 6.1.3 - - - org.springframework.integration - spring-integration-jpa - 6.1.3 - - - org.springframework.integration - spring-integration-test - 6.1.3 - - - org.springframework.integration - spring-integration-zeromq - 6.1.3 - - - org.springframework.integration - spring-integration-http - 6.1.3 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.3 - - - org.springframework.integration - spring-integration-ip - 6.1.3 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.3 - - - org.springframework.integration - spring-integration-test-support - 6.1.3 - - - org.springframework.integration - spring-integration-amqp - 6.1.3 - - - org.springframework.integration - spring-integration-mail - 6.1.3 - - - org.springframework.integration - spring-integration-security - 6.1.3 - - - org.springframework.integration - spring-integration-camel - 6.1.3 - - - org.springframework.integration - spring-integration-xml - 6.1.3 - - - org.springframework.integration - spring-integration-core - 6.1.3 - - - org.springframework.integration - spring-integration-zip - 6.1.3 - - - org.springframework.integration - spring-integration-jms - 6.1.3 - - - org.springframework.integration - spring-integration-mongodb - 6.1.3 - - - org.springframework.integration - spring-integration-stream - 6.1.3 - - - org.springframework.integration - spring-integration-stomp - 6.1.3 - - - org.springframework.boot - spring-boot-dependencies - 3.1.1-SNAPSHOT - import - pom - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - org.springframework.boot - spring-boot-starter-parent - 3.1.1-SNAPSHOT - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index b1c246ffc..e69de29bb 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -1,190 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - cafe-scripted - 6.1.0 - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.integration - spring-integration-stream - compile - - - org.springframework.integration - spring-integration-groovy - compile - - - org.springframework.integration - spring-integration-jmx - compile - - - org.springframework.integration - spring-integration-rsocket - compile - - - org.jruby - jruby-complete - 9.2.14.0 - compile - - - org.python - jython-standalone - 2.7.3 - compile - - - org.apache.groovy - groovy-jsr223 - 4.0.12 - compile - - - org.apache.logging.log4j - log4j-core - 2.20.0 - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index bdada6ecb..e69de29bb 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -1,163 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - cafe-amqp - 6.1.0 - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.integration.samples - cafe-si - 6.1.0 - compile - - - org.springframework.integration - spring-integration-amqp - compile - - - org.apache.logging.log4j - log4j-core - 2.20.0 - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 40a699b96..e69de29bb 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -1,187 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - cafe-jms - 6.1.0 - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.integration.samples - cafe-si - 6.1.0 - compile - - - org.apache.activemq - artemis-server - 2.28.0 - compile - - - * - org.jboss.logmanager - - - - - org.apache.activemq - artemis-jakarta-client - 2.28.0 - compile - - - org.springframework.integration - spring-integration-jms - compile - - - jakarta.jms - jakarta.jms-api - 3.1.0 - compile - - - org.apache.logging.log4j - log4j-core - 2.20.0 - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index f279aade7..e69de29bb 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -1,162 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - cafe-si - 6.1.0 - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.integration - spring-integration-stream - compile - - - com.fasterxml.jackson.core - jackson-databind - compile - - - org.apache.logging.log4j - log4j-core - 2.20.0 - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 57daa6098..e69de29bb 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -1,414 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - file-split-ftp - 6.1.0 - jar - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.boot - spring-boot-starter-web - compile - - - org.springframework.boot - spring-boot-starter-integration - compile - - - org.springframework.integration - spring-integration-ftp - compile - - - org.springframework.integration - spring-integration-http - compile - - - org.springframework.integration - spring-integration-mail - compile - - - org.eclipse.angus - jakarta.mail - 1.0.0 - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.springframework.boot - spring-boot-starter-test - test - - - com.icegreen - greenmail - 2.0.0-alpha-2 - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.springframework.integration - spring-integration-file - 6.1.3 - - - org.springframework.integration - spring-integration-syslog - 6.1.3 - - - org.springframework.integration - spring-integration-smb - 6.1.3 - - - org.springframework.integration - spring-integration-jdbc - 6.1.3 - - - org.springframework.integration - spring-integration-jmx - 6.1.3 - - - org.springframework.integration - spring-integration-ws - 6.1.3 - - - org.springframework.integration - spring-integration-redis - 6.1.3 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.3 - - - org.springframework.integration - spring-integration-webflux - 6.1.3 - - - org.springframework.integration - spring-integration-sftp - 6.1.3 - - - org.springframework.integration - spring-integration-rsocket - 6.1.3 - - - org.springframework.integration - spring-integration-mqtt - 6.1.3 - - - org.springframework.integration - spring-integration-event - 6.1.3 - - - org.springframework.integration - spring-integration-ftp - 6.1.3 - - - org.springframework.integration - spring-integration-kafka - 6.1.3 - - - org.springframework.integration - spring-integration-groovy - 6.1.3 - - - org.springframework.integration - spring-integration-cassandra - 6.1.3 - - - org.springframework.integration - spring-integration-scripting - 6.1.3 - - - org.springframework.integration - spring-integration-xmpp - 6.1.3 - - - org.springframework.integration - spring-integration-websocket - 6.1.3 - - - org.springframework.integration - spring-integration-graphql - 6.1.3 - - - org.springframework.integration - spring-integration-feed - 6.1.3 - - - org.springframework.integration - spring-integration-jpa - 6.1.3 - - - org.springframework.integration - spring-integration-test - 6.1.3 - - - org.springframework.integration - spring-integration-zeromq - 6.1.3 - - - org.springframework.integration - spring-integration-http - 6.1.3 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.3 - - - org.springframework.integration - spring-integration-ip - 6.1.3 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.3 - - - org.springframework.integration - spring-integration-test-support - 6.1.3 - - - org.springframework.integration - spring-integration-amqp - 6.1.3 - - - org.springframework.integration - spring-integration-mail - 6.1.3 - - - org.springframework.integration - spring-integration-security - 6.1.3 - - - org.springframework.integration - spring-integration-camel - 6.1.3 - - - org.springframework.integration - spring-integration-xml - 6.1.3 - - - org.springframework.integration - spring-integration-core - 6.1.3 - - - org.springframework.integration - spring-integration-zip - 6.1.3 - - - org.springframework.integration - spring-integration-jms - 6.1.3 - - - org.springframework.integration - spring-integration-mongodb - 6.1.3 - - - org.springframework.integration - spring-integration-stream - 6.1.3 - - - org.springframework.integration - spring-integration-stomp - 6.1.3 - - - org.springframework.boot - spring-boot-dependencies - 3.1.1-SNAPSHOT - import - pom - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - org.springframework.boot - spring-boot-starter-parent - 3.1.1-SNAPSHOT - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index dcb3f7356..e69de29bb 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -1,168 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - amqp - 6.1.0 - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.integration - spring-integration-stream - compile - - - org.springframework.integration - spring-integration-amqp - compile - - - org.apache.logging.log4j - log4j-core - 2.20.0 - compile - - - org.slf4j - slf4j-jcl - 1.7.30 - runtime - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 6ca5598d7..e69de29bb 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -1,407 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - barrier - 6.1.0 - jar - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.boot - spring-boot-starter-web - compile - - - org.springframework.boot - spring-boot-starter-integration - compile - - - org.springframework.boot - spring-boot-starter-amqp - compile - - - org.springframework.integration - spring-integration-amqp - compile - - - org.springframework.integration - spring-integration-http - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.springframework.amqp - spring-rabbit-junit - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.springframework.integration - spring-integration-file - 6.1.3 - - - org.springframework.integration - spring-integration-syslog - 6.1.3 - - - org.springframework.integration - spring-integration-smb - 6.1.3 - - - org.springframework.integration - spring-integration-jdbc - 6.1.3 - - - org.springframework.integration - spring-integration-jmx - 6.1.3 - - - org.springframework.integration - spring-integration-ws - 6.1.3 - - - org.springframework.integration - spring-integration-redis - 6.1.3 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.3 - - - org.springframework.integration - spring-integration-webflux - 6.1.3 - - - org.springframework.integration - spring-integration-sftp - 6.1.3 - - - org.springframework.integration - spring-integration-rsocket - 6.1.3 - - - org.springframework.integration - spring-integration-mqtt - 6.1.3 - - - org.springframework.integration - spring-integration-event - 6.1.3 - - - org.springframework.integration - spring-integration-ftp - 6.1.3 - - - org.springframework.integration - spring-integration-kafka - 6.1.3 - - - org.springframework.integration - spring-integration-groovy - 6.1.3 - - - org.springframework.integration - spring-integration-cassandra - 6.1.3 - - - org.springframework.integration - spring-integration-scripting - 6.1.3 - - - org.springframework.integration - spring-integration-xmpp - 6.1.3 - - - org.springframework.integration - spring-integration-websocket - 6.1.3 - - - org.springframework.integration - spring-integration-graphql - 6.1.3 - - - org.springframework.integration - spring-integration-feed - 6.1.3 - - - org.springframework.integration - spring-integration-jpa - 6.1.3 - - - org.springframework.integration - spring-integration-test - 6.1.3 - - - org.springframework.integration - spring-integration-zeromq - 6.1.3 - - - org.springframework.integration - spring-integration-http - 6.1.3 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.3 - - - org.springframework.integration - spring-integration-ip - 6.1.3 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.3 - - - org.springframework.integration - spring-integration-test-support - 6.1.3 - - - org.springframework.integration - spring-integration-amqp - 6.1.3 - - - org.springframework.integration - spring-integration-mail - 6.1.3 - - - org.springframework.integration - spring-integration-security - 6.1.3 - - - org.springframework.integration - spring-integration-camel - 6.1.3 - - - org.springframework.integration - spring-integration-xml - 6.1.3 - - - org.springframework.integration - spring-integration-core - 6.1.3 - - - org.springframework.integration - spring-integration-zip - 6.1.3 - - - org.springframework.integration - spring-integration-jms - 6.1.3 - - - org.springframework.integration - spring-integration-mongodb - 6.1.3 - - - org.springframework.integration - spring-integration-stream - 6.1.3 - - - org.springframework.integration - spring-integration-stomp - 6.1.3 - - - org.springframework.boot - spring-boot-dependencies - 3.1.1-SNAPSHOT - import - pom - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - org.springframework.boot - spring-boot-starter-parent - 3.1.1-SNAPSHOT - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index ca7c818f0..e69de29bb 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -1,157 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - control-bus - 6.1.0 - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.integration - spring-integration-core - compile - - - org.apache.logging.log4j - log4j-core - 2.20.0 - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 3ad436f0f..e69de29bb 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -1,163 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - enricher - 6.1.0 - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.integration - spring-integration-core - compile - - - com.h2database - h2 - 2.2.220 - compile - - - org.apache.logging.log4j - log4j-core - 2.20.0 - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 5a513c18c..e69de29bb 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -1,157 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - feed - 6.1.0 - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.integration - spring-integration-feed - compile - - - org.apache.logging.log4j - log4j-core - 2.20.0 - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/basic/file/pom.xml b/basic/file/pom.xml index ecdd1d57b..e69de29bb 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -1,157 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - file - 6.1.0 - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.integration - spring-integration-file - compile - - - org.apache.logging.log4j - log4j-core - 2.20.0 - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 019f589ab..e69de29bb 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -1,181 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - ftp - 6.1.0 - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.integration - spring-integration-ftp - compile - - - commons-io - commons-io - 2.11.0 - compile - - - org.apache.ftpserver - ftpserver-core - 1.2.0 - compile - - - org.slf4j - slf4j-api - 1.7.30 - compile - - - org.slf4j - slf4j-log4j12 - 1.7.30 - runtime - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.apache.logging.log4j - log4j-core - 2.20.0 - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/build.gradle b/build.gradle index 0ccdb73c8..90bbe898a 100644 --- a/build.gradle +++ b/build.gradle @@ -256,7 +256,7 @@ subprojects { subproject -> postgresVersion = '42.6.0' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.2' - springIntegrationVersion = '6.1.3' + springIntegrationVersion = '6.1.5' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 9e4f77e51..e69de29bb 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -1,398 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - cafe-dsl - 6.1.0 - jar - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.integration.samples - cafe-si - 6.1.0 - compile - - - org.springframework.boot - spring-boot-starter-integration - compile - - - org.springframework.integration - spring-integration-core - compile - - - org.springframework.integration - spring-integration-stream - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.springframework.integration - spring-integration-file - 6.1.3 - - - org.springframework.integration - spring-integration-syslog - 6.1.3 - - - org.springframework.integration - spring-integration-smb - 6.1.3 - - - org.springframework.integration - spring-integration-jdbc - 6.1.3 - - - org.springframework.integration - spring-integration-jmx - 6.1.3 - - - org.springframework.integration - spring-integration-ws - 6.1.3 - - - org.springframework.integration - spring-integration-redis - 6.1.3 - - - org.springframework.integration - spring-integration-r2dbc - 6.1.3 - - - org.springframework.integration - spring-integration-webflux - 6.1.3 - - - org.springframework.integration - spring-integration-sftp - 6.1.3 - - - org.springframework.integration - spring-integration-rsocket - 6.1.3 - - - org.springframework.integration - spring-integration-mqtt - 6.1.3 - - - org.springframework.integration - spring-integration-event - 6.1.3 - - - org.springframework.integration - spring-integration-ftp - 6.1.3 - - - org.springframework.integration - spring-integration-kafka - 6.1.3 - - - org.springframework.integration - spring-integration-groovy - 6.1.3 - - - org.springframework.integration - spring-integration-cassandra - 6.1.3 - - - org.springframework.integration - spring-integration-scripting - 6.1.3 - - - org.springframework.integration - spring-integration-xmpp - 6.1.3 - - - org.springframework.integration - spring-integration-websocket - 6.1.3 - - - org.springframework.integration - spring-integration-graphql - 6.1.3 - - - org.springframework.integration - spring-integration-feed - 6.1.3 - - - org.springframework.integration - spring-integration-jpa - 6.1.3 - - - org.springframework.integration - spring-integration-test - 6.1.3 - - - org.springframework.integration - spring-integration-zeromq - 6.1.3 - - - org.springframework.integration - spring-integration-http - 6.1.3 - - - org.springframework.integration - spring-integration-zookeeper - 6.1.3 - - - org.springframework.integration - spring-integration-ip - 6.1.3 - - - org.springframework.integration - spring-integration-hazelcast - 6.1.3 - - - org.springframework.integration - spring-integration-test-support - 6.1.3 - - - org.springframework.integration - spring-integration-amqp - 6.1.3 - - - org.springframework.integration - spring-integration-mail - 6.1.3 - - - org.springframework.integration - spring-integration-security - 6.1.3 - - - org.springframework.integration - spring-integration-camel - 6.1.3 - - - org.springframework.integration - spring-integration-xml - 6.1.3 - - - org.springframework.integration - spring-integration-core - 6.1.3 - - - org.springframework.integration - spring-integration-zip - 6.1.3 - - - org.springframework.integration - spring-integration-jms - 6.1.3 - - - org.springframework.integration - spring-integration-mongodb - 6.1.3 - - - org.springframework.integration - spring-integration-stream - 6.1.3 - - - org.springframework.integration - spring-integration-stomp - 6.1.3 - - - org.springframework.boot - spring-boot-dependencies - 3.1.1-SNAPSHOT - import - pom - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - org.springframework.boot - spring-boot-starter-parent - 3.1.1-SNAPSHOT - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 4181f4fb2..e69de29bb 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -1,157 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - async-gateway - 6.1.0 - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.integration - spring-integration-core - compile - - - org.apache.logging.log4j - log4j-core - 2.20.0 - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 745125cb3..e69de29bb 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -1,157 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - dynamic-poller - 6.1.0 - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.integration - spring-integration-core - compile - - - org.apache.logging.log4j - log4j-core - 2.20.0 - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index c56420898..e69de29bb 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -1,157 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - errorhandling - 6.1.0 - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.integration - spring-integration-stream - compile - - - org.apache.logging.log4j - log4j-core - 2.20.0 - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index a55577636..e69de29bb 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -1,157 +0,0 @@ - - - 4.0.0 - org.springframework.integration.samples - file-processing - 6.1.0 - https://github.com/spring-projects/spring-integration-samples - - Spring IO - https://spring.io/projects/spring-integration - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - artembilan - Artem Bilan - abilan@vmware.com - - project lead - - - - garyrussell - Gary Russell - grussell@vmware.com - - project lead emeritus - - - - markfisher - Mark Fisher - markfisher@vmware.com - - project founder and lead emeritus - - - - - scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git - scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git - https://github.com/spring-projects/spring-integration-samples - - - GitHub - https://github.com/spring-projects/spring-integration-samples/issues - - - - org.springframework.integration - spring-integration-file - compile - - - org.apache.logging.log4j - log4j-core - 2.20.0 - compile - - - junit - junit - 4.13.2 - test - - - org.hamcrest - hamcrest-library - 2.2 - test - - - org.mockito - mockito-core - 5.3.1 - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.springframework.integration - spring-integration-test - test - - - org.junit.jupiter - junit-jupiter-engine - runtime - - - org.junit.platform - junit-platform-launcher - runtime - - - org.junit.vintage - junit-vintage-engine - runtime - - - - - - org.junit - junit-bom - 5.9.3 - import - pom - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - import - pom - - - org.springframework - spring-framework-bom - 6.0.11 - import - pom - - - org.springframework.integration - spring-integration-bom - 6.1.3 - import - pom - - - - - 17 - - - - repo.spring.io.milestone - Spring Framework Maven Milestone Repository - https://repo.spring.io/milestone - - - repo.spring.io.snapshot - Spring Framework Maven Snapshot Repository - https://repo.spring.io/snapshot - - - From c11726f1f2e79f517fc151209164867b8281e5d0 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 21 Nov 2023 15:18:09 -0500 Subject: [PATCH 335/356] Build snapshot for 6.1.x as well --- .github/workflows/ci-snapshot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-snapshot.yml b/.github/workflows/ci-snapshot.yml index 7b5dd9d91..6d803ab7f 100644 --- a/.github/workflows/ci-snapshot.yml +++ b/.github/workflows/ci-snapshot.yml @@ -5,6 +5,7 @@ on: push: branches: - main + - 6.1.x env: GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} From 62e2ae1c723fc4274da56a4fb0e638d62d84e3d1 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 21 Nov 2023 16:22:28 -0500 Subject: [PATCH 336/356] Upgrade to Spring Integration 6.2.0 * Upgrade all other dependencies * Fix deprecation warnings * Fix Ruby script to a newer syntax --- advanced/advanced-testing-examples/pom.xml | 168 +++++++ advanced/dynamic-ftp/pom.xml | 157 +++++++ advanced/dynamic-tcp-client/pom.xml | 392 ++++++++++++++++ applications/cafe-scripted/pom.xml | 190 ++++++++ .../cafe-scripted/scripts/ruby/barista.rb | 12 +- .../integration/samples/cafe/ScriptTests.java | 17 +- applications/cafe/cafe-amqp/pom.xml | 163 +++++++ applications/cafe/cafe-jms/pom.xml | 187 ++++++++ applications/cafe/cafe-si/pom.xml | 162 +++++++ applications/file-split-ftp/pom.xml | 419 ++++++++++++++++++ .../samples/filesplit/Application.java | 11 +- applications/loan-broker/pom.xml | 14 +- applications/loanshark/pom.xml | 28 +- applications/stomp-chat/pom.xml | 103 +++-- basic/amqp/pom.xml | 168 +++++++ basic/barrier/pom.xml | 412 +++++++++++++++++ basic/control-bus/pom.xml | 157 +++++++ basic/enricher/pom.xml | 163 +++++++ basic/feed/pom.xml | 157 +++++++ basic/file/pom.xml | 157 +++++++ basic/ftp/pom.xml | 181 ++++++++ basic/helloworld/pom.xml | 14 +- basic/http/pom.xml | 18 +- basic/jdbc/pom.xml | 16 +- basic/jms/pom.xml | 18 +- basic/jmx/pom.xml | 14 +- basic/jpa/pom.xml | 111 ++--- basic/kafka/pom.xml | 105 ++--- .../samples/kafka/Application.java | 15 +- basic/mail/pom.xml | 16 +- basic/mongodb/pom.xml | 16 +- basic/mqtt/pom.xml | 103 +++-- basic/oddeven/pom.xml | 14 +- basic/quote/pom.xml | 14 +- basic/sftp/pom.xml | 16 +- basic/tcp-amqp/pom.xml | 14 +- basic/tcp-broadcast/pom.xml | 103 +++-- basic/tcp-client-server/pom.xml | 14 +- basic/tcp-with-headers/pom.xml | 103 +++-- basic/testing-examples/pom.xml | 14 +- basic/twitter/pom.xml | 14 +- basic/web-sockets/pom.xml | 103 +++-- basic/ws-inbound-gateway/pom.xml | 14 +- basic/ws-outbound-gateway/pom.xml | 14 +- basic/xml/pom.xml | 14 +- basic/xmpp/pom.xml | 14 +- build.gradle | 60 +-- dsl/cafe-dsl/pom.xml | 403 +++++++++++++++++ dsl/kafka-dsl/pom.xml | 105 ++--- .../samples/dsl/kafka/Application.java | 9 +- dsl/si4demo/pom.xml | 107 ++--- gradle.properties | 4 +- intermediate/async-gateway/pom.xml | 157 +++++++ intermediate/dynamic-poller/pom.xml | 157 +++++++ intermediate/errorhandling/pom.xml | 157 +++++++ intermediate/file-processing/pom.xml | 157 +++++++ intermediate/mail-attachments/pom.xml | 18 +- intermediate/monitoring/pom.xml | 14 +- .../PayloadAwareTimingInterceptor.java | 36 +- intermediate/multipart-http/pom.xml | 16 +- intermediate/rest-http/pom.xml | 20 +- intermediate/retry-and-more/pom.xml | 16 +- .../splitter-aggregator-reaper/pom.xml | 14 +- intermediate/stored-procedures-derby/pom.xml | 14 +- intermediate/stored-procedures-ms/pom.xml | 14 +- intermediate/stored-procedures-oracle/pom.xml | 20 +- .../stored-procedures-postgresql/pom.xml | 16 +- intermediate/tcp-async-bi-directional/pom.xml | 103 +++-- .../tcp-client-server-multiplex/pom.xml | 14 +- intermediate/testcontainers-rabbitmq/pom.xml | 107 ++--- intermediate/travel/pom.xml | 14 +- intermediate/tx-synch/pom.xml | 16 +- 72 files changed, 5202 insertions(+), 895 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index e69de29bb..8feeabe7b 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -0,0 +1,168 @@ + + + 4.0.0 + org.springframework.integration.samples + advanced-testing-examples + 6.2.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + jakarta.jms + jakarta.jms-api + 3.1.0 + compile + + + org.springframework.integration + spring-integration-jms + compile + + + org.springframework.integration + spring-integration-groovy + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index e69de29bb..23775292a 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + dynamic-ftp + 6.2.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration + spring-integration-ftp + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index e69de29bb..3b9af9ae4 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -0,0 +1,392 @@ + + + 4.0.0 + org.springframework.integration.samples + dynamic-tcp-client + 6.2.0 + jar + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.boot + spring-boot-starter-integration + compile + + + org.springframework.integration + spring-integration-ip + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + + + org.springframework.boot + spring-boot-dependencies + 3.2.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.2.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index e69de29bb..0cfd5f56f 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -0,0 +1,190 @@ + + + 4.0.0 + org.springframework.integration.samples + cafe-scripted + 6.2.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration + spring-integration-stream + compile + + + org.springframework.integration + spring-integration-groovy + compile + + + org.springframework.integration + spring-integration-jmx + compile + + + org.springframework.integration + spring-integration-rsocket + compile + + + org.jruby + jruby-complete + 9.4.3.0 + compile + + + org.python + jython-standalone + 2.7.3 + compile + + + org.apache.groovy + groovy-jsr223 + 4.0.15 + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/applications/cafe-scripted/scripts/ruby/barista.rb b/applications/cafe-scripted/scripts/ruby/barista.rb index 6e235b9fa..529e30975 100644 --- a/applications/cafe-scripted/scripts/ruby/barista.rb +++ b/applications/cafe-scripted/scripts/ruby/barista.rb @@ -1,14 +1,14 @@ - require 'java' +require 'java' - import org.springframework.integration.samples.cafe.Drink +java_import org.springframework.integration.samples.cafe.Drink - orderItem = payload +orderItem = payload - puts "ruby: preparing #{orderItem} for order #{orderItem.order.number}" +puts "ruby: preparing #{orderItem} for order #{orderItem.order.number}" - sleep(timeToPrepare.to_f) +sleep(timeToPrepare.to_f) - Drink.new(orderItem.getOrder().getNumber(), orderItem.getDrinkType(), orderItem.isIced(), +Drink.new(orderItem.getOrder().getNumber(), orderItem.getDrinkType(), orderItem.isIced(), orderItem.getShots()) diff --git a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java index 0bad12503..7f8cad994 100644 --- a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java +++ b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -10,23 +10,25 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package org.springframework.integration.samples.cafe; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +package org.springframework.integration.samples.cafe; import java.util.HashMap; import java.util.Map; -import org.junit.Ignore; import org.junit.Test; import org.springframework.core.io.FileSystemResource; import org.springframework.integration.scripting.ScriptExecutor; import org.springframework.integration.scripting.jsr223.ScriptExecutorFactory; import org.springframework.scripting.support.ResourceScriptSource; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * @author David Turanski + * @author Artem Bilan * */ public class ScriptTests { @@ -37,7 +39,7 @@ public void testRuby() { Order order = new Order(0); order.addItem(DrinkType.LATTE, 2, false); - Map variables = new HashMap(); + Map variables = new HashMap<>(); variables.put("payload", order.getItems().get(0)); variables.put("timeToPrepare", 1L); @@ -49,12 +51,11 @@ public void testRuby() { } @Test - @Ignore public void testPython() { ScriptExecutor executor = ScriptExecutorFactory.getScriptExecutor("python"); Order order = new Order(0); order.addItem(DrinkType.LATTE, 2, false); - Map variables = new HashMap(); + Map variables = new HashMap<>(); variables.put("payload", order.getItems().get(0)); variables.put("timeToPrepare", "1"); diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index e69de29bb..eab6a2318 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -0,0 +1,163 @@ + + + 4.0.0 + org.springframework.integration.samples + cafe-amqp + 6.2.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration.samples + cafe-si + 6.2.0 + compile + + + org.springframework.integration + spring-integration-amqp + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index e69de29bb..867ff1c13 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -0,0 +1,187 @@ + + + 4.0.0 + org.springframework.integration.samples + cafe-jms + 6.2.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration.samples + cafe-si + 6.2.0 + compile + + + org.apache.activemq + artemis-server + 2.31.2 + compile + + + * + org.jboss.logmanager + + + + + org.apache.activemq + artemis-jakarta-client + 2.31.2 + compile + + + org.springframework.integration + spring-integration-jms + compile + + + jakarta.jms + jakarta.jms-api + 3.1.0 + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index e69de29bb..61d666fc5 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -0,0 +1,162 @@ + + + 4.0.0 + org.springframework.integration.samples + cafe-si + 6.2.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration + spring-integration-stream + compile + + + com.fasterxml.jackson.core + jackson-databind + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index e69de29bb..ff773133b 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -0,0 +1,419 @@ + + + 4.0.0 + org.springframework.integration.samples + file-split-ftp + 6.2.0 + jar + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.boot + spring-boot-starter-web + compile + + + org.springframework.boot + spring-boot-starter-integration + compile + + + org.springframework.integration + spring-integration-ftp + compile + + + org.springframework.integration + spring-integration-http + compile + + + org.springframework.integration + spring-integration-mail + compile + + + org.eclipse.angus + jakarta.mail + 2.0.2 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.springframework.boot + spring-boot-starter-test + test + + + com.icegreen + greenmail + 2.1.0-alpha-3 + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + + + org.springframework.boot + spring-boot-dependencies + 3.2.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.2.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java index 4cbe36f53..af4d3e7ba 100644 --- a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java +++ b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -108,7 +108,10 @@ public IntegrationFlow markers() { .publishSubscribeChannel(s -> s // first trigger file flushes - .subscribe(sf -> sf.transform("'/tmp/out/.*\\.txt'", e -> e.id("toTriggerPattern")) + .subscribe(sf -> sf + .transformWith(transformer -> transformer + .id("toTriggerPattern") + .expression("'/tmp/out/.*\\.txt'")) .trigger("fileOut", e -> e.id("flusher"))) // send the first file @@ -131,7 +134,7 @@ public IntegrationFlow markers() { .enrichHeaders(Mail.headers() .subject("File successfully split and transferred") .from("foo@bar") - .toFunction(m -> new String[]{ "bar@baz" })) + .toFunction(m -> new String[] {"bar@baz"})) .enrichHeaders(h -> h.header(EMAIL_SUCCESS_SUFFIX, ".success")) .channel("toMail.input"))); } @@ -174,7 +177,7 @@ public IntegrationFlow tfrErrors() { .enrichHeaders(Mail.headers() .subject("File split and transfer failed") .from("foo@bar") - .toFunction(m -> new String[]{ "bar@baz" })) + .toFunction(m -> new String[] {"bar@baz"})) .enrichHeaders(h -> h.header(EMAIL_SUCCESS_SUFFIX, ".failed") .headerExpression(FileHeaders.ORIGINAL_FILE, "payload.failedMessage.headers['" + FileHeaders.ORIGINAL_FILE + "']")) diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 6a17cc9f3..92480aee6 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loan-broker - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 4a564e1ba..a8e5c2f93 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loanshark - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -80,7 +80,7 @@ org.aspectj aspectjtools - 1.9.19 + 1.9.20.1 compile @@ -107,7 +107,7 @@ org.apache.commons commons-dbcp2 - 2.9.0 + 2.11.0 compile @@ -143,7 +143,7 @@ org.hsqldb hsqldb - 2.7.1 + 2.7.2 compile @@ -159,15 +159,15 @@ compile - org.eclipse.persistence - org.eclipse.persistence.jpa - 3.0.2 + jakarta.persistence + jakarta.persistence-api + 3.1.0 compile org.hibernate.orm hibernate-core - 6.2.2.Final + 6.3.1.Final compile @@ -217,7 +217,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 runtime @@ -277,7 +277,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -311,28 +311,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index c647c8d1e..ffc93c0fc 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stomp-chat - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -88,7 +88,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -127,240 +127,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -380,7 +385,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index e69de29bb..bcd0996a7 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -0,0 +1,168 @@ + + + 4.0.0 + org.springframework.integration.samples + amqp + 6.2.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration + spring-integration-stream + compile + + + org.springframework.integration + spring-integration-amqp + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + org.slf4j + slf4j-jcl + 1.7.30 + runtime + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index e69de29bb..bbdd8cba7 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -0,0 +1,412 @@ + + + 4.0.0 + org.springframework.integration.samples + barrier + 6.2.0 + jar + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.boot + spring-boot-starter-web + compile + + + org.springframework.boot + spring-boot-starter-integration + compile + + + org.springframework.boot + spring-boot-starter-amqp + compile + + + org.springframework.integration + spring-integration-amqp + compile + + + org.springframework.integration + spring-integration-http + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.springframework.amqp + spring-rabbit-junit + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + + + org.springframework.boot + spring-boot-dependencies + 3.2.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.2.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index e69de29bb..bfd9cb760 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + control-bus + 6.2.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration + spring-integration-core + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index e69de29bb..739dd976b 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -0,0 +1,163 @@ + + + 4.0.0 + org.springframework.integration.samples + enricher + 6.2.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration + spring-integration-core + compile + + + com.h2database + h2 + 2.2.224 + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index e69de29bb..58e434b38 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + feed + 6.2.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration + spring-integration-feed + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/basic/file/pom.xml b/basic/file/pom.xml index e69de29bb..0254a308d 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + file + 6.2.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration + spring-integration-file + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index e69de29bb..d1f274ab0 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -0,0 +1,181 @@ + + + 4.0.0 + org.springframework.integration.samples + ftp + 6.2.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration + spring-integration-ftp + compile + + + commons-io + commons-io + 2.15.0 + compile + + + org.apache.ftpserver + ftpserver-core + 1.2.0 + compile + + + org.slf4j + slf4j-api + 1.7.30 + compile + + + org.slf4j + slf4j-log4j12 + 1.7.30 + runtime + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.apache.logging.log4j + log4j-core + 2.21.1 + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 1e77b229a..d5c88a2cc 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples helloworld - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 436352f9e..2d312bde7 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples http - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -76,19 +76,19 @@ commons-io commons-io - 2.11.0 + 2.15.0 compile org.eclipse.angus jakarta.mail - 1.0.0 + 2.0.2 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -138,7 +138,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -172,28 +172,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index eb7cfeb6f..57c979993 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jdbc - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,13 +60,13 @@ com.h2database h2 - 2.2.220 + 2.2.224 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index bce74e85a..13b1372fc 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jms - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -71,7 +71,7 @@ org.apache.activemq artemis-server - 2.28.0 + 2.31.2 compile @@ -83,13 +83,13 @@ org.apache.activemq artemis-jakarta-client - 2.28.0 + 2.31.2 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -107,7 +107,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -141,28 +141,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index f8451c1f3..588a5ee1e 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jmx - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -117,28 +117,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 98fa686ec..497e889e2 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jpa - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -66,7 +66,7 @@ com.h2database h2 - 2.2.220 + 2.2.224 compile @@ -75,9 +75,9 @@ runtime - org.eclipse.persistence - org.eclipse.persistence.jpa - 3.0.2 + jakarta.persistence + jakarta.persistence-api + 3.1.0 runtime @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -134,240 +134,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -387,7 +392,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index d86591d11..5687300fe 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples kafka - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -77,7 +77,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -134,240 +134,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -387,7 +392,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java index 37533990b..0ab82aee9 100644 --- a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java +++ b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2018 the original author or authors. + * Copyright 2015-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,6 +57,8 @@ /** * @author Gary Russell + * @author Artem Bilan + * * @since 4.2 */ @SpringBootApplication @@ -66,7 +68,7 @@ public class Application { @Autowired private KafkaAppProperties properties; - public static void main(String[] args) throws Exception { + public static void main(String[] args) { ConfigurableApplicationContext context = new SpringApplicationBuilder(Application.class) .web(WebApplicationType.NONE) @@ -107,7 +109,7 @@ private void runDemo(ConfigurableApplicationContext context) { @Bean public ProducerFactory kafkaProducerFactory(KafkaProperties properties) { - Map producerProperties = properties.buildProducerProperties(); + Map producerProperties = properties.buildProducerProperties(null); producerProperties.put(ProducerConfig.LINGER_MS_CONFIG, 1); return new DefaultKafkaProducerFactory<>(producerProperties); } @@ -123,8 +125,7 @@ public MessageHandler handler(KafkaTemplate kafkaTemplate) { @Bean public ConsumerFactory kafkaConsumerFactory(KafkaProperties properties) { - Map consumerProperties = properties - .buildConsumerProperties(); + Map consumerProperties = properties.buildConsumerProperties(null); consumerProperties.put(ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, 15000); return new DefaultKafkaConsumerFactory<>(consumerProperties); } @@ -171,8 +172,8 @@ public NewTopic newTopic(KafkaAppProperties properties) { private KafkaProperties kafkaProperties; public void addAnotherListenerForTopics(String... topics) { - Map consumerProperties = kafkaProperties.buildConsumerProperties(); - // change the group id so we don't revoke the other partitions. + Map consumerProperties = kafkaProperties.buildConsumerProperties(null); + // change the group id, so we don't revoke the other partitions. consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, consumerProperties.get(ConsumerConfig.GROUP_ID_CONFIG) + "x"); IntegrationFlow flow = diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 63d3ea411..146613e66 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,13 +65,13 @@ org.eclipse.angus jakarta.mail - 1.0.0 + 2.0.2 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index cc7242c86..2343d7b6f 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mongodb - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,13 +60,13 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile org.mongodb mongodb-driver-sync - 4.9.1 + 4.11.1 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 79d8d69f2..97e1f0b94 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mqtt - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -122,240 +122,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -375,7 +380,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index f2dd21198..8f97a688f 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples oddeven - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 3247124ed..e2dbd894d 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples quote - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 4abea527b..6189b659b 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples sftp - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -94,7 +94,7 @@ org.apache.sshd sshd-sftp - 2.9.2 + 2.11.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 67bf2c948..ac5922560 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-amqp - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 runtime @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -129,28 +129,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index b035017e1..0e68066ef 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-broadcast - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -122,240 +122,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -375,7 +380,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 0c344439b..4d3188057 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index bbfa905f8..a605ce6b6 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-with-headers - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -122,240 +122,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -375,7 +380,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 6d7f798c6..0e18fc37c 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testing-examples - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -93,7 +93,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -127,28 +127,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 21af08b6f..26ecaa91d 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples twitter - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -61,7 +61,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -113,28 +113,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index e48d55b57..e67be885b 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples web-sockets - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -117,240 +117,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -370,7 +375,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 04c7d987b..5fc3af1c3 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-inbound-gateway - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -70,7 +70,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -120,7 +120,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -154,28 +154,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index abf9b4f69..be4d49a9c 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-outbound-gateway - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -117,28 +117,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index c078707a1..5b737a030 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xml - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 3802d8e5d..914f01bac 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xmpp - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/build.gradle b/build.gradle index 90bbe898a..e1653b822 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { maven { url 'https://repo.spring.io/snapshot' } } dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:1.1.0' + classpath 'io.spring.gradle:dependency-management-plugin:1.1.4' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" classpath 'org.gretty:gretty:4.0.3' } @@ -216,54 +216,54 @@ subprojects { subproject -> } ext { - apacheSshdVersion = '2.9.2' - artemisVersion = '2.28.0' - aspectjVersion = '1.9.19' + apacheSshdVersion = '2.11.0' + artemisVersion = '2.31.2' + aspectjVersion = '1.9.20.1' commonsDigesterVersion = '2.1' - commonsDbcpVersion = '2.9.0' + commonsDbcpVersion = '2.11.0' commonsFileUploadVersion = '1.5' - commonsIoVersion = '2.11.0' + commonsIoVersion = '2.15.0' commonsLangVersion = '3.12.0' commonsPoolVersion = '2.11.1' c3p0Version = '0.9.5.5' derbyVersion = '10.16.1.1' hamcrestVersion = '2.2' - hibernateVersion = '6.2.2.Final' + hibernateVersion = '6.3.1.Final' hibernateValidatorVersion = '8.0.0.Final' ftpServerVersion = '1.2.0' flexjsonVersion = '2.0' - groovyVersion = '4.0.12' - hsqldbVersion = '2.7.1' - h2Version = '2.2.220' - jacksonVersion = '2.15.0' - jaxbVersion = '4.0.2' + groovyVersion = '4.0.15' + hsqldbVersion = '2.7.2' + h2Version = '2.2.224' + jacksonVersion = '2.15.3' + jaxbVersion = '4.0.4' jodaTimeVersion = '1.6' jtaVersion = '2.0.0' jtdsVersion = '1.2.6' jmsApiVersion = '3.1.0' - jrubyVersion = '9.2.14.0' - jpaApiVersion = '3.0.2' + jrubyVersion = '9.4.3.0' + jpaApiVersion = '3.1.0' jstlVersion = '1.2' junitVersion = '4.13.2' - junitJupiterVersion = '5.9.3' + junitJupiterVersion = '5.10.1' jythonVersion = '2.7.3' - log4jVersion = '2.20.0' - mailVersion = '1.0.0' - mockitoVersion = '5.3.1' - mongoDriverVersion = '4.9.1' + log4jVersion = '2.21.1' + mailVersion = '2.0.2' + mockitoVersion = '5.7.0' + mongoDriverVersion = '4.11.1' openJpaVersion = '2.4.0' - oracleDriverVersion = '19.3.0.0' + oracleDriverVersion = '23.3.0.23.09' postgresVersion = '42.6.0' slf4jVersion = '1.7.30' - springCloudVersion = '2022.0.2' - springIntegrationVersion = '6.1.5' + springCloudVersion = '2022.0.4' + springIntegrationVersion = '6.2.0' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.0.11' - springSecurityVersion = '6.1.2' + springVersion = '6.1.0' + springSecurityVersion = '6.2.0' springWebFlowVersion = '3.0.0' - testcontainersVersion = '1.18.3' + testcontainersVersion = '1.19.2' tilesJspVersion = '2.2.1' } @@ -446,7 +446,7 @@ project('loanshark') { api "org.hsqldb:hsqldb:$hsqldbVersion" api "net.sf.flexjson:flexjson:$flexjsonVersion" api "org.hibernate:hibernate-validator:$hibernateValidatorVersion" - api "org.eclipse.persistence:org.eclipse.persistence.jpa:$jpaApiVersion" + api "jakarta.persistence:jakarta.persistence-api:$jpaApiVersion" api "org.hibernate.orm:hibernate-core:$hibernateVersion" api "org.springframework.webflow:spring-js-resources:$springWebFlowVersion" api "org.slf4j:slf4j-api:$slf4jVersion" @@ -707,7 +707,7 @@ project('si4demo') { api 'org.springframework.integration:spring-integration-http' api 'org.springframework.integration:spring-integration-ip' api "org.eclipse.angus:jakarta.mail:$mailVersion" - api 'com.rometools:rome:1.18.0' + api 'com.rometools:rome:2.1.0' testImplementation 'org.springframework.boot:spring-boot-starter-test' } @@ -804,7 +804,7 @@ project('jpa') { api "com.h2database:h2:$h2Version" runtimeOnly 'org.springframework:spring-instrument' - runtimeOnly "org.eclipse.persistence:org.eclipse.persistence.jpa:$jpaApiVersion" + runtimeOnly "jakarta.persistence:jakarta.persistence-api:$jpaApiVersion" testImplementation 'org.springframework.boot:spring-boot-starter-test' } @@ -1275,7 +1275,7 @@ project('stored-procedures-oracle') { dependencies { api 'org.springframework.integration:spring-integration-jdbc' - api "com.oracle.ojdbc:ojdbc8:$oracleDriverVersion" + api "com.oracle.database.jdbc:ojdbc11:$oracleDriverVersion" api "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1469,7 +1469,7 @@ project('file-split-ftp') { testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.integration:spring-integration-test' - testImplementation ('com.icegreen:greenmail:2.0.0-alpha-2') { + testImplementation ('com.icegreen:greenmail:2.1.0-alpha-3') { exclude group: 'com.sun.mail' exclude group: 'jakarta.activation' } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index e69de29bb..4e39d4d49 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -0,0 +1,403 @@ + + + 4.0.0 + org.springframework.integration.samples + cafe-dsl + 6.2.0 + jar + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration.samples + cafe-si + 6.2.0 + compile + + + org.springframework.boot + spring-boot-starter-integration + compile + + + org.springframework.integration + spring-integration-core + compile + + + org.springframework.integration + spring-integration-stream + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + + + org.springframework.boot + spring-boot-dependencies + 3.2.0-SNAPSHOT + import + pom + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + org.springframework.boot + spring-boot-starter-parent + 3.2.0-SNAPSHOT + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 260bf3b53..77bbe51bf 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples kafka-dsl - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -128,240 +128,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -381,7 +386,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java b/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java index 65fab86a4..b6888d247 100644 --- a/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java +++ b/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2018 the original author or authors. + * Copyright 2016-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,13 +44,14 @@ /** * @author Gary Russell * @author Artem Bilan + * * @since 4.3 */ @SpringBootApplication @EnableConfigurationProperties(KafkaAppProperties.class) public class Application { - public static void main(String[] args) throws Exception { + public static void main(String[] args) { ConfigurableApplicationContext context = new SpringApplicationBuilder(Application.class) .web(WebApplicationType.NONE) @@ -136,8 +137,8 @@ public NewTopic newTopic(KafkaAppProperties properties) { private KafkaProperties kafkaProperties; public void addAnotherListenerForTopics(String... topics) { - Map consumerProperties = kafkaProperties.buildConsumerProperties(); - // change the group id so we don't revoke the other partitions. + Map consumerProperties = kafkaProperties.buildConsumerProperties(null); + // change the group id, so we don't revoke the other partitions. consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, consumerProperties.get(ConsumerConfig.GROUP_ID_CONFIG) + "x"); IntegrationFlow flow = diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index e1091248d..cccec1667 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples si4demo - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -87,13 +87,13 @@ org.eclipse.angus jakarta.mail - 1.0.0 + 2.0.2 compile com.rometools rome - 1.18.0 + 2.1.0 compile @@ -111,7 +111,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -150,240 +150,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -403,7 +408,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/gradle.properties b/gradle.properties index 45f8815bc..199434e51 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -version=6.1.0 -springBootVersion=3.1.1-SNAPSHOT +version=6.2.0 +springBootVersion=3.2.0-SNAPSHOT org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8 org.gradle.caching=true org.gradle.parallel=true diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index e69de29bb..dbe1faae2 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + async-gateway + 6.2.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration + spring-integration-core + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index e69de29bb..e47fcf66b 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + dynamic-poller + 6.2.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration + spring-integration-core + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index e69de29bb..1da075777 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + errorhandling + 6.2.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration + spring-integration-stream + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index e69de29bb..d5ba2bb79 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + file-processing + 6.2.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + abilan@vmware.com + + project lead + + + + garyrussell + Gary Russell + grussell@vmware.com + + project lead emeritus + + + + markfisher + Mark Fisher + markfisher@vmware.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration + spring-integration-file + compile + + + org.apache.logging.log4j + log4j-core + 2.21.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.7.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.10.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + import + pom + + + org.springframework + spring-framework-bom + 6.1.0 + import + pom + + + org.springframework.integration + spring-integration-bom + 6.2.0 + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 1529e9094..cf28807a7 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail-attachments - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,19 +65,19 @@ org.eclipse.angus jakarta.mail - 1.0.0 + 2.0.2 compile commons-io commons-io - 2.11.0 + 2.15.0 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -129,28 +129,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index d012ee855..c4e002f58 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples monitoring - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -82,7 +82,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -132,7 +132,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -166,28 +166,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java b/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java index 24327a0d2..d6e020919 100644 --- a/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java +++ b/intermediate/monitoring/src/main/java/org/springintegration/PayloadAwareTimingInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,15 +31,17 @@ * based on message payload types. * * @author Gary Russell + * @author Artem Bilan + * * @since 2.2 * */ @ManagedResource public class PayloadAwareTimingInterceptor implements ChannelInterceptor { - private static final ThreadLocal stopWatchHolder = new ThreadLocal(); + private static final ThreadLocal stopWatchHolder = new ThreadLocal<>(); - private final Map, Stats> statsMap = new ConcurrentHashMap, PayloadAwareTimingInterceptor.Stats>(); + private final Map, Stats> statsMap = new ConcurrentHashMap<>(); /** * @@ -67,12 +69,12 @@ public Message preSend(Message message, MessageChannel channel) { public void postSend(Message message, MessageChannel channel, boolean sent) { StopWatchHolder holder = stopWatchHolder.get(); if (holder != null) { - holder.getStopWatch().stop(); - Stats stats = this.statsMap.get(holder.getType()); + holder.stopWatch().stop(); + Stats stats = this.statsMap.get(holder.type()); if (stats == null) { stats = this.statsMap.get(Object.class); } - stats.add(holder.getStopWatch().getLastTaskTimeMillis()); + stats.add(holder.stopWatch().lastTaskInfo().getTimeMillis()); } } @@ -101,28 +103,8 @@ public float getAverage(String className) throws Exception { return this.statsMap.get(Class.forName(className)).getAverage(); } - private static class StopWatchHolder { - - private final StopWatch stopWatch; - - private final Class type; - - /** - * @param stopWatch - * @param type - */ - public StopWatchHolder(StopWatch stopWatch, Class type) { - this.stopWatch = stopWatch; - this.type = type; - } - - public StopWatch getStopWatch() { - return stopWatch; - } + private record StopWatchHolder(StopWatch stopWatch, Class type) { - public Class getType() { - return type; - } } private static final class Stats { diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 978d76e7b..46c1f41a4 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples multipart-http - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -76,13 +76,13 @@ commons-io commons-io - 2.11.0 + 2.15.0 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -132,7 +132,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -166,28 +166,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index f6eca7ba9..e9122381a 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples rest-http - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -95,25 +95,25 @@ org.springframework.security spring-security-web - 6.1.2 + 6.2.0 compile org.springframework.security spring-security-config - 6.1.2 + 6.2.0 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile com.sun.xml.bind jaxb-impl - 4.0.2 + 4.0.4 compile @@ -163,7 +163,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -197,28 +197,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index e64ff9384..c3e8f1eb0 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples retry-and-more - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -75,7 +75,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 compile @@ -93,7 +93,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -111,7 +111,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -145,28 +145,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index aa86f3878..e303021cb 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index f290177e1..11d4fcfd2 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-derby - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -72,7 +72,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -90,7 +90,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -124,28 +124,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 9e0b61ebf..fd34f5b11 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-ms - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -72,7 +72,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -90,7 +90,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -124,28 +124,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 19f106a7b..e4063e280 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-oracle - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -58,15 +58,15 @@ compile - com.oracle.ojdbc - ojdbc8 - 19.3.0.0 + com.oracle.database.jdbc + ojdbc11 + 23.3.0.23.09 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index b1360302d..9ac91b364 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-postgresql - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -66,7 +66,7 @@ org.apache.commons commons-dbcp2 - 2.9.0 + 2.11.0 compile @@ -78,7 +78,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -96,7 +96,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -130,28 +130,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 0004fc167..e42f69e5b 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-async-bi-directional - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -117,240 +117,245 @@ org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -370,7 +375,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 945b73e64..a38f40200 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 1eef63bef..7eaad75f7 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testcontainers-rabbitmq - 6.1.0 + 6.2.0 jar https://github.com/spring-projects/spring-integration-samples @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -114,7 +114,7 @@ org.testcontainers junit-jupiter - 1.18.3 + 1.19.2 test @@ -144,247 +144,252 @@ org.springframework.integration spring-integration-jdbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ws - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-redis - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-r2dbc - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-rsocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-event - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-cassandra - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-scripting - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-websocket - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-graphql - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jpa - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-http - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zookeeper - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mail - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-camel - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mongodb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stream - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-stomp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-file - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-syslog - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-smb - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jmx - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-webflux - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-sftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-mqtt - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-ftp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-kafka - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-groovy - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xmpp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-feed - 6.1.3 + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 org.springframework.integration spring-integration-zeromq - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-hazelcast - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-test-support - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-amqp - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-security - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-xml - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-core - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-zip - 6.1.3 + 6.2.0 org.springframework.integration spring-integration-jms - 6.1.3 + 6.2.0 org.springframework.cloud spring-cloud-dependencies - 2022.0.2 + 2022.0.4 import pom org.springframework.boot spring-boot-dependencies - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT import pom org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom @@ -404,7 +409,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.1-SNAPSHOT + 3.2.0-SNAPSHOT diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 70ad64113..8e986bee4 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples travel - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -70,7 +70,7 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -88,7 +88,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -122,28 +122,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 0b11620a4..b55ba3edd 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tx-synch - 6.1.0 + 6.2.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,13 +65,13 @@ com.h2database h2 - 2.2.220 + 2.2.224 compile org.apache.logging.log4j log4j-core - 2.20.0 + 2.21.1 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.3.1 + 5.7.0 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.9.3 + 5.10.1 import pom com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.3 import pom org.springframework spring-framework-bom - 6.0.11 + 6.1.0 import pom org.springframework.integration spring-integration-bom - 6.1.3 + 6.2.0 import pom From 240abd5c278d3f24b436a5c6937e903aac6d7007 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 22 Jan 2024 12:58:27 -0500 Subject: [PATCH 337/356] Upgrade to Derby `10.16.1.2` --- advanced/dynamic-tcp-client/pom.xml | 210 ------------------ applications/file-split-ftp/pom.xml | 210 ------------------ applications/stomp-chat/pom.xml | 210 ------------------ basic/barrier/pom.xml | 210 ------------------ basic/jpa/pom.xml | 210 ------------------ basic/kafka/pom.xml | 210 ------------------ basic/mqtt/pom.xml | 210 ------------------ basic/tcp-broadcast/pom.xml | 210 ------------------ basic/tcp-with-headers/pom.xml | 210 ------------------ basic/web-sockets/pom.xml | 210 ------------------ build.gradle | 2 +- dsl/cafe-dsl/pom.xml | 210 ------------------ dsl/kafka-dsl/pom.xml | 210 ------------------ dsl/si4demo/pom.xml | 210 ------------------ intermediate/stored-procedures-derby/pom.xml | 4 +- intermediate/tcp-async-bi-directional/pom.xml | 210 ------------------ intermediate/testcontainers-rabbitmq/pom.xml | 210 ------------------ 17 files changed, 3 insertions(+), 3153 deletions(-) diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 3b9af9ae4..860b06164 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -114,216 +114,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index ff773133b..7a8941975 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -141,216 +141,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index ffc93c0fc..5438676e5 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -124,216 +124,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index bbdd8cba7..687627034 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -134,216 +134,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 497e889e2..278f23d0f 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -131,216 +131,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 5687300fe..505476c23 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -131,216 +131,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 97e1f0b94..5d47d3112 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -119,216 +119,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 0e68066ef..df1f5abf3 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -119,216 +119,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index a605ce6b6..38d666f4c 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -119,216 +119,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index e67be885b..8b6db7e91 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -114,216 +114,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/build.gradle b/build.gradle index e1653b822..c485380ff 100644 --- a/build.gradle +++ b/build.gradle @@ -226,7 +226,7 @@ subprojects { subproject -> commonsLangVersion = '3.12.0' commonsPoolVersion = '2.11.1' c3p0Version = '0.9.5.5' - derbyVersion = '10.16.1.1' + derbyVersion = '10.16.1.2' hamcrestVersion = '2.2' hibernateVersion = '6.3.1.Final' hibernateValidatorVersion = '8.0.0.Final' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 4e39d4d49..38fc78395 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -125,216 +125,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 77bbe51bf..2bc4ddbc2 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -125,216 +125,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index cccec1667..9155bf7e4 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -147,216 +147,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 11d4fcfd2..2ac3d4689 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -60,13 +60,13 @@ org.apache.derby derby - 10.16.1.1 + 10.16.1.2 compile org.apache.derby derbytools - 10.16.1.1 + 10.16.1.2 compile diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index e42f69e5b..7642f8254 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -114,216 +114,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 7eaad75f7..f0e061ded 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -141,216 +141,6 @@ - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - org.springframework.cloud spring-cloud-dependencies From df2363a7092e179406c7e1f88b3e859ef6e0d4df Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 22 Jan 2024 13:02:33 -0500 Subject: [PATCH 338/356] Revert "Upgrade to Derby `10.16.1.2`" This reverts commit 240abd5c278d3f24b436a5c6937e903aac6d7007. --- advanced/dynamic-tcp-client/pom.xml | 210 ++++++++++++++++++ applications/file-split-ftp/pom.xml | 210 ++++++++++++++++++ applications/stomp-chat/pom.xml | 210 ++++++++++++++++++ basic/barrier/pom.xml | 210 ++++++++++++++++++ basic/jpa/pom.xml | 210 ++++++++++++++++++ basic/kafka/pom.xml | 210 ++++++++++++++++++ basic/mqtt/pom.xml | 210 ++++++++++++++++++ basic/tcp-broadcast/pom.xml | 210 ++++++++++++++++++ basic/tcp-with-headers/pom.xml | 210 ++++++++++++++++++ basic/web-sockets/pom.xml | 210 ++++++++++++++++++ build.gradle | 2 +- dsl/cafe-dsl/pom.xml | 210 ++++++++++++++++++ dsl/kafka-dsl/pom.xml | 210 ++++++++++++++++++ dsl/si4demo/pom.xml | 210 ++++++++++++++++++ intermediate/stored-procedures-derby/pom.xml | 4 +- intermediate/tcp-async-bi-directional/pom.xml | 210 ++++++++++++++++++ intermediate/testcontainers-rabbitmq/pom.xml | 210 ++++++++++++++++++ 17 files changed, 3153 insertions(+), 3 deletions(-) diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 860b06164..3b9af9ae4 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -114,6 +114,216 @@ + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + org.springframework.boot spring-boot-dependencies diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 7a8941975..ff773133b 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -141,6 +141,216 @@ + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + org.springframework.boot spring-boot-dependencies diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 5438676e5..ffc93c0fc 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -124,6 +124,216 @@ + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + org.springframework.boot spring-boot-dependencies diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 687627034..bbdd8cba7 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -134,6 +134,216 @@ + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + org.springframework.boot spring-boot-dependencies diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 278f23d0f..497e889e2 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -131,6 +131,216 @@ + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + org.springframework.boot spring-boot-dependencies diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 505476c23..5687300fe 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -131,6 +131,216 @@ + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + org.springframework.boot spring-boot-dependencies diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 5d47d3112..97e1f0b94 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -119,6 +119,216 @@ + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + org.springframework.boot spring-boot-dependencies diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index df1f5abf3..0e68066ef 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -119,6 +119,216 @@ + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + org.springframework.boot spring-boot-dependencies diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 38d666f4c..a605ce6b6 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -119,6 +119,216 @@ + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + org.springframework.boot spring-boot-dependencies diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 8b6db7e91..e67be885b 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -114,6 +114,216 @@ + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + org.springframework.boot spring-boot-dependencies diff --git a/build.gradle b/build.gradle index c485380ff..e1653b822 100644 --- a/build.gradle +++ b/build.gradle @@ -226,7 +226,7 @@ subprojects { subproject -> commonsLangVersion = '3.12.0' commonsPoolVersion = '2.11.1' c3p0Version = '0.9.5.5' - derbyVersion = '10.16.1.2' + derbyVersion = '10.16.1.1' hamcrestVersion = '2.2' hibernateVersion = '6.3.1.Final' hibernateValidatorVersion = '8.0.0.Final' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 38fc78395..4e39d4d49 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -125,6 +125,216 @@ + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + org.springframework.boot spring-boot-dependencies diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 2bc4ddbc2..77bbe51bf 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -125,6 +125,216 @@ + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + org.springframework.boot spring-boot-dependencies diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 9155bf7e4..cccec1667 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -147,6 +147,216 @@ + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + org.springframework.boot spring-boot-dependencies diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 2ac3d4689..11d4fcfd2 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -60,13 +60,13 @@ org.apache.derby derby - 10.16.1.2 + 10.16.1.1 compile org.apache.derby derbytools - 10.16.1.2 + 10.16.1.1 compile diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 7642f8254..e42f69e5b 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -114,6 +114,216 @@ + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + org.springframework.boot spring-boot-dependencies diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index f0e061ded..7eaad75f7 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -141,6 +141,216 @@ + + org.springframework.integration + spring-integration-jdbc + 6.2.0 + + + org.springframework.integration + spring-integration-ws + 6.2.0 + + + org.springframework.integration + spring-integration-redis + 6.2.0 + + + org.springframework.integration + spring-integration-r2dbc + 6.2.0 + + + org.springframework.integration + spring-integration-rsocket + 6.2.0 + + + org.springframework.integration + spring-integration-event + 6.2.0 + + + org.springframework.integration + spring-integration-cassandra + 6.2.0 + + + org.springframework.integration + spring-integration-scripting + 6.2.0 + + + org.springframework.integration + spring-integration-websocket + 6.2.0 + + + org.springframework.integration + spring-integration-graphql + 6.2.0 + + + org.springframework.integration + spring-integration-jpa + 6.2.0 + + + org.springframework.integration + spring-integration-test + 6.2.0 + + + org.springframework.integration + spring-integration-http + 6.2.0 + + + org.springframework.integration + spring-integration-zookeeper + 6.2.0 + + + org.springframework.integration + spring-integration-ip + 6.2.0 + + + org.springframework.integration + spring-integration-mail + 6.2.0 + + + org.springframework.integration + spring-integration-camel + 6.2.0 + + + org.springframework.integration + spring-integration-mongodb + 6.2.0 + + + org.springframework.integration + spring-integration-stream + 6.2.0 + + + org.springframework.integration + spring-integration-stomp + 6.2.0 + + + org.springframework.integration + spring-integration-file + 6.2.0 + + + org.springframework.integration + spring-integration-syslog + 6.2.0 + + + org.springframework.integration + spring-integration-smb + 6.2.0 + + + org.springframework.integration + spring-integration-jmx + 6.2.0 + + + org.springframework.integration + spring-integration-webflux + 6.2.0 + + + org.springframework.integration + spring-integration-sftp + 6.2.0 + + + org.springframework.integration + spring-integration-mqtt + 6.2.0 + + + org.springframework.integration + spring-integration-ftp + 6.2.0 + + + org.springframework.integration + spring-integration-kafka + 6.2.0 + + + org.springframework.integration + spring-integration-groovy + 6.2.0 + + + org.springframework.integration + spring-integration-xmpp + 6.2.0 + + + org.springframework.integration + spring-integration-feed + 6.2.0 + + + org.springframework.integration + spring-integration-debezium + 6.2.0 + + + org.springframework.integration + spring-integration-zeromq + 6.2.0 + + + org.springframework.integration + spring-integration-hazelcast + 6.2.0 + + + org.springframework.integration + spring-integration-test-support + 6.2.0 + + + org.springframework.integration + spring-integration-amqp + 6.2.0 + + + org.springframework.integration + spring-integration-security + 6.2.0 + + + org.springframework.integration + spring-integration-xml + 6.2.0 + + + org.springframework.integration + spring-integration-core + 6.2.0 + + + org.springframework.integration + spring-integration-zip + 6.2.0 + + + org.springframework.integration + spring-integration-jms + 6.2.0 + org.springframework.cloud spring-cloud-dependencies From cb78e3da2d68e4fc595ce9562ae86ce490bde9d4 Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Mon, 22 Jan 2024 16:02:31 -0600 Subject: [PATCH 339/356] Update Revved up by Develocity badge (#358) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7407bd92b..0a098ae47 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Spring Integration Samples ========================== -[![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.spring.io/scans?search.rootProjectNames=spring-integration-samples) +[![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.spring.io/scans?search.rootProjectNames=spring-integration-samples) Welcome to the **Spring Integration Samples** repository which provides **50+ samples** to help you learn [Spring Integration][]. To simplify your experience, the *Spring Integration* samples are split into 4 distinct categories: From 29797ce1152f08c31bc78bcbda498406be55e1c4 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 21 Feb 2024 09:19:20 -0500 Subject: [PATCH 340/356] Upgrade to PostgreSQL `42.7.2` --- advanced/dynamic-tcp-client/pom.xml | 210 ------------------ applications/file-split-ftp/pom.xml | 210 ------------------ applications/stomp-chat/pom.xml | 210 ------------------ basic/barrier/pom.xml | 210 ------------------ basic/jpa/pom.xml | 210 ------------------ basic/kafka/pom.xml | 210 ------------------ basic/mqtt/pom.xml | 210 ------------------ basic/tcp-broadcast/pom.xml | 210 ------------------ basic/tcp-with-headers/pom.xml | 210 ------------------ basic/web-sockets/pom.xml | 210 ------------------ build.gradle | 2 +- dsl/cafe-dsl/pom.xml | 210 ------------------ dsl/kafka-dsl/pom.xml | 210 ------------------ dsl/si4demo/pom.xml | 210 ------------------ .../stored-procedures-postgresql/pom.xml | 2 +- intermediate/tcp-async-bi-directional/pom.xml | 210 ------------------ intermediate/testcontainers-rabbitmq/pom.xml | 210 ------------------ 17 files changed, 2 insertions(+), 3152 deletions(-) diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 3b9af9ae4..860b06164 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -114,216 +114,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index ff773133b..7a8941975 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -141,216 +141,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index ffc93c0fc..5438676e5 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -124,216 +124,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index bbdd8cba7..687627034 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -134,216 +134,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 497e889e2..278f23d0f 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -131,216 +131,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 5687300fe..505476c23 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -131,216 +131,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 97e1f0b94..5d47d3112 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -119,216 +119,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 0e68066ef..df1f5abf3 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -119,216 +119,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index a605ce6b6..38d666f4c 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -119,216 +119,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index e67be885b..8b6db7e91 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -114,216 +114,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/build.gradle b/build.gradle index e1653b822..88811d219 100644 --- a/build.gradle +++ b/build.gradle @@ -253,7 +253,7 @@ subprojects { subproject -> mongoDriverVersion = '4.11.1' openJpaVersion = '2.4.0' oracleDriverVersion = '23.3.0.23.09' - postgresVersion = '42.6.0' + postgresVersion = '42.7.2' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.4' springIntegrationVersion = '6.2.0' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 4e39d4d49..38fc78395 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -125,216 +125,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 77bbe51bf..2bc4ddbc2 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -125,216 +125,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index cccec1667..9155bf7e4 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -147,216 +147,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 9ac91b364..845df54f2 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -60,7 +60,7 @@ org.postgresql postgresql - 42.6.0 + 42.7.2 compile diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index e42f69e5b..7642f8254 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -114,216 +114,6 @@ - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - org.springframework.boot spring-boot-dependencies diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 7eaad75f7..f0e061ded 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -141,216 +141,6 @@ - - org.springframework.integration - spring-integration-jdbc - 6.2.0 - - - org.springframework.integration - spring-integration-ws - 6.2.0 - - - org.springframework.integration - spring-integration-redis - 6.2.0 - - - org.springframework.integration - spring-integration-r2dbc - 6.2.0 - - - org.springframework.integration - spring-integration-rsocket - 6.2.0 - - - org.springframework.integration - spring-integration-event - 6.2.0 - - - org.springframework.integration - spring-integration-cassandra - 6.2.0 - - - org.springframework.integration - spring-integration-scripting - 6.2.0 - - - org.springframework.integration - spring-integration-websocket - 6.2.0 - - - org.springframework.integration - spring-integration-graphql - 6.2.0 - - - org.springframework.integration - spring-integration-jpa - 6.2.0 - - - org.springframework.integration - spring-integration-test - 6.2.0 - - - org.springframework.integration - spring-integration-http - 6.2.0 - - - org.springframework.integration - spring-integration-zookeeper - 6.2.0 - - - org.springframework.integration - spring-integration-ip - 6.2.0 - - - org.springframework.integration - spring-integration-mail - 6.2.0 - - - org.springframework.integration - spring-integration-camel - 6.2.0 - - - org.springframework.integration - spring-integration-mongodb - 6.2.0 - - - org.springframework.integration - spring-integration-stream - 6.2.0 - - - org.springframework.integration - spring-integration-stomp - 6.2.0 - - - org.springframework.integration - spring-integration-file - 6.2.0 - - - org.springframework.integration - spring-integration-syslog - 6.2.0 - - - org.springframework.integration - spring-integration-smb - 6.2.0 - - - org.springframework.integration - spring-integration-jmx - 6.2.0 - - - org.springframework.integration - spring-integration-webflux - 6.2.0 - - - org.springframework.integration - spring-integration-sftp - 6.2.0 - - - org.springframework.integration - spring-integration-mqtt - 6.2.0 - - - org.springframework.integration - spring-integration-ftp - 6.2.0 - - - org.springframework.integration - spring-integration-kafka - 6.2.0 - - - org.springframework.integration - spring-integration-groovy - 6.2.0 - - - org.springframework.integration - spring-integration-xmpp - 6.2.0 - - - org.springframework.integration - spring-integration-feed - 6.2.0 - - - org.springframework.integration - spring-integration-debezium - 6.2.0 - - - org.springframework.integration - spring-integration-zeromq - 6.2.0 - - - org.springframework.integration - spring-integration-hazelcast - 6.2.0 - - - org.springframework.integration - spring-integration-test-support - 6.2.0 - - - org.springframework.integration - spring-integration-amqp - 6.2.0 - - - org.springframework.integration - spring-integration-security - 6.2.0 - - - org.springframework.integration - spring-integration-xml - 6.2.0 - - - org.springframework.integration - spring-integration-core - 6.2.0 - - - org.springframework.integration - spring-integration-zip - 6.2.0 - - - org.springframework.integration - spring-integration-jms - 6.2.0 - org.springframework.cloud spring-cloud-dependencies From 322eb796505be0782a4d11d8a4a8fbde3946ffb9 Mon Sep 17 00:00:00 2001 From: Maksim Sasnouski Date: Thu, 29 Feb 2024 17:01:16 +0300 Subject: [PATCH 341/356] Upgrade com.gradle.enterprise plugin to 3.16.2 --- settings.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.gradle b/settings.gradle index 2d70559ed..860c79c22 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,8 +6,8 @@ pluginManagement { } plugins { - id 'com.gradle.enterprise' version '3.14.1' - id 'io.spring.ge.conventions' version '0.0.13' + id 'com.gradle.enterprise' version '3.16.2' + id 'io.spring.ge.conventions' version '0.0.15' } rootProject.name = 'spring-integration-samples' From 7dee4333ffa35dd35f9558ab5e39635cb286d496 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 19 Mar 2024 15:08:53 -0400 Subject: [PATCH 342/356] Remove `sshd-sftp` dependency It is managed now transitively by `spring-integration-sftp` --- basic/sftp/pom.xml | 6 ------ build.gradle | 2 -- 2 files changed, 8 deletions(-) diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 6189b659b..89ba184ef 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -91,12 +91,6 @@ spring-integration-test test - - org.apache.sshd - sshd-sftp - 2.11.0 - test - org.junit.jupiter junit-jupiter-engine diff --git a/build.gradle b/build.gradle index 88811d219..cfe8b4ef6 100644 --- a/build.gradle +++ b/build.gradle @@ -216,7 +216,6 @@ subprojects { subproject -> } ext { - apacheSshdVersion = '2.11.0' artemisVersion = '2.31.2' aspectjVersion = '1.9.20.1' commonsDigesterVersion = '2.1' @@ -890,7 +889,6 @@ project('sftp') { dependencies { api 'org.springframework.integration:spring-integration-sftp' api "org.apache.logging.log4j:log4j-core:$log4jVersion" - testImplementation "org.apache.sshd:sshd-sftp:$apacheSshdVersion" } } From 4f664ecab21d7e5a5607e73ead2a5ed41f0f6a1f Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 18 Jun 2024 15:40:00 -0400 Subject: [PATCH 343/356] Migrate `main` to SI-6.4.0 * Upgrade all the respective dependencies * Fix deprecation for latest ActiveMQ Artemis dependency --- .../jms/ActiveMQMultiContextTests.java | 2 +- build.gradle | 44 +++++++++---------- gradle.properties | 4 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java index 7c0472b67..5daaa8fe4 100644 --- a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java +++ b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java @@ -49,7 +49,7 @@ public abstract class ActiveMQMultiContextTests { private static final EmbeddedActiveMQ broker = new EmbeddedActiveMQ(); static { - amqFactory.setDeserializationWhiteList(ObjectInputStreamWithClassLoader.CATCH_ALL_WILDCARD); + amqFactory.setDeserializationAllowList(ObjectInputStreamWithClassLoader.CATCH_ALL_WILDCARD); amqFactory.setRetryInterval(0); } diff --git a/build.gradle b/build.gradle index cfe8b4ef6..b0668a74d 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { maven { url 'https://repo.spring.io/snapshot' } } dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:1.1.4' + classpath 'io.spring.gradle:dependency-management-plugin:1.1.5' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" classpath 'org.gretty:gretty:4.0.3' } @@ -216,53 +216,53 @@ subprojects { subproject -> } ext { - artemisVersion = '2.31.2' - aspectjVersion = '1.9.20.1' + artemisVersion = '2.33.0' + aspectjVersion = '1.9.22.1' commonsDigesterVersion = '2.1' - commonsDbcpVersion = '2.11.0' + commonsDbcpVersion = '2.12.0' commonsFileUploadVersion = '1.5' - commonsIoVersion = '2.15.0' + commonsIoVersion = '2.16.1' commonsLangVersion = '3.12.0' commonsPoolVersion = '2.11.1' c3p0Version = '0.9.5.5' derbyVersion = '10.16.1.1' hamcrestVersion = '2.2' - hibernateVersion = '6.3.1.Final' + hibernateVersion = '6.5.2.Final' hibernateValidatorVersion = '8.0.0.Final' ftpServerVersion = '1.2.0' flexjsonVersion = '2.0' - groovyVersion = '4.0.15' - hsqldbVersion = '2.7.2' + groovyVersion = '4.0.21' + hsqldbVersion = '2.7.3' h2Version = '2.2.224' - jacksonVersion = '2.15.3' - jaxbVersion = '4.0.4' + jacksonVersion = '2.17.1' + jaxbVersion = '4.0.5' jodaTimeVersion = '1.6' jtaVersion = '2.0.0' jtdsVersion = '1.2.6' jmsApiVersion = '3.1.0' - jrubyVersion = '9.4.3.0' + jrubyVersion = '9.4.7.0' jpaApiVersion = '3.1.0' jstlVersion = '1.2' junitVersion = '4.13.2' - junitJupiterVersion = '5.10.1' + junitJupiterVersion = '5.10.2' jythonVersion = '2.7.3' - log4jVersion = '2.21.1' - mailVersion = '2.0.2' - mockitoVersion = '5.7.0' - mongoDriverVersion = '4.11.1' + log4jVersion = '2.23.1' + mailVersion = '2.0.3' + mockitoVersion = '5.12.0' + mongoDriverVersion = '5.1.1' openJpaVersion = '2.4.0' oracleDriverVersion = '23.3.0.23.09' - postgresVersion = '42.7.2' + postgresVersion = '42.7.3' slf4jVersion = '1.7.30' - springCloudVersion = '2022.0.4' - springIntegrationVersion = '6.2.0' + springCloudVersion = '2023.0.2' + springIntegrationVersion = '6.4.0-SNAPSHOT' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.1.0' - springSecurityVersion = '6.2.0' + springVersion = '6.2.0-SNAPSHOT' + springSecurityVersion = '6.4.0-SNAPSHOT' springWebFlowVersion = '3.0.0' - testcontainersVersion = '1.19.2' + testcontainersVersion = '1.19.8' tilesJspVersion = '2.2.1' } diff --git a/gradle.properties b/gradle.properties index 199434e51..77eb5d1c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -version=6.2.0 -springBootVersion=3.2.0-SNAPSHOT +version=6.4.0 +springBootVersion=3.3.0 org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8 org.gradle.caching=true org.gradle.parallel=true From 0e17fd4eec7de5ea21da396cb2ce0e93b188f491 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 16 Jul 2024 10:47:45 -0400 Subject: [PATCH 344/356] GH-361: Add `timeout` and `scheduling.pool.size` for Cafe DSL demo Fixes: #361 The default request timeout in Spring Integration is `30 seconds` to not block the thread forever. However, the logic in the Cafe Demo is longer even that one minute to wait for all the drinks to be ready to free an order queue. * Add `spring.integration.endpoint.default-timeout=-1` to wait on the customer request forever for the logic of the application * Add `spring.task.scheduling.pool.size=10` to avoid deadlock when all the scheduled tasks compete for the same thread by default * Upgrade to latest Gradle * Upgrade to the latest Spring Boot Related to: https://github.com/spring-projects/spring-boot/issues/41477 --- .../src/main/resources/application.properties | 2 ++ gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 62076 -> 43504 bytes gradle/wrapper/gradle-wrapper.properties | 6 ++-- gradlew | 27 +++++++++++------- gradlew.bat | 22 +++++++------- 6 files changed, 36 insertions(+), 23 deletions(-) create mode 100644 dsl/cafe-dsl/src/main/resources/application.properties diff --git a/dsl/cafe-dsl/src/main/resources/application.properties b/dsl/cafe-dsl/src/main/resources/application.properties new file mode 100644 index 000000000..ece0a79a0 --- /dev/null +++ b/dsl/cafe-dsl/src/main/resources/application.properties @@ -0,0 +1,2 @@ +spring.task.scheduling.pool.size=10 +spring.integration.endpoint.default-timeout=-1 \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 77eb5d1c4..eb8417e01 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ version=6.4.0 -springBootVersion=3.3.0 +springBootVersion=3.4.0-SNAPSHOT org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8 org.gradle.caching=true org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a79e29d3e0ab67b14947c167a862655af9b..2c3521197d7c4586c843d1d3e9090525f1898cde 100644 GIT binary patch literal 43504 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 TZiJi*F`$tkWLn) literal 62076 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 49251768c..68e8816d7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f diff --git a/gradlew b/gradlew index aeb74cbb4..f5feea6d6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,7 +85,9 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -130,10 +134,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -141,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -149,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -198,11 +205,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 6689b85be..9b42019c7 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail From 8cbb6311f7b3be0392e7ab17f1fbb45f5752d93d Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 19 Jul 2024 12:54:19 -0400 Subject: [PATCH 345/356] Use `spring-io/spring-github-workflows` for CI --- .github/workflows/pr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 246f6a7f1..e1fde2fe0 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -7,4 +7,4 @@ on: jobs: build-pull-request: - uses: artembilan/spring-github-workflows/.github/workflows/spring-gradle-pull-request-build.yml@main + uses: spring-io/spring-github-workflows/.github/workflows/spring-gradle-pull-request-build.yml@v3 From 580f19f02581f0142811b206b9be2f8d982a904c Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 3 Oct 2024 16:33:51 -0400 Subject: [PATCH 346/356] Migrate Zip sample from SI-Extensions * Migrate `cafe-scripted` to GraalVM Polyglot * Fix emails for authors * Upgrade some deps --- README.md | 1 + advanced/advanced-testing-examples/pom.xml | 20 +- advanced/dynamic-ftp/pom.xml | 20 +- advanced/dynamic-tcp-client/pom.xml | 227 ++++++++++++++++- applications/cafe-scripted/pom.xml | 36 +-- .../integration/samples/cafe/ScriptTests.java | 2 + applications/cafe/cafe-amqp/pom.xml | 22 +- applications/cafe/cafe-jms/pom.xml | 28 +-- applications/cafe/cafe-si/pom.xml | 20 +- applications/file-split-ftp/pom.xml | 229 ++++++++++++++++- applications/loan-broker/pom.xml | 20 +- applications/loanshark/pom.xml | 48 ++-- applications/stomp-chat/pom.xml | 227 ++++++++++++++++- basic/amqp/pom.xml | 20 +- basic/barrier/pom.xml | 227 ++++++++++++++++- basic/control-bus/pom.xml | 20 +- basic/enricher/pom.xml | 20 +- basic/feed/pom.xml | 20 +- basic/file/pom.xml | 20 +- basic/ftp/pom.xml | 22 +- basic/helloworld/pom.xml | 20 +- basic/http/pom.xml | 32 +-- basic/jdbc/pom.xml | 20 +- basic/jms/pom.xml | 26 +- basic/jmx/pom.xml | 20 +- basic/jpa/pom.xml | 227 ++++++++++++++++- basic/kafka/pom.xml | 231 +++++++++++++++++- basic/mail/pom.xml | 22 +- basic/mongodb/pom.xml | 22 +- basic/mqtt/pom.xml | 227 ++++++++++++++++- basic/oddeven/pom.xml | 20 +- basic/quote/pom.xml | 20 +- basic/sftp/pom.xml | 20 +- basic/tcp-amqp/pom.xml | 20 +- basic/tcp-broadcast/pom.xml | 227 ++++++++++++++++- basic/tcp-client-server/pom.xml | 20 +- basic/tcp-with-headers/pom.xml | 227 ++++++++++++++++- basic/testing-examples/pom.xml | 20 +- basic/twitter/pom.xml | 20 +- basic/web-sockets/pom.xml | 227 ++++++++++++++++- basic/ws-inbound-gateway/pom.xml | 28 +-- basic/ws-outbound-gateway/pom.xml | 20 +- basic/xml/pom.xml | 20 +- basic/xmpp/pom.xml | 20 +- basic/zip/README.md | 58 +++++ basic/zip/pom.xml | 157 ++++++++++++ .../integration/samples/zip/Main.java | 106 ++++++++ .../samples/zip/SpringIntegrationUtils.java | 92 +++++++ .../spring-integration-context.xml | 39 +++ basic/zip/src/main/resources/log4j2.xml | 17 ++ .../SpringIntegrationProjectStartupTest.java | 47 ++++ build.gradle | 40 ++- dsl/cafe-dsl/pom.xml | 229 ++++++++++++++++- dsl/kafka-dsl/pom.xml | 229 ++++++++++++++++- dsl/si4demo/pom.xml | 229 ++++++++++++++++- intermediate/async-gateway/pom.xml | 20 +- intermediate/dynamic-poller/pom.xml | 20 +- intermediate/errorhandling/pom.xml | 20 +- intermediate/file-processing/pom.xml | 20 +- intermediate/mail-attachments/pom.xml | 24 +- intermediate/monitoring/pom.xml | 28 +-- intermediate/multipart-http/pom.xml | 30 +-- intermediate/rest-http/pom.xml | 34 +-- intermediate/retry-and-more/pom.xml | 24 +- .../splitter-aggregator-reaper/pom.xml | 20 +- intermediate/stored-procedures-derby/pom.xml | 20 +- intermediate/stored-procedures-ms/pom.xml | 20 +- intermediate/stored-procedures-oracle/pom.xml | 20 +- .../stored-procedures-postgresql/pom.xml | 24 +- intermediate/tcp-async-bi-directional/pom.xml | 227 ++++++++++++++++- .../tcp-client-server-multiplex/pom.xml | 20 +- intermediate/testcontainers-rabbitmq/pom.xml | 231 +++++++++++++++++- intermediate/travel/pom.xml | 20 +- intermediate/tx-synch/pom.xml | 20 +- settings.gradle | 5 +- 75 files changed, 4354 insertions(+), 741 deletions(-) create mode 100644 basic/zip/README.md create mode 100644 basic/zip/pom.xml create mode 100644 basic/zip/src/main/java/org/springframework/integration/samples/zip/Main.java create mode 100644 basic/zip/src/main/java/org/springframework/integration/samples/zip/SpringIntegrationUtils.java create mode 100644 basic/zip/src/main/resources/META-INF/spring/integration/spring-integration-context.xml create mode 100644 basic/zip/src/main/resources/log4j2.xml create mode 100644 basic/zip/src/test/java/org/springframework/integration/samples/zip/SpringIntegrationProjectStartupTest.java diff --git a/README.md b/README.md index 0a098ae47..37bd396d9 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,7 @@ This is a good place to get started. The samples here are technically motivated * **ws-outbound-gateway** - Shows outbound web services support using the **Web Service Outbound Gateway**, **Content Enricher**, Composed Message Processor (**Chain**) * **xml** - Example demonstrates various aspects of the **Xml** support using an **XPath Splitter**, **XPath Router**, **XSLT Transformer** as well as **XPath Expression** support * **xmpp** - Show the support for [**XMPP**](https://en.wikipedia.org/wiki/Extensible_Messaging_and_Presence_Protocol) (formerly known as Jabber) using e.g. GoogleTalk +* **zip** - Show the support for zip files manipulations ## Intermediate diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 8feeabe7b..b701665ab 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples advanced-testing-examples - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 23775292a..e76737802 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-ftp - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 860b06164..27756189f 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-tcp-client - 6.2.0 + 6.4.0 jar https://github.com/spring-projects/spring-integration-samples @@ -21,7 +21,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -37,7 +37,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -114,38 +114,243 @@ + + org.springframework.integration + spring-integration-file + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-cassandra + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-debezium + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-camel + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.4.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT import pom org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom @@ -165,7 +370,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 0cfd5f56f..b3160ba54 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-scripted - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -75,25 +75,31 @@ org.jruby jruby-complete - 9.4.3.0 + 9.4.7.0 compile - org.python - jython-standalone - 2.7.3 + org.graalvm.sdk + graal-sdk + 24.0.2 + compile + + + org.graalvm.polyglot + python + 24.0.2 compile org.apache.groovy groovy-jsr223 - 4.0.15 + 4.0.23 compile org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -111,7 +117,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -145,28 +151,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java index 7f8cad994..e3551bb79 100644 --- a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java +++ b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java @@ -16,6 +16,7 @@ import java.util.HashMap; import java.util.Map; +import org.junit.Ignore; import org.junit.Test; import org.springframework.core.io.FileSystemResource; @@ -51,6 +52,7 @@ public void testRuby() { } @Test + @Ignore public void testPython() { ScriptExecutor executor = ScriptExecutorFactory.getScriptExecutor("python"); Order order = new Order(0); diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index eab6a2318..032d2ba7b 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-amqp - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -55,7 +55,7 @@ org.springframework.integration.samples cafe-si - 6.2.0 + 6.4.0 compile @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 867ff1c13..d762be7fc 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-jms - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -55,25 +55,25 @@ org.springframework.integration.samples cafe-si - 6.2.0 + 6.4.0 compile org.apache.activemq artemis-server - 2.31.2 + 2.33.0 compile - * org.jboss.logmanager + * org.apache.activemq artemis-jakarta-client - 2.31.2 + 2.33.0 compile @@ -90,7 +90,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -108,7 +108,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -142,28 +142,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 61d666fc5..82aec70e5 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-si - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -117,28 +117,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 7a8941975..0be9cd313 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file-split-ftp - 6.2.0 + 6.4.0 jar https://github.com/spring-projects/spring-integration-samples @@ -21,7 +21,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -37,7 +37,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -81,7 +81,7 @@ org.eclipse.angus jakarta.mail - 2.0.2 + 2.0.3 compile @@ -99,7 +99,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -141,38 +141,243 @@ + + org.springframework.integration + spring-integration-file + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-cassandra + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-debezium + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-camel + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.4.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT import pom org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom @@ -192,7 +397,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 92480aee6..d2cf2e32e 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loan-broker - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index a8e5c2f93..7c677f585 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loanshark - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -80,7 +80,7 @@ org.aspectj aspectjtools - 1.9.20.1 + 1.9.22.1 compile @@ -107,7 +107,7 @@ org.apache.commons commons-dbcp2 - 2.11.0 + 2.12.0 compile @@ -143,7 +143,7 @@ org.hsqldb hsqldb - 2.7.2 + 2.7.3 compile @@ -167,7 +167,7 @@ org.hibernate.orm hibernate-core - 6.3.1.Final + 6.5.2.Final compile @@ -189,12 +189,12 @@ runtime - spring-boot-starter-tomcat * + spring-boot-starter-tomcat - spring-boot-starter-jetty * + spring-boot-starter-jetty @@ -205,28 +205,28 @@ runtime - spring-boot-starter-tomcat * + spring-boot-starter-tomcat - spring-boot-starter-jetty * + spring-boot-starter-jetty org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 runtime - spring-boot-starter-tomcat * + spring-boot-starter-tomcat - spring-boot-starter-jetty * + spring-boot-starter-jetty @@ -237,12 +237,12 @@ runtime - spring-boot-starter-tomcat * + spring-boot-starter-tomcat - spring-boot-starter-jetty * + spring-boot-starter-jetty @@ -253,12 +253,12 @@ runtime - spring-boot-starter-tomcat * + spring-boot-starter-tomcat - spring-boot-starter-jetty * + spring-boot-starter-jetty @@ -277,7 +277,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -311,28 +311,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 5438676e5..ee0a5791d 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stomp-chat - 6.2.0 + 6.4.0 jar https://github.com/spring-projects/spring-integration-samples @@ -21,7 +21,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -37,7 +37,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -88,7 +88,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -124,38 +124,243 @@ + + org.springframework.integration + spring-integration-file + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-cassandra + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-debezium + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-camel + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.4.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT import pom org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom @@ -175,7 +380,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index bcd0996a7..aa160bb2a 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples amqp - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 687627034..4e8b52102 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples barrier - 6.2.0 + 6.4.0 jar https://github.com/spring-projects/spring-integration-samples @@ -21,7 +21,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -37,7 +37,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -93,7 +93,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -134,38 +134,243 @@ + + org.springframework.integration + spring-integration-file + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-cassandra + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-debezium + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-camel + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.4.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT import pom org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom @@ -185,7 +390,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index bfd9cb760..75facdcff 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples control-bus - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 739dd976b..d05d355c9 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples enricher - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 58e434b38..4eeeaa968 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples feed - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 0254a308d..96763a35b 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index d1f274ab0..fa13f1a98 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ftp - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ commons-io commons-io - 2.15.0 + 2.16.1 compile @@ -96,7 +96,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,7 +112,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 test @@ -136,28 +136,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index d5c88a2cc..ad2cc4541 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples helloworld - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 2d312bde7..a5da86a30 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples http - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -76,19 +76,19 @@ commons-io commons-io - 2.15.0 + 2.16.1 compile org.eclipse.angus jakarta.mail - 2.0.2 + 2.0.3 compile org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -98,12 +98,12 @@ runtime - spring-boot-starter-tomcat * + spring-boot-starter-tomcat - spring-boot-starter-jetty * + spring-boot-starter-jetty @@ -114,12 +114,12 @@ runtime - spring-boot-starter-tomcat * + spring-boot-starter-tomcat - spring-boot-starter-jetty * + spring-boot-starter-jetty @@ -138,7 +138,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -172,28 +172,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 57c979993..bc5e2a080 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jdbc - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 13b1372fc..6d9943613 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jms - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -71,25 +71,25 @@ org.apache.activemq artemis-server - 2.31.2 + 2.33.0 compile - * org.jboss.logmanager + * org.apache.activemq artemis-jakarta-client - 2.31.2 + 2.33.0 compile org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -107,7 +107,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -141,28 +141,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 588a5ee1e..255220f60 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jmx - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -117,28 +117,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 278f23d0f..dcccf5d8c 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jpa - 6.2.0 + 6.4.0 jar https://github.com/spring-projects/spring-integration-samples @@ -21,7 +21,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -37,7 +37,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -131,38 +131,243 @@ + + org.springframework.integration + spring-integration-file + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-cassandra + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-debezium + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-camel + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.4.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT import pom org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom @@ -182,7 +387,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 505476c23..32afcfc14 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples kafka - 6.2.0 + 6.4.0 jar https://github.com/spring-projects/spring-integration-samples @@ -21,7 +21,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -37,7 +37,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -64,8 +64,8 @@ compile - * org.slf4j + * @@ -77,7 +77,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -131,38 +131,243 @@ + + org.springframework.integration + spring-integration-file + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-cassandra + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-debezium + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-camel + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.4.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT import pom org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom @@ -182,7 +387,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 146613e66..51254f897 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -65,13 +65,13 @@ org.eclipse.angus jakarta.mail - 2.0.2 + 2.0.3 compile org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 2343d7b6f..105153e32 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mongodb - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,13 +60,13 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile org.mongodb mongodb-driver-sync - 4.11.1 + 5.1.1 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 5d47d3112..5b5fbeec6 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mqtt - 6.2.0 + 6.4.0 jar https://github.com/spring-projects/spring-integration-samples @@ -21,7 +21,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -37,7 +37,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -119,38 +119,243 @@ + + org.springframework.integration + spring-integration-file + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-cassandra + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-debezium + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-camel + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.4.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT import pom org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom @@ -170,7 +375,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 8f97a688f..390e3b651 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples oddeven - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index e2dbd894d..46af81bec 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples quote - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 89ba184ef..f224e6876 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples sftp - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index ac5922560..9cddb5a65 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-amqp - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 runtime @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -129,28 +129,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index df1f5abf3..c435945a0 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-broadcast - 6.2.0 + 6.4.0 jar https://github.com/spring-projects/spring-integration-samples @@ -21,7 +21,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -37,7 +37,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -119,38 +119,243 @@ + + org.springframework.integration + spring-integration-file + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-cassandra + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-debezium + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-camel + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.4.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT import pom org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom @@ -170,7 +375,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 4d3188057..bf2d6f607 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 38d666f4c..b350abb08 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-with-headers - 6.2.0 + 6.4.0 jar https://github.com/spring-projects/spring-integration-samples @@ -21,7 +21,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -37,7 +37,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -119,38 +119,243 @@ + + org.springframework.integration + spring-integration-file + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-cassandra + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-debezium + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-camel + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.4.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT import pom org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom @@ -170,7 +375,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 0e18fc37c..716da2c6b 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testing-examples - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -93,7 +93,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -127,28 +127,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 26ecaa91d..b7eaa469d 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples twitter - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -61,7 +61,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -113,28 +113,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 8b6db7e91..d6044ebe9 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples web-sockets - 6.2.0 + 6.4.0 jar https://github.com/spring-projects/spring-integration-samples @@ -21,7 +21,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -37,7 +37,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -114,38 +114,243 @@ + + org.springframework.integration + spring-integration-file + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-cassandra + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-debezium + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-camel + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.4.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT import pom org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom @@ -165,7 +370,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 5fc3af1c3..6d2ea05bf 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-inbound-gateway - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -70,7 +70,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -80,12 +80,12 @@ runtime - spring-boot-starter-tomcat * + spring-boot-starter-tomcat - spring-boot-starter-jetty * + spring-boot-starter-jetty @@ -96,12 +96,12 @@ runtime - spring-boot-starter-tomcat * + spring-boot-starter-tomcat - spring-boot-starter-jetty * + spring-boot-starter-jetty @@ -120,7 +120,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -154,28 +154,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index be4d49a9c..713cf7dbf 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-outbound-gateway - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -117,28 +117,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 5b737a030..6dfc46e52 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xml - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 914f01bac..0779cdfa9 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xmpp - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/basic/zip/README.md b/basic/zip/README.md new file mode 100644 index 000000000..63371e431 --- /dev/null +++ b/basic/zip/README.md @@ -0,0 +1,58 @@ +Spring Integration Zip Sample +=================== + +This sample illustrates the usage of the Spring Integration Zip Extension. It uses the following components: + +* zip-transformer +* unzip-transformer + +You can run the application by either + +* running the "Main" class from the IDE +* or from the command line using Maven in this sub-project: + - mvn package + - mvn exec:java +* or from the command line using Gradle from the root project: + - gradlew :zip:run + +You should see a screen as the following: + +``` +========================================================= + + Welcome to the Spring Integration Zip Sample + + For more information please visit: + https://www.springsource.org/spring-integration + +========================================================= +17:08:41.883 INFO [org.springframework.integration.samples.zip.Main.main()][org.springframework.integration.samples.zip.SpringIntegrationUtils] +========================================================= + + Intput directory is: '/dev/spring-integration-extensions/samples/zip/input-zip' + Intput directory is: '/dev/spring-integration-extensions/samples/zip/input-uncompressed' + Output directory is: 'target/output/decompressedFilesOut' + Output directory is: 'target/output/zipFilesOut' + +========================================================= +17:08:41.887 INFO [org.springframework.integration.samples.zip.Main.main()][org.springframework.integration.samples.zip.Main] +========================================================= + + Please press 'q + Enter' to quit the application. + +========================================================= +``` +## Compressing Files + +Drop an uncompressed file into the **input-uncompressed** directory. The file will be compressed and stored under **target/output/zipFilesOut**. + +## Uncompressing Files + +Drop a compressed file into the **input-zip** directory. The file will be decompressed and stored under **target/output/decompressedFilesOut**. + +-------------------------------------------------------------------------------- + +For help please take a look at the Spring Integration documentation: + +https://www.spring.io/spring-integration + diff --git a/basic/zip/pom.xml b/basic/zip/pom.xml new file mode 100644 index 000000000..c67019e7d --- /dev/null +++ b/basic/zip/pom.xml @@ -0,0 +1,157 @@ + + + 4.0.0 + org.springframework.integration.samples + zip + 6.4.0 + https://github.com/spring-projects/spring-integration-samples + + Spring IO + https://spring.io/projects/spring-integration + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + artembilan + Artem Bilan + artem.bilan@broadcom.com + + project lead + + + + garyrussell + Gary Russell + github@gprussell.net + + project lead emeritus + + + + markfisher + Mark Fisher + mark.ryan.fisher@gmail.com + + project founder and lead emeritus + + + + + scm:git:scm:git:git://github.com/spring-projects/spring-integration-samples.git + scm:git:scm:git:ssh://git@github.com:spring-projects/spring-integration-samples.git + https://github.com/spring-projects/spring-integration-samples + + + GitHub + https://github.com/spring-projects/spring-integration-samples/issues + + + + org.springframework.integration + spring-integration-zip + compile + + + org.apache.logging.log4j + log4j-slf4j2-impl + 2.23.1 + compile + + + junit + junit + 4.13.2 + test + + + org.hamcrest + hamcrest-library + 2.2 + test + + + org.mockito + mockito-core + 5.12.0 + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.integration + spring-integration-test + test + + + org.junit.jupiter + junit-jupiter-engine + runtime + + + org.junit.platform + junit-platform-launcher + runtime + + + org.junit.vintage + junit-vintage-engine + runtime + + + + + + org.junit + junit-bom + 5.11.1 + import + pom + + + com.fasterxml.jackson + jackson-bom + 2.18.0 + import + pom + + + org.springframework + spring-framework-bom + 6.2.0-SNAPSHOT + import + pom + + + org.springframework.integration + spring-integration-bom + 6.4.0-SNAPSHOT + import + pom + + + + + 17 + + + + repo.spring.io.milestone + Spring Framework Maven Milestone Repository + https://repo.spring.io/milestone + + + repo.spring.io.snapshot + Spring Framework Maven Snapshot Repository + https://repo.spring.io/snapshot + + + diff --git a/basic/zip/src/main/java/org/springframework/integration/samples/zip/Main.java b/basic/zip/src/main/java/org/springframework/integration/samples/zip/Main.java new file mode 100644 index 000000000..67860ea24 --- /dev/null +++ b/basic/zip/src/main/java/org/springframework/integration/samples/zip/Main.java @@ -0,0 +1,106 @@ +/* + * Copyright 2015-2020 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.zip; + +import java.util.Scanner; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.springframework.context.support.AbstractApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + + +/** + * Starts the Spring Context and will initialize the Spring Integration routes. + * + * @author Gunnar Hillert + * @author Gary Russell + * @author Artem Bilan + * + * @since 6.4 + * + */ +public final class Main { + + private static final Log LOGGER = LogFactory.getLog(Main.class); + + private Main() { + } + + /** + * Load the Spring Integration Application Context + * + * @param args - command line arguments + */ + public static void main(final String... args) { + + if (LOGGER.isInfoEnabled()) { + LOGGER.info(""" + + =========================================================\ + + \ + + Welcome to the Spring Integration Zip Sample \ + + \ + + For more information please visit: \ + + https://www.springsource.org/spring-integration \ + + \ + + ========================================================="""); + } + + final AbstractApplicationContext context = + new ClassPathXmlApplicationContext("classpath:META-INF/spring/integration/*-context.xml"); + + context.registerShutdownHook(); + + SpringIntegrationUtils.displayDirectories(context); + + final Scanner scanner = new Scanner(System.in); + + if (LOGGER.isInfoEnabled()) { + LOGGER.info(""" + + =========================================================\ + + \ + + Please press 'q + Enter' to quit the application. \ + + \ + + ========================================================="""); + } + + while (true) { + if (scanner.hasNext("q")) { + if (LOGGER.isInfoEnabled()) { + LOGGER.info("Exiting application...bye."); + } + scanner.close(); + System.exit(0); + } + } + } + +} diff --git a/basic/zip/src/main/java/org/springframework/integration/samples/zip/SpringIntegrationUtils.java b/basic/zip/src/main/java/org/springframework/integration/samples/zip/SpringIntegrationUtils.java new file mode 100644 index 000000000..1697f6f5b --- /dev/null +++ b/basic/zip/src/main/java/org/springframework/integration/samples/zip/SpringIntegrationUtils.java @@ -0,0 +1,92 @@ +/* + * Copyright 2015 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.zip; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.beans.DirectFieldAccessor; +import org.springframework.context.ApplicationContext; +import org.springframework.expression.Expression; +import org.springframework.integration.file.FileReadingMessageSource; +import org.springframework.integration.file.FileWritingMessageHandler; + +/** + * Displays the names of the input and output directories. + * + * @author Gunnar Hillert + * + * @since 6.4 + * + */ +public final class SpringIntegrationUtils { + + private static final Log logger = LogFactory.getLog(SpringIntegrationUtils.class); + + private SpringIntegrationUtils() { } + + /** + * Helper Method to dynamically determine and display input and output + * directories as defined in the Spring Integration context. + * + * @param context Spring Application Context + */ + public static void displayDirectories(final ApplicationContext context) { + + Map fileReadingMessageSources = context.getBeansOfType(FileReadingMessageSource.class); + + List inputDirectories = new ArrayList<>(); + + for (FileReadingMessageSource source : fileReadingMessageSources.values()) { + final File inDir = (File) new DirectFieldAccessor(source).getPropertyValue("directory"); + inputDirectories.add(inDir.getAbsolutePath()); + } + + + Map fileWritingMessageHandlers = context.getBeansOfType(FileWritingMessageHandler.class); + + List outputDirectories = new ArrayList<>(); + + for (final FileWritingMessageHandler messageHandler : fileWritingMessageHandlers.values()) { + final Expression outDir = (Expression) new DirectFieldAccessor(messageHandler).getPropertyValue("destinationDirectoryExpression"); + outputDirectories.add(outDir.getExpressionString()); + } + + final StringBuilder stringBuilder = new StringBuilder(); + + stringBuilder.append("\n========================================================="); + stringBuilder.append("\n"); + + for (final String inputDirectory : inputDirectories) { + stringBuilder.append("\n Input directory is: '" + inputDirectory + "'"); + } + + for (final String outputDirectory : outputDirectories) { + stringBuilder.append("\n Output directory is: '" + outputDirectory + "'"); + } + + stringBuilder.append("\n\n========================================================="); + + logger.info(stringBuilder.toString()); + + } + +} diff --git a/basic/zip/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/basic/zip/src/main/resources/META-INF/spring/integration/spring-integration-context.xml new file mode 100644 index 000000000..4cfdb240d --- /dev/null +++ b/basic/zip/src/main/resources/META-INF/spring/integration/spring-integration-context.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/basic/zip/src/main/resources/log4j2.xml b/basic/zip/src/main/resources/log4j2.xml new file mode 100644 index 000000000..56dd0da21 --- /dev/null +++ b/basic/zip/src/main/resources/log4j2.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/basic/zip/src/test/java/org/springframework/integration/samples/zip/SpringIntegrationProjectStartupTest.java b/basic/zip/src/test/java/org/springframework/integration/samples/zip/SpringIntegrationProjectStartupTest.java new file mode 100644 index 000000000..d986044a5 --- /dev/null +++ b/basic/zip/src/test/java/org/springframework/integration/samples/zip/SpringIntegrationProjectStartupTest.java @@ -0,0 +1,47 @@ +/* + * Copyright 2015 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.zip; + +import org.junit.jupiter.api.Test; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +import org.springframework.integration.samples.zip.SpringIntegrationUtils; + +/** + * Verify that the Spring Integration Application Context starts successfully. + * + * @author Gunnar Hillert + * @author Artem Bilan + * + * @since 6.4 + */ +public class SpringIntegrationProjectStartupTest { + + @Test + public void testStartupOfSpringIntegrationContext() throws Exception{ + try(ConfigurableApplicationContext context + = new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", + SpringIntegrationProjectStartupTest.class)) { + SpringIntegrationUtils.displayDirectories(context); + Thread.sleep(2000); + } + } + +} diff --git a/build.gradle b/build.gradle index b0668a74d..f551b556b 100644 --- a/build.gradle +++ b/build.gradle @@ -30,6 +30,7 @@ allprojects { group = 'org.springframework.integration.samples' repositories { + mavenLocal() mavenCentral() maven { url 'https://repo.spring.io/milestone' } maven { url 'https://repo.spring.io/snapshot' } @@ -52,7 +53,6 @@ subprojects { subproject -> if (!(subproject.name in ['advanced', 'applications', 'basic', 'intermediate', 'dsl', 'cafe'])) { apply plugin: 'java-library' - apply plugin: 'jacoco' apply plugin: 'io.spring.dependency-management' apply plugin: 'maven-publish' @@ -97,19 +97,19 @@ subprojects { subproject -> developer { id = 'artembilan' name = 'Artem Bilan' - email = 'abilan@vmware.com' + email = 'artem.bilan@broadcom.com' roles = ['project lead'] } developer { id = 'garyrussell' name = 'Gary Russell' - email = 'grussell@vmware.com' + email = 'github@gprussell.net' roles = ['project lead emeritus'] } developer { id = 'markfisher' name = 'Mark Fisher' - email = 'markfisher@vmware.com' + email = 'mark.ryan.fisher@gmail.com' roles = ['project founder and lead emeritus'] } } @@ -200,10 +200,6 @@ subprojects { subproject -> } } - jacoco { - toolVersion = '0.8.8' - } - compileJava { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 @@ -231,10 +227,11 @@ subprojects { subproject -> hibernateValidatorVersion = '8.0.0.Final' ftpServerVersion = '1.2.0' flexjsonVersion = '2.0' - groovyVersion = '4.0.21' + graalvmVersion = '24.0.2' + groovyVersion = '4.0.23' hsqldbVersion = '2.7.3' h2Version = '2.2.224' - jacksonVersion = '2.17.1' + jacksonVersion = '2.18.0' jaxbVersion = '4.0.5' jodaTimeVersion = '1.6' jtaVersion = '2.0.0' @@ -244,8 +241,7 @@ subprojects { subproject -> jpaApiVersion = '3.1.0' jstlVersion = '1.2' junitVersion = '4.13.2' - junitJupiterVersion = '5.10.2' - jythonVersion = '2.7.3' + junitJupiterVersion = '5.11.1' log4jVersion = '2.23.1' mailVersion = '2.0.3' mockitoVersion = '5.12.0' @@ -382,7 +378,8 @@ project('cafe-scripted') { api 'org.springframework.integration:spring-integration-jmx' api 'org.springframework.integration:spring-integration-rsocket' api "org.jruby:jruby-complete:$jrubyVersion" - api "org.python:jython-standalone:$jythonVersion" + api "org.graalvm.sdk:graal-sdk:$graalvmVersion" + api "org.graalvm.polyglot:python:$graalvmVersion" api "org.apache.groovy:groovy-jsr223:$groovyVersion" api "org.apache.logging.log4j:log4j-core:$log4jVersion" } @@ -1532,3 +1529,20 @@ project('tcp-with-headers') { standardInput = System.in } } + +project('zip') { + description = 'Zip Channel Adapters Sample' + + apply plugin: 'application' + + mainClassName = 'org.springframework.integration.samples.zip.Main' + + dependencies { + api 'org.springframework.integration:spring-integration-zip' + api "org.apache.logging.log4j:log4j-slf4j2-impl:$log4jVersion" + } + + tasks.withType(JavaExec) { + standardInput = System.in + } +} diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 38fc78395..491239cf1 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-dsl - 6.2.0 + 6.4.0 jar https://github.com/spring-projects/spring-integration-samples @@ -21,7 +21,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -37,7 +37,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -56,7 +56,7 @@ org.springframework.integration.samples cafe-si - 6.2.0 + 6.4.0 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -125,38 +125,243 @@ + + org.springframework.integration + spring-integration-file + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-cassandra + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-debezium + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-camel + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.4.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT import pom org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom @@ -176,7 +381,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 2bc4ddbc2..0b5958242 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples kafka-dsl - 6.2.0 + 6.4.0 jar https://github.com/spring-projects/spring-integration-samples @@ -21,7 +21,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -37,7 +37,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -125,38 +125,243 @@ + + org.springframework.integration + spring-integration-file + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-cassandra + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-debezium + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-camel + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.4.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT import pom org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom @@ -176,7 +381,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 9155bf7e4..17a7c46c4 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples si4demo - 6.2.0 + 6.4.0 jar https://github.com/spring-projects/spring-integration-samples @@ -21,7 +21,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -37,7 +37,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -87,7 +87,7 @@ org.eclipse.angus jakarta.mail - 2.0.2 + 2.0.3 compile @@ -111,7 +111,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -147,38 +147,243 @@ + + org.springframework.integration + spring-integration-file + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-cassandra + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-debezium + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-camel + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.4.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT import pom org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom @@ -198,7 +403,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index dbe1faae2..7560e2bb9 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples async-gateway - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index e47fcf66b..c27ceb831 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-poller - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 1da075777..0cc119a33 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples errorhandling - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index d5ba2bb79..e831fdcab 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file-processing - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index cf28807a7..cf677e862 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail-attachments - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -65,19 +65,19 @@ org.eclipse.angus jakarta.mail - 2.0.2 + 2.0.3 compile commons-io commons-io - 2.15.0 + 2.16.1 compile org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -129,28 +129,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index c4e002f58..4e4ebd1ef 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples monitoring - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -82,7 +82,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -92,12 +92,12 @@ runtime - spring-boot-starter-tomcat * + spring-boot-starter-tomcat - spring-boot-starter-jetty * + spring-boot-starter-jetty @@ -108,12 +108,12 @@ runtime - spring-boot-starter-tomcat * + spring-boot-starter-tomcat - spring-boot-starter-jetty * + spring-boot-starter-jetty @@ -132,7 +132,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -166,28 +166,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 46c1f41a4..8732915ff 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples multipart-http - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -76,13 +76,13 @@ commons-io commons-io - 2.15.0 + 2.16.1 compile org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -92,12 +92,12 @@ runtime - spring-boot-starter-tomcat * + spring-boot-starter-tomcat - spring-boot-starter-jetty * + spring-boot-starter-jetty @@ -108,12 +108,12 @@ runtime - spring-boot-starter-tomcat * + spring-boot-starter-tomcat - spring-boot-starter-jetty * + spring-boot-starter-jetty @@ -132,7 +132,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -166,28 +166,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index e9122381a..d4b7a8e88 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples rest-http - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -95,25 +95,25 @@ org.springframework.security spring-security-web - 6.2.0 + 6.4.0-SNAPSHOT compile org.springframework.security spring-security-config - 6.2.0 + 6.4.0-SNAPSHOT compile org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile com.sun.xml.bind jaxb-impl - 4.0.4 + 4.0.5 compile @@ -123,12 +123,12 @@ runtime - spring-boot-starter-tomcat * + spring-boot-starter-tomcat - spring-boot-starter-jetty * + spring-boot-starter-jetty @@ -139,12 +139,12 @@ runtime - spring-boot-starter-tomcat * + spring-boot-starter-tomcat - spring-boot-starter-jetty * + spring-boot-starter-jetty @@ -163,7 +163,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -197,28 +197,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index c3e8f1eb0..7af6fcc1e 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples retry-and-more - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -75,12 +75,12 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 compile - * org.hamcrest + * @@ -93,7 +93,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -111,7 +111,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -145,28 +145,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index e303021cb..552d17f64 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 11d4fcfd2..27ea161d0 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-derby - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -72,7 +72,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -90,7 +90,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -124,28 +124,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index fd34f5b11..65f7a7d1a 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-ms - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -72,7 +72,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -90,7 +90,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -124,28 +124,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index e4063e280..461a239a1 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-oracle - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -118,28 +118,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 845df54f2..a1a780503 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-postgresql - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,13 +60,13 @@ org.postgresql postgresql - 42.7.2 + 42.7.3 compile org.apache.commons commons-dbcp2 - 2.11.0 + 2.12.0 compile @@ -78,7 +78,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -96,7 +96,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -130,28 +130,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 7642f8254..8c6881fb0 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-async-bi-directional - 6.2.0 + 6.4.0 jar https://github.com/spring-projects/spring-integration-samples @@ -21,7 +21,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -37,7 +37,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -114,38 +114,243 @@ + + org.springframework.integration + spring-integration-file + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jdbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-cassandra + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-debezium + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-camel + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.4.0-SNAPSHOT + org.springframework.boot spring-boot-dependencies - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT import pom org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom @@ -165,7 +370,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index a38f40200..a24c13f65 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -112,28 +112,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index f0e061ded..2f14a0bc5 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testcontainers-rabbitmq - 6.2.0 + 6.4.0 jar https://github.com/spring-projects/spring-integration-samples @@ -21,7 +21,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -29,7 +29,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -37,7 +37,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -114,7 +114,7 @@ org.testcontainers junit-jupiter - 1.19.2 + 1.19.8 test @@ -141,45 +141,250 @@ + + org.springframework.integration + spring-integration-jdbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ws + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-redis + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-r2dbc + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-rsocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-event + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-cassandra + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-scripting + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-websocket + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-graphql + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jpa + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-http + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zookeeper + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mail + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-camel + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mongodb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stream + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-stomp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-file + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-syslog + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-smb + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jmx + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-webflux + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-sftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-mqtt + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-ftp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-kafka + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-groovy + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xmpp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-feed + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-debezium + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zeromq + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-hazelcast + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-test-support + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-amqp + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-xml + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-core + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-zip + 6.4.0-SNAPSHOT + + + org.springframework.integration + spring-integration-jms + 6.4.0-SNAPSHOT + org.springframework.cloud spring-cloud-dependencies - 2022.0.4 + 2023.0.2 import pom org.springframework.boot spring-boot-dependencies - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT import pom org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom @@ -199,7 +404,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.0-SNAPSHOT + 3.4.0-SNAPSHOT diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 8e986bee4..9c481f7ff 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples travel - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -70,7 +70,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -88,7 +88,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -122,28 +122,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index b55ba3edd..6fd431da0 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tx-synch - 6.2.0 + 6.4.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -20,7 +20,7 @@ artembilan Artem Bilan - abilan@vmware.com + artem.bilan@broadcom.com project lead @@ -28,7 +28,7 @@ garyrussell Gary Russell - grussell@vmware.com + github@gprussell.net project lead emeritus @@ -36,7 +36,7 @@ markfisher Mark Fisher - markfisher@vmware.com + mark.ryan.fisher@gmail.com project founder and lead emeritus @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.21.1 + 2.23.1 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.7.0 + 5.12.0 test @@ -123,28 +123,28 @@ org.junit junit-bom - 5.10.1 + 5.11.1 import pom com.fasterxml.jackson jackson-bom - 2.15.3 + 2.18.0 import pom org.springframework spring-framework-bom - 6.1.0 + 6.2.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.2.0 + 6.4.0-SNAPSHOT import pom diff --git a/settings.gradle b/settings.gradle index 860c79c22..ba19732ab 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,13 +1,12 @@ pluginManagement { repositories { gradlePluginPortal() - maven { url 'https://repo.spring.io/release' } + mavenCentral() } } plugins { - id 'com.gradle.enterprise' version '3.16.2' - id 'io.spring.ge.conventions' version '0.0.15' + id 'io.spring.develocity.conventions' version '0.0.21' } rootProject.name = 'spring-integration-samples' From ce670e1798b061579ea343b715dc51a5889b3f5c Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Fri, 4 Oct 2024 16:11:05 -0400 Subject: [PATCH 347/356] Make Python script compatible with GraalPy expectations --- .../cafe-scripted/scripts/python/barista.py | 6 ++++-- .../integration/samples/cafe/ScriptTests.java | 20 +++++++------------ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/applications/cafe-scripted/scripts/python/barista.py b/applications/cafe-scripted/scripts/python/barista.py index fef0b2f3c..63c6e5d5c 100644 --- a/applications/cafe-scripted/scripts/python/barista.py +++ b/applications/cafe-scripted/scripts/python/barista.py @@ -1,8 +1,10 @@ -from org.springframework.integration.samples.cafe import Drink import time +import java + +Drink = java.type("org.springframework.integration.samples.cafe.Drink") def prepareDrink(orderItem): - print("python: preparing %s for order %s" % (orderItem,orderItem.order.number)) + print("python: preparing %s for order %s" % (orderItem,orderItem.getOrder().getNumber())) time.sleep(eval(timeToPrepare)) return Drink(orderItem.getOrder().getNumber(), orderItem.getDrinkType(), orderItem.isIced(), orderItem.getShots()) diff --git a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java index e3551bb79..6498e522b 100644 --- a/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java +++ b/applications/cafe-scripted/src/test/java/org/springframework/integration/samples/cafe/ScriptTests.java @@ -16,21 +16,17 @@ import java.util.HashMap; import java.util.Map; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.core.io.FileSystemResource; import org.springframework.integration.scripting.ScriptExecutor; import org.springframework.integration.scripting.jsr223.ScriptExecutorFactory; import org.springframework.scripting.support.ResourceScriptSource; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - /** * @author David Turanski * @author Artem Bilan - * */ public class ScriptTests { @@ -46,13 +42,11 @@ public void testRuby() { Object obj = executor.executeScript( new ResourceScriptSource(new FileSystemResource("scripts/ruby/barista.rb")), variables); - assertNotNull(obj); - assertTrue(obj instanceof Drink); - + Assertions.assertNotNull(obj); + Assertions.assertInstanceOf(Drink.class, obj); } @Test - @Ignore public void testPython() { ScriptExecutor executor = ScriptExecutorFactory.getScriptExecutor("python"); Order order = new Order(0); @@ -63,8 +57,8 @@ public void testPython() { Object obj = executor.executeScript(new ResourceScriptSource( new FileSystemResource("scripts/python/barista.py")), variables); - assertNotNull(obj); - assertTrue(obj instanceof Drink); - + Assertions.assertNotNull(obj); + Assertions.assertInstanceOf(Drink.class, obj); } + } From d5a790d4a29dd9b50fadc1b96fbfa8e37e556862 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 15 Jan 2025 11:34:55 -0500 Subject: [PATCH 348/356] Migrate to DCO from CLA --- .github/dco.yml | 2 ++ README.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .github/dco.yml diff --git a/.github/dco.yml b/.github/dco.yml new file mode 100644 index 000000000..0c4b142e9 --- /dev/null +++ b/.github/dco.yml @@ -0,0 +1,2 @@ +require: + members: false diff --git a/README.md b/README.md index 37bd396d9..ad055b217 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Below is a short description of each category. ## DSL -This directory holds demos/samples for Spring Integration 4.0 Java Configuration as well as the Java DSL Extension. +This directory holds demos/samples for Spring Integration Java Configuration as well as the Java DSL Extension. ## Basic From 916a436be383d10b51a1f2cddd9a3a1b4d3df12f Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 15 Jan 2025 11:57:20 -0500 Subject: [PATCH 349/356] Start version `6.5` --- build.gradle | 10 ++++++---- gradle.properties | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index f551b556b..268a83eaf 100644 --- a/build.gradle +++ b/build.gradle @@ -250,13 +250,13 @@ subprojects { subproject -> oracleDriverVersion = '23.3.0.23.09' postgresVersion = '42.7.3' slf4jVersion = '1.7.30' - springCloudVersion = '2023.0.2' - springIntegrationVersion = '6.4.0-SNAPSHOT' + springCloudVersion = '2024.0.0' + springIntegrationVersion = '6.5.0-SNAPSHOT' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.2.0-SNAPSHOT' - springSecurityVersion = '6.4.0-SNAPSHOT' + springVersion = '6.2.1' + springSecurityVersion = '6.5.0-SNAPSHOT' springWebFlowVersion = '3.0.0' testcontainersVersion = '1.19.8' tilesJspVersion = '2.2.1' @@ -671,6 +671,8 @@ project('mqtt') { api 'org.springframework.boot:spring-boot-starter-integration' api 'org.springframework.integration:spring-integration-stream' api 'org.springframework.integration:spring-integration-mqtt' + api 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5' + testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation "org.springframework.integration:spring-integration-test" } diff --git a/gradle.properties b/gradle.properties index eb8417e01..0c120f667 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -version=6.4.0 -springBootVersion=3.4.0-SNAPSHOT +version=6.5.0 +springBootVersion=3.5.0-SNAPSHOT org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8 org.gradle.caching=true org.gradle.parallel=true From 99055a664476da54dfa509ce1baf770e9bd732d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Apr 2025 14:09:28 -0400 Subject: [PATCH 350/356] Bump org.apache.activemq:artemis-server in /applications/cafe/cafe-jms (#362) Bumps org.apache.activemq:artemis-server from 2.33.0 to 2.40.0. --- updated-dependencies: - dependency-name: org.apache.activemq:artemis-server dependency-version: 2.40.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- applications/cafe/cafe-jms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index d762be7fc..f4a87c048 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -61,7 +61,7 @@ org.apache.activemq artemis-server - 2.33.0 + 2.40.0 compile From 405053f270a1e68576aa265f408ab48807ce123c Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 10 Jul 2025 10:10:17 -0400 Subject: [PATCH 351/356] Upgrade to Gradle `8.14.3` * Upgrade to `commons-fileupload2:1.6.0` * Upgrade to JMS Artemis `2.41.0` * Regenerate POMs for samples --- advanced/advanced-testing-examples/pom.xml | 6 +- advanced/dynamic-ftp/pom.xml | 6 +- advanced/dynamic-tcp-client/pom.xml | 215 +---------------- applications/cafe-scripted/pom.xml | 6 +- applications/cafe/cafe-amqp/pom.xml | 8 +- applications/cafe/cafe-jms/pom.xml | 12 +- applications/cafe/cafe-si/pom.xml | 6 +- applications/file-split-ftp/pom.xml | 215 +---------------- applications/loan-broker/pom.xml | 6 +- applications/loanshark/pom.xml | 8 +- applications/stomp-chat/pom.xml | 215 +---------------- basic/amqp/pom.xml | 6 +- basic/barrier/pom.xml | 215 +---------------- basic/control-bus/pom.xml | 6 +- basic/enricher/pom.xml | 6 +- basic/feed/pom.xml | 6 +- basic/file/pom.xml | 6 +- basic/ftp/pom.xml | 6 +- basic/helloworld/pom.xml | 6 +- basic/http/pom.xml | 8 +- basic/jdbc/pom.xml | 6 +- basic/jms/pom.xml | 10 +- basic/jmx/pom.xml | 6 +- basic/jpa/pom.xml | 215 +---------------- basic/kafka/pom.xml | 215 +---------------- basic/mail/pom.xml | 6 +- basic/mongodb/pom.xml | 6 +- basic/mqtt/pom.xml | 221 +----------------- basic/oddeven/pom.xml | 6 +- basic/quote/pom.xml | 6 +- basic/sftp/pom.xml | 6 +- basic/tcp-amqp/pom.xml | 6 +- basic/tcp-broadcast/pom.xml | 215 +---------------- basic/tcp-client-server/pom.xml | 6 +- basic/tcp-with-headers/pom.xml | 215 +---------------- basic/testing-examples/pom.xml | 6 +- basic/twitter/pom.xml | 6 +- basic/web-sockets/pom.xml | 215 +---------------- basic/ws-inbound-gateway/pom.xml | 6 +- basic/ws-outbound-gateway/pom.xml | 6 +- basic/xml/pom.xml | 6 +- basic/xmpp/pom.xml | 6 +- basic/zip/pom.xml | 6 +- build.gradle | 6 +- dsl/cafe-dsl/pom.xml | 217 +---------------- dsl/kafka-dsl/pom.xml | 215 +---------------- dsl/si4demo/pom.xml | 215 +---------------- gradle/wrapper/gradle-wrapper.jar | Bin 43504 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 9 +- gradlew.bat | 4 +- intermediate/async-gateway/pom.xml | 6 +- intermediate/dynamic-poller/pom.xml | 6 +- intermediate/errorhandling/pom.xml | 6 +- intermediate/file-processing/pom.xml | 6 +- intermediate/mail-attachments/pom.xml | 6 +- intermediate/monitoring/pom.xml | 6 +- intermediate/multipart-http/pom.xml | 8 +- intermediate/rest-http/pom.xml | 10 +- intermediate/retry-and-more/pom.xml | 6 +- .../splitter-aggregator-reaper/pom.xml | 6 +- intermediate/stored-procedures-derby/pom.xml | 6 +- intermediate/stored-procedures-ms/pom.xml | 6 +- intermediate/stored-procedures-oracle/pom.xml | 6 +- .../stored-procedures-postgresql/pom.xml | 6 +- intermediate/tcp-async-bi-directional/pom.xml | 215 +---------------- .../tcp-client-server-multiplex/pom.xml | 6 +- intermediate/testcontainers-rabbitmq/pom.xml | 217 +---------------- intermediate/travel/pom.xml | 6 +- intermediate/tx-synch/pom.xml | 6 +- 70 files changed, 255 insertions(+), 3325 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index b701665ab..dddf8fed6 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples advanced-testing-examples - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index e76737802..fbd65851d 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-ftp - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 27756189f..df29d304e 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-tcp-client - 6.4.0 + 6.5.0 jar https://github.com/spring-projects/spring-integration-samples @@ -114,215 +114,10 @@ - - org.springframework.integration - spring-integration-file - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-camel - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.4.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT import pom @@ -343,14 +138,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom @@ -370,7 +165,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index b3160ba54..349f6a808 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-scripted - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -165,14 +165,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 032d2ba7b..c3fd3fe56 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-amqp - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -55,7 +55,7 @@ org.springframework.integration.samples cafe-si - 6.4.0 + 6.5.0 compile @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index f4a87c048..0f1da9ee3 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-jms - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -55,13 +55,13 @@ org.springframework.integration.samples cafe-si - 6.4.0 + 6.5.0 compile org.apache.activemq artemis-server - 2.40.0 + 2.41.0 compile @@ -73,7 +73,7 @@ org.apache.activemq artemis-jakarta-client - 2.33.0 + 2.41.0 compile @@ -156,14 +156,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 82aec70e5..bf69f6b46 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-si - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 0be9cd313..b0e18cf4e 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file-split-ftp - 6.4.0 + 6.5.0 jar https://github.com/spring-projects/spring-integration-samples @@ -141,215 +141,10 @@ - - org.springframework.integration - spring-integration-file - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-camel - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.4.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT import pom @@ -370,14 +165,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom @@ -397,7 +192,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index d2cf2e32e..9e6fb1868 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loan-broker - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 7c677f585..49191265d 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loanshark - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -101,7 +101,7 @@ commons-fileupload commons-fileupload - 1.5 + 1.6.0 compile @@ -325,14 +325,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index ee0a5791d..216745ec5 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stomp-chat - 6.4.0 + 6.5.0 jar https://github.com/spring-projects/spring-integration-samples @@ -124,215 +124,10 @@ - - org.springframework.integration - spring-integration-file - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-camel - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.4.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT import pom @@ -353,14 +148,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom @@ -380,7 +175,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index aa160bb2a..3f2413395 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples amqp - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 4e8b52102..d572b2e49 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples barrier - 6.4.0 + 6.5.0 jar https://github.com/spring-projects/spring-integration-samples @@ -134,215 +134,10 @@ - - org.springframework.integration - spring-integration-file - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-camel - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.4.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT import pom @@ -363,14 +158,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom @@ -390,7 +185,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 75facdcff..0c3faeb98 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples control-bus - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index d05d355c9..570f84503 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples enricher - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 4eeeaa968..c12d4ea10 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples feed - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 96763a35b..9be3b8dbb 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index fa13f1a98..49eb01c75 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ftp - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -150,14 +150,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index ad2cc4541..8bdf0f729 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples helloworld - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index a5da86a30..d8dcc7d65 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples http - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -70,7 +70,7 @@ commons-fileupload commons-fileupload - 1.5 + 1.6.0 compile @@ -186,14 +186,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index bc5e2a080..8428b7c80 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jdbc - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 6d9943613..a3c85c2cd 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jms - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -71,7 +71,7 @@ org.apache.activemq artemis-server - 2.33.0 + 2.41.0 compile @@ -83,7 +83,7 @@ org.apache.activemq artemis-jakarta-client - 2.33.0 + 2.41.0 compile @@ -155,14 +155,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 255220f60..087273830 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jmx - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index dcccf5d8c..5487bef2f 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jpa - 6.4.0 + 6.5.0 jar https://github.com/spring-projects/spring-integration-samples @@ -131,215 +131,10 @@ - - org.springframework.integration - spring-integration-file - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-camel - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.4.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT import pom @@ -360,14 +155,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom @@ -387,7 +182,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 32afcfc14..79a3f998c 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples kafka - 6.4.0 + 6.5.0 jar https://github.com/spring-projects/spring-integration-samples @@ -131,215 +131,10 @@ - - org.springframework.integration - spring-integration-file - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-camel - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.4.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT import pom @@ -360,14 +155,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom @@ -387,7 +182,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 51254f897..a97d8c910 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 105153e32..01410b9fa 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mongodb - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 5b5fbeec6..1feb473d1 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mqtt - 6.4.0 + 6.5.0 jar https://github.com/spring-projects/spring-integration-samples @@ -68,6 +68,12 @@ spring-integration-mqtt compile + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.5 + compile + junit junit @@ -119,215 +125,10 @@ - - org.springframework.integration - spring-integration-file - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-camel - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.4.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT import pom @@ -348,14 +149,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom @@ -375,7 +176,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 390e3b651..3fb1bc5b7 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples oddeven - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 46af81bec..7a852427e 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples quote - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index f224e6876..338a707ed 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples sftp - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 9cddb5a65..495b89738 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-amqp - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index c435945a0..fa9cf6c74 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-broadcast - 6.4.0 + 6.5.0 jar https://github.com/spring-projects/spring-integration-samples @@ -119,215 +119,10 @@ - - org.springframework.integration - spring-integration-file - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-camel - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.4.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT import pom @@ -348,14 +143,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom @@ -375,7 +170,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index bf2d6f607..271b76ce1 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index b350abb08..93ea73848 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-with-headers - 6.4.0 + 6.5.0 jar https://github.com/spring-projects/spring-integration-samples @@ -119,215 +119,10 @@ - - org.springframework.integration - spring-integration-file - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-camel - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.4.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT import pom @@ -348,14 +143,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom @@ -375,7 +170,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 716da2c6b..d993b4d51 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testing-examples - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -141,14 +141,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index b7eaa469d..8ce443ae1 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples twitter - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -127,14 +127,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index d6044ebe9..dadde4cb8 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples web-sockets - 6.4.0 + 6.5.0 jar https://github.com/spring-projects/spring-integration-samples @@ -114,215 +114,10 @@ - - org.springframework.integration - spring-integration-file - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-camel - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.4.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT import pom @@ -343,14 +138,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom @@ -370,7 +165,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 6d2ea05bf..33949f86b 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-inbound-gateway - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -168,14 +168,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 713cf7dbf..a15ccda43 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-outbound-gateway - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -131,14 +131,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 6dfc46e52..6d751e8a4 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xml - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 0779cdfa9..a6ef3d5e6 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xmpp - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/basic/zip/pom.xml b/basic/zip/pom.xml index c67019e7d..4992b0604 100644 --- a/basic/zip/pom.xml +++ b/basic/zip/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples zip - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/build.gradle b/build.gradle index 268a83eaf..8085bdccb 100644 --- a/build.gradle +++ b/build.gradle @@ -118,7 +118,7 @@ subprojects { subproject -> url = linkIssue } withXml { - asNode().appendNode('properties')appendNode('java.version', java.sourceCompatibility) + asNode().appendNode('properties')appendNode('java.version', '17') if (subproject.plugins.hasPlugin('org.akhikhl.gretty')) { asNode().appendNode('packaging', 'war') def plugins = asNode().build?.find()?.plugins?.find() @@ -212,11 +212,11 @@ subprojects { subproject -> } ext { - artemisVersion = '2.33.0' + artemisVersion = '2.41.0' aspectjVersion = '1.9.22.1' commonsDigesterVersion = '2.1' commonsDbcpVersion = '2.12.0' - commonsFileUploadVersion = '1.5' + commonsFileUploadVersion = '1.6.0' commonsIoVersion = '2.16.1' commonsLangVersion = '3.12.0' commonsPoolVersion = '2.11.1' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 491239cf1..ab8c80251 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-dsl - 6.4.0 + 6.5.0 jar https://github.com/spring-projects/spring-integration-samples @@ -56,7 +56,7 @@ org.springframework.integration.samples cafe-si - 6.4.0 + 6.5.0 compile @@ -125,215 +125,10 @@ - - org.springframework.integration - spring-integration-file - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-camel - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.4.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT import pom @@ -354,14 +149,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom @@ -381,7 +176,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 0b5958242..c63908dbd 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples kafka-dsl - 6.4.0 + 6.5.0 jar https://github.com/spring-projects/spring-integration-samples @@ -125,215 +125,10 @@ - - org.springframework.integration - spring-integration-file - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-camel - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.4.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT import pom @@ -354,14 +149,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom @@ -381,7 +176,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 17a7c46c4..574d6267e 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples si4demo - 6.4.0 + 6.5.0 jar https://github.com/spring-projects/spring-integration-samples @@ -147,215 +147,10 @@ - - org.springframework.integration - spring-integration-file - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-camel - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.4.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT import pom @@ -376,14 +171,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom @@ -403,7 +198,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c3521197d7c4586c843d1d3e9090525f1898cde..1b33c55baabb587c669f562ae36f953de2481846 100644 GIT binary patch delta 35074 zcmXuKV_=y~_cMFg;wqJn^(PN0c%xL0|fzM%Yf1o!ka2mp=%??Zj7Hgqr+2w*hx+>j$rg)ZA zW0|T@9O*eGS57-u0(liFuKQb+btO9bQa}NXfmBqpIVcQflQ3_0bk@&bKQq zD|g+UZNJ;(;`#w8Yh3yGum-wIkDe$!&lm8B^EgVfaPWvJ)?fenKtMnwL4aql3BU_q zC4kGTi#kj}IB`6s=Rd6n>eSE+j!TQbbri2y<7Jqonl;0l5cfAoZv3LuF zC4Nx26zqTE;J@`^=JyTXr|)! zu=Bu9_IBMomK&iv)Tc5Daw`+x2ahMd`IXRB41>wcwA+ctiL^9BVAneYa})*W(Z^?s z&ar`)>t~3qO;mbqAvQ;!Yx?YA?%jIgURuy@R}Bm*v;e245-T3CcNsxP;WvYWGas6G zrFAmFCjCfwepihWr^OM%nda)VF2h>UkLm3~*4Ey}0=f_;{iwY5UR0^5-Q={^G?@{s z_SLm7%pkQ1+h>p`wS5os!E=hk^Lj(5!?KFu13_53Me;9=4CPux4CKBw-_$cs4+g)+ zE{13&VWHsNf$#vJaRVNdPHw~f5Wm&Dm{g2Xt79X<4#>7TgFLzPr&fwR5j3=P1}U>I z?k#h)8;Ona9eNNs!aW|Dd?j}`_UaE;Y?2d|mRxVenp(aa+93rBG)U}#A z;-Jc~iP!){qV(MkeV>t}+XlEONE+0?dRPxfJ4u$+&!Y!aN{DpuYbh|fqIQlPJtwaU z={<7SrJe@Bn(c>XPcdhYd0@A>5E!aBqb$v}MB>}0U|u4+%J z!!gGiBB_C@LRdPV(5%XaCxdyQ0gVCNy0j8|GaqW!5My4Pk@8&PPBUV898N5nP`{<#`q07WN3!U;S&0I1UjNlsFicxAuD{8}2#y?9_wM9iSa-M3ms&L#k2n}s zGu)Lf$R5GLDSC~+!k0q-t3ErkDtQM;2#9(p2=FX6KKO;20<3^Z2s~H76vh$|4J=%n z4T67SsQUh{gU6hRI0!8*CxyqH2Y50qYM(PV_Gn7m$m<^tenS43hNhV5hr7y+_E^I} zOJ~2JbhSLpcD+pF^YH(CzDD{3iHMvN8*88;2;guyN3zD31*vn%fUuuXmi7|xrRGrW zgkNPmgTjI`+xgimf%?YhVe&%kDW~g5;v-hvMN{}i_(LTOjFY-Zaq#7|#c$qow^n59 z2Z#I&p>BFKAuffY?QkNYNl_1UuBb<}MGRk~<3x>+Uo588QamrbgL;sYRDWVM3n(}7 zH+SGY38wx`Chgp&#j^1(BtmGM2@eg!d%=|vps}yVy_T{90L`SdEzw}}y-9u`IpiSK zk262@Cp+9F8B;FdXK$GtPgNc?&rT;S<{ERykdT7`KT?eQkHR>FUDW0U;rcwQ+J;a) zSN3LU93`A5Qf~Q>`vTwKn&)7aLcNrC4-y-ovgwesuALPZZCjawJ#H|x`?!OTiz+QE zy=4WM>hx!&frOYX5|4o4`ybhhhuY0}ABLWwQiC9lb(7)n$An$FQR^2G36c#%K6f^k z&YMV;x0+MXj0>KJ6IaCAFB8BS0*Yze2HeqA;P$-s`cF>uEZWuzP8YWdx6#Xj12~Y&0T^#b`vJmFjlwmKHaWk(gz)( z637nuRMz+6Y0#;0FQX6|p>8GT*D@o4X~9#IQ_z{A4$m$7*F^coo2@?+UrVP)(rN54 z_W+NPTP&}K(fMGHfJ5oJ3hXY_i0=Oto^1tOn(n{CYXS$75rVhAQ-GJV$$^dPwu*B` zSpEh-5F4p+uKjVbaqZ|Zr+I#H{m~`;?JUD8$9~zCS~)v5`|~%;3!B_sz0eO#Y_jW{ ziGE^petk=5;ZdBWigTaMqs-gPF`t*cqhclq3FqLQh1(;KI>iOjrPL686)H79W%<%J zQ*{*ZE6CI~MHPeGBb26v$_iNDDADeoy}W2EU#EFZ=+rBsm=z8KOkozMl2w! z#r3KSthGodzoON{&n>JO12KfyE}JJZA}x^_l23h&L$Pd3)Y8al3}hMhDn2~jO*cja zMen7|nWv`8B`nI537l(vYnEj*JK^*Y*m+Ql5FeswID3B9sjX$o4F&G#6pk3}G zdf+E^O!<-ICg(0x0}MW`VcjW5_EwHVjMRu` ze^W?|QANW{F-4b9z1ZlHC;4~B`0ZWVGbdk#ZCo=bL=%$mBD7MWBBj@IHIBtaxI}#| zeGh|wJ&YU+Gl|lV#sEX0kbSb+m>f@~twM6C*!6Bv*!+ThlC=#cXt+cA&bhx8DmrF|4|}a?wbUE+`Ndu!L9AVgap5+5#7w6|}Y*qM?u9 z$UiIjPEu@BYTnD^+-IbAs6~&q%;TLvxz!0^Ei&&3a;VxGI+JTv1K$>uG?dZqS60~} zutdl}>BXLI2oU(HVf7nJ?mLw!!4a-^a}5TppYkAp@!afg{Y^5E3fDk#Djr4BvHd2b zRogmsUa^k8x_O$m}VTN6UUw$m|w{ z$1f%_#H1!GAp-r?86A(xROOZ8eghro+&Nub=@at>wSY^ z>+|_w34(L)6Pbxvpso7+VfuHvV81-WJdq4)D3CO_A$j5ibb6YCJE4O|)jEMv#hdvx zOr0v7=%En0vxHvGKQ$X&gZa8@S_XNfU=`g6SI06;10(YXXC9u{1v7mFv6|$(*5*Qt zRG@O%W9I4C-*Usq}nQjdOvK`2d0U#=qWr|5Do9kP+0s-S zeni2Br&&s@MOs3n^vLNmuC?i?TgMc`*+tfEn+lekp}(LmI-src4yP;QA;cs(&+U&= zP_u6iBmNmd1}p9HGjh4pS0(!+*pF0E8f0I8NRi9;)%Z3lz5^Sych8={YIwIMagJDnp<+`9>OP~6n|?DN>nraNpBny8I?FvlRN7~jWfa>UHe_a z89!|tRL>20`8#rCWj%NIN?d_wnH*;_Zdc*U10(H+h$rg>dY#4knA1!&LaA(v;lBDD zFG_H3ZE3%8vpFC{<1hUTH|lOKFMmLobv*A2&|Ysa--MNM$h46=NPQsTO#5Z+P#Q!S z(Xn&Nj#zxQsw~ku!Q}bCFOQwyzOJD^W}&510k}-rfZ-8;qtC`v$}UD^6iU4!WfA_| z?3asoMt(iL!Z0Y}mcz)@4V$C!#;!)_T*9?sYf7F%QOX$coIAR%tP{Cv@#PEOgA_*r zss}eGQHxu8F*%fBa^v=Eq-lkH}XrZ`GreY66< z=8`GNYk>?gXZnd%LoPLV+}edTrt+dC5Yc5Cub3}{oh@>zru8T7XM2(eS}cW2dw^aA zFt56iDEGCtdYf0mviCkuWl3e598#TFfe$fJWk$JE>!ge2HIV%FB#oZqB4f~9|5sid z7lD*o)UppWiaHk+6k&lc9#`Qilxm9?!HJsBy+?^HGP{N%Dcf{nq?jrl9u$~6iT(;p z0e$0a*G%v$o$#Un!``qYrSoeuccM%P@Z{{`nET=tGH$#tz~gmqZRi?WKw}ewJ9ZJW z15~VF^dVhQ8V|ONwY5oSo0^Su@yx2x`hT|pU(EO<3+EM7o`7xwmc9D@j~MS<7j9 zVJooDg@9l7QD(O5#gyR|5Tc~V=&7drGw)i#*4b5YxT&cujj*yHEqkqzkZ3iVU9Xy9 z_!3F->c{kuJ`oUbSjGGpl#OpyPIv*GSK!Xjcc9-F%dT_py-=}1Qn3ZN;S(4lk*pbu zp(PA$u%iial#S}}+kwN1dW*TKbm_B->U!`;j3((kxc61%uO;kJdh{(fdG0t5k33mU zcAs)@wd0aL;dzAGVG^nj4j|`hS3X7cv!&b5Rbrl0;sqx97-0;O_Z8rjGp{=kjR?Sd zN*TvIJ=$4^J>p)RQlSq!vPGXM-mcNkD$OY|=bIqT&HegAFS>Z(s2lX#za?!yZ7##n zGe?tvv2s)cu<(GnvZIv-F_wnsc2RS~1%EIj^jujqq#26af?8CTX?uNNEp$eDz;ZZQ6OA4C<_{cfeE z9*0Az04}OMLc}d=iA|`e2;(DYQk0VUVn0L<3O%Y@X0@F3i(WICJ3bEFwAWq zW5$_)Jg2nEkpL}{W_^qA1+2*JxS!%HV0V+g;%d*ZNnZLw>X1r7t3=*f!fL$%&XTRN z$j40VX(b>H$Oo`i(t2^s;97L(QJl_I^ID^mp;Khpi^;T{A^hM+@~_}9tf|mcyxrq* zqYj4RUr_#6UHt()eDYvFG7q3LF4q_3+#m-#b3N!m@nLc+DJS|L9IQtYe$4A5;}xBKmDHtW@#V_b~u9$rqqR>z@NH zUhtkrMwI>Rf?8Pp4!TwA=ponjt72v~xIriIB=SSw@06rcP0+K6h=>(zVVq0+%iv7m zt8rviaH{2HndPtx6IjWav`7neEo^G7*4Ak%;#Fd0HHQNipoEUb;TV|`+~a&igyTuH z7oI_qgrdP8IlaHD)-iz8b4W{O7PzM!`g4SU)-XS+%&BZP!nq7fPt0`G1w^_^V{!)$hrEPCWvXYHL9xrDL_+&CQG60M8@E&DoFCc3 z5ezNP_T0*GaQhw^dA~ELIUlWv*5Qfr*rJK!(e{0m_!DGslr~`T-j{vLROWVJ?y!A3o@l^_7Hz$=7tSXrK@O?KS-gvS=tkq z2pjp6VrZiL(MN!`jFl`IEOMH08wXP_j`pmH4*k_hb572b#X97TrCD$;%Z{vN5JvtyRHNdolE2P=VIkn6#YM|O&8&-N7hO!qhL>{csxROQ~sl&spDV%P6 zH7U0#zbzPZ$<^;Y-v_&2PcKg)===wA(EX2nZ4zt`)+OTB^q6^?S~B*O57Mso zYx8`3N^V5|DG1Z)lBTZaDLm%$tqDDF zob%Ar*m+t~&yhy^qY3^eM~x`ke!9#Ua-(U@)~SHUoQMAxzUrTLMaQu%em@J*Cx?iY z&2y(`>dN36JYkVG_gltI*oC|*YF-jx%Y%hDjQnldgp}@5;?WhVH+uiZEa7zWb0ui9 zAQV&Hbfn_aEAk)9%R2NzMyJXv5N-9$0=9gz>uB8+g%7^`@8(Fk*?jZ9KtT9G{&#aP z)SAG7e*{iYY8Mk75?0k<*v+F&|JVEQ-zFxBkFbv~h8%&3R=fWjb(c*P{tXt1D}0t0 zJg%23uX{&Jmk^7_%)b15YmOary6gPd*@cd$7P{4^MVGL#`w4qKpflYdCyIjY+}~qg zQBms2#^-9zKra>nAs016c|tH9-wjI$|fO^&Lk^Qt815JHFf6Kejo>ky?_ zOUzYF+Ja_y#|i;`TR_V3$t9Z+@(NUUx!m<=LQv0DvVJ{wb3sYkY^nWg)tG>7Skgla zVyMn0%5FMpo)%XOdEYp~<#qagw*H!Z7Cf5_*+BgEs0H=kw=M#eCV4s&A6`@35YZD&m(-hH|%zZGB$tr?5s zIm_VT@lQ_Q+^5Ag|B);08%oFCO=^Lh0(E4Q(gb(gY=-AJ-^m zI4_ctFXaE!{F3$yu@Y>=-~q%MMNDzT#?qW`a%&GjrvqS;v*6+X1MA@tts9;6NUt;N z8+n8O2i6OWc2SA{gt1OCh~tx6Kh?8&SWKp|xjufpyzfy3c#X6A3UYfYf0SspHc~wJT@s(grG@(3NqXOy91@!?4}{^TBa#iQTndA7P0t8v=ZRs&DJm=0Hj zxm!mJRZ#&h!e&_rN9+}Ur5vTxU_#QP_mnoLaV?=l&xuKw@k0GYZOk%P(O(Z4}(Qd(u!66g)<1M=?=U?_{pQ>C5mZ zgt(MK)kkr(xu@2*Z=rnw)aD(un?qwZ#PzLjUN~t8P_)2OFVb&#lq?Ckv6>k>zzw3T z+GJO*^wWkxb~n5TiG;TT_kL!V^){mR>{fb;PbKGkPw75(hlgEQ2NvWk<#-8&cd{mV z==0sBvi9D{)Eiwq#9t%d<4E-f5j)91Unoo(FEm4aN6NGR5LA-NSMvl`v?1Npoo1(} zI7HYX765=ycMLPuk(1JOeW4Rv5to2Wo_?omwERJm!R{~e>lAtp>W^S^v-U(oomRSE zRtI&JdSy-_wuZVVGN98Rz2=+R3k(R2{OD@pOc zovmC<@NI%HWY92x|1m;C7a0n-e;!~68UjKI97=`@Hb5f+$I-!pW0}!``ns5sSpGxM zT>TAFYIgLeoC_F`BrsU$Z&uM-H1Xes?ZsrnHb}IW{|;`T$W$6U-L*~a6&gGYt~KfW zzArs@cl4ggnf_GvvFOu$zB)1ZJDKTqG|qF$b9+Jj`F4Z%1Jwq3ibx>+7>Jg$v)WN} z_w++ABgSKpqg{nV?gF<7m|V8p_Pw1FzcLuVicb=+kRJL}qpMtx@? ziNtUG?%v&2pcvuouKGNuGK~^|A#`p3%4lP0Ie z5hhe?Qg?p%`?_%FWK5b5f{KRNz+h2K9?)_LYLyo#?WdUZx?-H`6lN@k6rX}qs;>;j z`WR@;QZARRMi*KB=R&iA4!tKURIkI0YjXPmi$O9`i}mVbmF{hd-_+>RBlBMYOD&K` zAW6JcH@Yz9Ls%~GcUrDj1}Y3(FL(GMJgH|fI*OGsd{+Ma+1GSV)`@hiiXeb!6r)}r zy0-oRNFkc&@tg?DzC&iTNqA;PInYtI9Q zu0;`2!{Qm7L7GewR@(LawH@X=he3<6b(-*Y4r6N*IGMrIjPS&IKztJN#h+(dsh;P1 z({*^p(I5lhA1dVQm_3lZYEny@vrJ=TO-Jr)`qhZCQ-m??7{l0uTGg3NmR;j{!CH}v z=D}jRI9PN{PffE`tyP=B^%SwKKD|ttS1+Ho&5dfINiE|u&EX7jhc(%0@h7z)sGe_{ zqfwNjDW9|@NRgsY(}QHAns0dUa$3 zxq%tTE%lkVwuC*d0=Uy1j(9bIHgC8PMSvBZCWY$j5qo{eB>NRc#cX5Pvd zCIUxlu}5(_a8mus5K9TlFO|Sy16J64-)c0@nVquAN0E59}N8P`z`hWNEA0kYgD@`sA?0Z5ofh=;8@o*Q3Up zqe6cEH&t`VreACSbv0A?|2(n*8YcKVFFH7#g9^Adi{}lorURYcAeDqy5;iifz)N1w&(G}1E(cGe8|A#)Aj!Ca8Ahj#}ev9XaN!`5O_{UMsrO^518ejMO{oWKr zkufX3*V~iBO}Uf8!b3}8*ioO3AOVu?&swuzWtPht9ad+VZ(q4uPhDPG^4py4!)$#V zT91LCqua8R8?6?#aGV8|bu=CqS69{5J9^_RGd4j(PI;FWJ{#XigI0BB`bok*+IWu~ zKE?%7po@zIEAG;>|I--+AULyjEOyWlKxqlTqCleTq_(k-Fu{)Dp*D2zQl?K|mXe+4 zi}8j$;i zbc(yWTPuo44T_^*!@|N`*nDr7YnTF{pxn0CN;+Wg15EOz78vCS3p!}&Zn7ORi`sbh9 zS?4qYW5P)5B|F31+V7T~N%fLW0M%&c;76_}5qJgkhdMxKLDP?bB&M;Zp;U(VCVMU9 zxk^&)$<_jv3Ef6{@NUUblifW?%B1-7M3)A?Xfh(=(Yzv}G`Jd_Bi)5ED+?9YN!4i? z6A8vCBdIJ!#*K!#e~7Q#?VAHuuCvEQwZMFnu0QgMAc90x1Mg*o3i{@&+n!PYe`j` zaD66Aeow$iG96!X4izh$WVeNW9Hmf77v!C9P2tZ$Hk^;f=edLUL6q4Nr-dS>`4?Kl zb)E5(xAOslxIYZS+hrdcfl(HcuwlZI&dC=xax)jQcc0rs@ht|!co;ZR_Ud?a`luYx z8|B;zQv%+vDS6)3@055W7R_|r$^%ZE>OG~$sDRSlikhhezpjBUr2%o{u#qme@N2a@ z7)so(J`CJBWG3gr$X2_yAP>~q9|19*gid#o@h7(i|n$_}S`6=@9j&@SXH{^1i0>10p2%z3-YTz*lC zasF`xyL*<6tfC^VF|0`JT{(-;1BBaeu6C8g+ZYU`P

9HXbnx{yu=160arMI&0;a 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 z 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 delta 34964 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

Gn4F+B~IivciU9^t0j-Mgao3 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 68e8816d7..78cb6e16a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d6..23d15a936 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -115,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9b42019c7..5eed7ee84 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 7560e2bb9..2b2a27ce7 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples async-gateway - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index c27ceb831..1a41c4e49 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-poller - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 0cc119a33..d6ae0a3e0 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples errorhandling - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index e831fdcab..591bfc480 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file-processing - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index cf677e862..c92edbe86 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail-attachments - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -143,14 +143,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 4e4ebd1ef..1748a4aac 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples monitoring - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 8732915ff..58f77e2af 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples multipart-http - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -70,7 +70,7 @@ commons-fileupload commons-fileupload - 1.5 + 1.6.0 compile @@ -180,14 +180,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index d4b7a8e88..c8ef62d18 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples rest-http - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -95,13 +95,13 @@ org.springframework.security spring-security-web - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT compile org.springframework.security spring-security-config - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT compile @@ -211,14 +211,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 7af6fcc1e..9f316eee1 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples retry-and-more - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -159,14 +159,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 552d17f64..4c45a558f 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 27ea161d0..56f44d337 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-derby - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 65f7a7d1a..3d2315878 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-ms - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -138,14 +138,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 461a239a1..872e3ccc7 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-oracle - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -132,14 +132,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index a1a780503..258ed2805 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-postgresql - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -144,14 +144,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 8c6881fb0..e9cbf6e2c 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-async-bi-directional - 6.4.0 + 6.5.0 jar https://github.com/spring-projects/spring-integration-samples @@ -114,215 +114,10 @@ - - org.springframework.integration - spring-integration-file - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jdbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-camel - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.4.0-SNAPSHOT - org.springframework.boot spring-boot-dependencies - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT import pom @@ -343,14 +138,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom @@ -370,7 +165,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index a24c13f65..2f4dca2b0 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -126,14 +126,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 2f14a0bc5..d1feb652a 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testcontainers-rabbitmq - 6.4.0 + 6.5.0 jar https://github.com/spring-projects/spring-integration-samples @@ -141,222 +141,17 @@ - - org.springframework.integration - spring-integration-jdbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ws - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-redis - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-r2dbc - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-rsocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-event - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-cassandra - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-scripting - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-websocket - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-graphql - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jpa - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-http - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zookeeper - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mail - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-camel - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mongodb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stream - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-stomp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-file - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-syslog - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-smb - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jmx - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-webflux - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-sftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-mqtt - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-ftp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-kafka - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-groovy - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xmpp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-feed - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-debezium - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zeromq - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-hazelcast - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-test-support - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-amqp - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-xml - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-core - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-zip - 6.4.0-SNAPSHOT - - - org.springframework.integration - spring-integration-jms - 6.4.0-SNAPSHOT - org.springframework.cloud spring-cloud-dependencies - 2023.0.2 + 2024.0.0 import pom org.springframework.boot spring-boot-dependencies - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT import pom @@ -377,14 +172,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom @@ -404,7 +199,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.5.0-SNAPSHOT diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 9c481f7ff..a905d3652 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples travel - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -136,14 +136,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 6fd431da0..280990899 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tx-synch - 6.4.0 + 6.5.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -137,14 +137,14 @@ org.springframework spring-framework-bom - 6.2.0-SNAPSHOT + 6.2.1 import pom org.springframework.integration spring-integration-bom - 6.4.0-SNAPSHOT + 6.5.0-SNAPSHOT import pom From d050010b2318b8717ebbbd3233542a1ad530b005 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 14 Jul 2025 13:14:03 -0400 Subject: [PATCH 352/356] Start version 7.0 * Upgrade to the latest dependencies, including Spring Boot 4.0 * Spring Boot 4.0 has split an auto-configuration modules to many much smaller. Therefore, we have to include specific starter or that module in some places * Migrate JUnit 4 tests to JUnit Jupiter * Fix JPA 3.2 deprecations * Fix WebSocket samples to add required `handshakeHandler` bean --- .../advance/testing/jms/JmsMockTests.java | 54 ++++-------- .../DynamicTcpClientApplicationTests.java | 6 +- .../integration/samples/cafe/Delivery.java | 21 +++-- .../integration/samples/cafe/Order.java | 13 ++- .../samples/filesplit/Application.java | 2 +- .../main/resources/META-INF/persistence.xml | 1 - .../META-INF/spring/applicationContext.xml | 62 +++++++------ .../loanshark/biz/AccumulatorTests.java | 30 +++---- .../chat/stomp/server/Application.java | 3 +- .../chat/stomp/server/stomp-server.xml | 4 +- .../integration/samples/jpa/Main.java | 2 +- .../samples/jpa/domain/Person.java | 24 ++---- .../integration/samples/jpa/JpaTests.java | 12 ++- .../samples/kafka/Application.java | 8 +- .../integration/samples/mqtt/Application.java | 60 ++++++------- .../src/main/resources/application.properties | 1 + .../samples/mqtt/ApplicationTest.java | 31 +++---- .../samples/mqtt/BrokerRunning.java | 86 ------------------- .../samples/mqtt/MosquittoContainerTest.java | 51 +++++++++++ .../TcpClientServerDemoTest.java | 24 +++--- ...ntServerDemoWithConversionServiceTest.java | 24 +++--- .../TcpServerConnectionDeserializeTest.java | 24 ++---- .../TcpServerCustomSerializerTest.java | 27 +++--- .../splitter/CommaDelimitedSplitter.java | 4 +- .../CommaDelimitedAggregatorTests.java | 54 ++++++------ .../samples/testing/chain/SpelChainTests.java | 42 ++++----- .../testing/errorhandling/GatewayTests.java | 41 +++++---- .../ExternalGatewaySubstitutionTests.java | 30 +++---- .../testing/filter/PetFilterTests.java | 56 ++++++------ .../samples/testing/gateway/GatewayTests.java | 30 +++---- .../testing/router/PetRouterTests.java | 39 ++++----- .../splitter/CommaDelimitedSplitterTests.java | 64 ++++++-------- .../standard/server/Application.java | 19 ++-- .../websocket/standard/ApplicationTests.java | 23 ++--- .../samples/ws/InboundGatewayTests.java | 27 +++--- build.gradle | 79 +++++++++-------- .../samples/dsl/cafe/ApplicationTests.java | 6 +- .../samples/dsl/kafka/Application.java | 4 +- gradle.properties | 4 +- .../async/gateway/MonoGatewayTests.java | 21 +++-- .../rest/json/JaxbJacksonObjectMapper.java | 1 + ...TcpAsyncBiDirectionalApplicationTests.java | 3 - .../samples/travel/TravelGatewayTest.java | 22 +++-- settings.gradle | 2 + 44 files changed, 525 insertions(+), 616 deletions(-) create mode 100644 basic/mqtt/src/main/resources/application.properties delete mode 100644 basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/BrokerRunning.java create mode 100644 basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/MosquittoContainerTest.java diff --git a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java index 07a4d692f..4981d8c3c 100644 --- a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java +++ b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java @@ -16,23 +16,17 @@ package org.springframework.integration.samples.advance.testing.jms; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.BDDMockito.willAnswer; -import static org.mockito.BDDMockito.willReturn; -import static org.mockito.Mockito.mock; - import java.io.IOException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import jakarta.jms.JMSException; +import jakarta.jms.TextMessage; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.mockito.stubbing.Answer; @@ -49,10 +43,13 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import jakarta.jms.JMSException; -import jakarta.jms.TextMessage; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.isNull; +import static org.mockito.BDDMockito.willAnswer; +import static org.mockito.BDDMockito.willReturn; +import static org.mockito.Mockito.mock; /** * @author David Turanski @@ -60,7 +57,7 @@ * @author Gary Russell * @author Artem Bilan */ -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig @ContextConfiguration @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) public class JmsMockTests { @@ -87,8 +84,7 @@ public class JmsMockTests { @Qualifier("invalidMessageChannel") private SubscribableChannel invalidMessageChannel; - - @Before + @BeforeEach public void setup() throws JMSException { Mockito.reset(this.mockJmsTemplate); TextMessage message = mock(TextMessage.class); @@ -99,7 +95,6 @@ public void setup() throws JMSException { willReturn(message) .given(this.mockJmsTemplate).receiveSelected(isNull()); - willAnswer((Answer) invocation -> testMessageHolder.get()) .given(message).getText(); } @@ -107,10 +102,6 @@ public void setup() throws JMSException { /** * This test verifies that a message received on a polling JMS inbound channel adapter is * routed to the designated channel and that the message payload is as expected - * - * @throws JMSException - * @throws InterruptedException - * @throws IOException */ @Test public void testReceiveMessage() throws JMSException, InterruptedException, IOException { @@ -120,20 +111,16 @@ public void testReceiveMessage() throws JMSException, InterruptedException, IOEx @Override protected void verifyMessage(Message message) { - assertEquals("hello", message.getPayload()); + assertThat(message.getPayload()).isEqualTo("hello"); } } ); - assertTrue("message not sent to expected output channel", sent); + assertThat(sent).as("message not sent to expected output channel").isTrue(); } /** * This test verifies that a message received on a polling JMS inbound channel adapter is * routed to the errorChannel and that the message payload is the expected exception - * - * @throws JMSException - * @throws IOException - * @throws InterruptedException */ @Test public void testReceiveInvalidMessage() throws JMSException, IOException, InterruptedException { @@ -142,12 +129,12 @@ public void testReceiveInvalidMessage() throws JMSException, IOException, Interr @Override protected void verifyMessage(Message message) { - assertEquals("invalid payload", message.getPayload()); + assertThat(message.getPayload()).isEqualTo("invalid payload"); } } ); - assertTrue("message not sent to expected output channel", sent); + assertThat(sent).as("message not sent to expected output channel").isTrue(); } /** @@ -157,15 +144,13 @@ protected void verifyMessage(Message message) { * @param expectedOutputChannel The expected output channel * @param handler An instance of CountDownHandler to handle (verify) the output message * @return true if the message was received on the expected channel - * @throws JMSException - * @throws InterruptedException */ protected boolean verifyJmsMessageReceivedOnOutputChannel(Object obj, SubscribableChannel expectedOutputChannel, CountDownHandler handler) throws InterruptedException { + return verifyJmsMessageOnOutputChannel(obj, expectedOutputChannel, handler, 10000); } - /** * Provide a message via a mock JMS template and wait for the specified timeout to receive the message * on the expected channel @@ -176,8 +161,6 @@ protected boolean verifyJmsMessageReceivedOnOutputChannel(Object obj, Subscribab * to process the entire flow. Only set if the default is * not long enough * @return true if the message was received on the expected channel - * @throws JMSException - * @throws InterruptedException */ protected boolean verifyJmsMessageOnOutputChannel(Object obj, SubscribableChannel expectedOutputChannel, CountDownHandler handler, int timeoutMillisec) throws InterruptedException { @@ -195,7 +178,6 @@ protected boolean verifyJmsMessageOnOutputChannel(Object obj, SubscribableChanne CountDownLatch latch = new CountDownLatch(1); handler.setLatch(latch); - expectedOutputChannel.subscribe(handler); this.jmsInboundChannelAdapter.start(); @@ -213,7 +195,7 @@ protected boolean verifyJmsMessageOnOutputChannel(Object obj, SubscribableChanne /* * A MessageHandler that uses a CountDownLatch to synchronize with the calling thread */ - private abstract class CountDownHandler implements MessageHandler { + private abstract static class CountDownHandler implements MessageHandler { CountDownLatch latch; diff --git a/advanced/dynamic-tcp-client/src/test/java/org/springframework/integration/samples/dynamictcp/DynamicTcpClientApplicationTests.java b/advanced/dynamic-tcp-client/src/test/java/org/springframework/integration/samples/dynamictcp/DynamicTcpClientApplicationTests.java index b619f4d00..a12490de2 100644 --- a/advanced/dynamic-tcp-client/src/test/java/org/springframework/integration/samples/dynamictcp/DynamicTcpClientApplicationTests.java +++ b/advanced/dynamic-tcp-client/src/test/java/org/springframework/integration/samples/dynamictcp/DynamicTcpClientApplicationTests.java @@ -1,11 +1,9 @@ package org.springframework.integration.samples.dynamictcp; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; + import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; -@RunWith(SpringRunner.class) @SpringBootTest public class DynamicTcpClientApplicationTests { diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Delivery.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Delivery.java index 3812490de..692c0b51f 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Delivery.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Delivery.java @@ -16,34 +16,37 @@ package org.springframework.integration.samples.cafe; +import java.io.Serial; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** * @author Marius Bogoevici * @author Tom McCuch * @author Gunnar Hillert + * @author Artem Bilan */ -public class Delivery implements Serializable{ +public class Delivery implements Serializable { + @Serial private static final long serialVersionUID = 1L; private static final String SEPARATOR = "-----------------------"; - private List deliveredDrinks; + private ArrayList deliveredDrinks; private int orderNumber; // Default constructor required by Jackson Java JSON-processor - public Delivery() {} + public Delivery() { + } public Delivery(List deliveredDrinks) { - assert(deliveredDrinks.size() > 0); - this.deliveredDrinks = deliveredDrinks; + this.deliveredDrinks = new ArrayList<>(deliveredDrinks); this.orderNumber = deliveredDrinks.get(0).getOrderNumber(); } - public int getOrderNumber() { return orderNumber; } @@ -57,13 +60,13 @@ public List getDeliveredDrinks() { } public void setDeliveredDrinks(List deliveredDrinks) { - this.deliveredDrinks = deliveredDrinks; + this.deliveredDrinks = new ArrayList<>(deliveredDrinks); } @Override public String toString() { - StringBuffer buffer = new StringBuffer(SEPARATOR + "\n"); - buffer.append("Order #" + getOrderNumber() + "\n"); + StringBuilder buffer = new StringBuilder(SEPARATOR + "\n"); + buffer.append("Order #").append(getOrderNumber()).append("\n"); for (Drink drink : getDeliveredDrinks()) { buffer.append(drink); buffer.append("\n"); diff --git a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Order.java b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Order.java index 95350dcc7..f9aee6f53 100644 --- a/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Order.java +++ b/applications/cafe/cafe-si/src/main/java/org/springframework/integration/samples/cafe/Order.java @@ -16,6 +16,7 @@ package org.springframework.integration.samples.cafe; +import java.io.Serial; import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -25,18 +26,21 @@ * @author Marius Bogoevici * @author Tom McCuch * @author Gunnar Hillert + * @author Artem Bilan */ -public class Order implements Serializable{ +public class Order implements Serializable { + @Serial private static final long serialVersionUID = 1L; - private List orderItems = new ArrayList(); + private ArrayList orderItems = new ArrayList<>(); /** the order number used for tracking */ private int number; // Default constructor required by Jackson Java JSON-processor - public Order() {} + public Order() { + } public Order(int number) { this.number = number; @@ -59,6 +63,7 @@ public List getItems() { } public void setItems(List orderItems) { - this.orderItems = orderItems; + this.orderItems = new ArrayList<>(orderItems); } + } diff --git a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java index af4d3e7ba..2c103362a 100644 --- a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java +++ b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.mail.MailProperties; +import org.springframework.boot.mail.autoconfigure.MailProperties; import org.springframework.context.annotation.Bean; import org.springframework.integration.dsl.IntegrationFlow; import org.springframework.integration.dsl.Pollers; diff --git a/applications/loanshark/src/main/resources/META-INF/persistence.xml b/applications/loanshark/src/main/resources/META-INF/persistence.xml index d39086f3e..5cdef62ac 100644 --- a/applications/loanshark/src/main/resources/META-INF/persistence.xml +++ b/applications/loanshark/src/main/resources/META-INF/persistence.xml @@ -1,7 +1,6 @@ - org.hibernate.ejb.HibernatePersistence diff --git a/applications/loanshark/src/main/resources/META-INF/spring/applicationContext.xml b/applications/loanshark/src/main/resources/META-INF/spring/applicationContext.xml index 5fea4806f..0493b5bdc 100644 --- a/applications/loanshark/src/main/resources/META-INF/spring/applicationContext.xml +++ b/applications/loanshark/src/main/resources/META-INF/spring/applicationContext.xml @@ -1,15 +1,20 @@ - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java b/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java index 431a97ab3..d69f8dfdc 100644 --- a/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java +++ b/applications/loanshark/src/test/java/org/springframework/integration/samples/loanbroker/loanshark/biz/AccumulatorTests.java @@ -13,42 +13,40 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.samples.loanbroker.loanshark.biz; - -import static org.junit.Assert.assertEquals; +package org.springframework.integration.samples.loanbroker.loanshark.biz; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.samples.loanbroker.loanshark.domain.LoanShark; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.transaction.annotation.Transactional; - +import static org.assertj.core.api.Assertions.assertThat; /** * @author Gary Russell - * + * @author Artem Bilan */ -@ContextConfiguration(locations="classpath:META-INF/spring/applicationContext.xml") -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig(locations = "classpath:META-INF/spring/applicationContext.xml") +@DirtiesContext +@Transactional +@Disabled("Not clear what is going on with @Configurable") public class AccumulatorTests { @Autowired Accumulator accumulator; @Test - @Transactional - @Ignore public void test() { accumulator.accumulate(new SharkQuote("fred", 6.0d)); accumulator.accumulate(new SharkQuote("fred", 6.2d)); LoanShark shark = (LoanShark) LoanShark.findLoanSharksByName("fred").getSingleResult(); - assertEquals(Long.valueOf(2), shark.getCounter()); - assertEquals(Double.valueOf(6.1), shark.getAverageRate()); + assertThat(shark.getCounter()).isEqualTo(2); + assertThat(shark.getAverageRate()).isEqualTo(6.1); } + } diff --git a/applications/stomp-chat/src/main/java/org/springframework/integration/samples/chat/stomp/server/Application.java b/applications/stomp-chat/src/main/java/org/springframework/integration/samples/chat/stomp/server/Application.java index 5847e1ad0..02250a7b8 100644 --- a/applications/stomp-chat/src/main/java/org/springframework/integration/samples/chat/stomp/server/Application.java +++ b/applications/stomp-chat/src/main/java/org/springframework/integration/samples/chat/stomp/server/Application.java @@ -18,7 +18,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; @@ -28,7 +27,7 @@ * @since 3.0 */ @Configuration -@EnableAutoConfiguration(exclude = GroovyTemplateAutoConfiguration.class) +@EnableAutoConfiguration @ImportResource("classpath:org/springframework/integration/samples/chat/stomp/server/stomp-server.xml") public class Application { diff --git a/applications/stomp-chat/src/main/resources/org/springframework/integration/samples/chat/stomp/server/stomp-server.xml b/applications/stomp-chat/src/main/resources/org/springframework/integration/samples/chat/stomp/server/stomp-server.xml index f5ded0400..196997250 100644 --- a/applications/stomp-chat/src/main/resources/org/springframework/integration/samples/chat/stomp/server/stomp-server.xml +++ b/applications/stomp-chat/src/main/resources/org/springframework/integration/samples/chat/stomp/server/stomp-server.xml @@ -38,7 +38,9 @@ - + + + diff --git a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/Main.java b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/Main.java index 10ab75935..43c66ce69 100644 --- a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/Main.java +++ b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/Main.java @@ -22,7 +22,7 @@ import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration; +import org.springframework.boot.data.jpa.autoconfigure.JpaRepositoriesAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ImportResource; diff --git a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/domain/Person.java b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/domain/Person.java index 36b09a969..8e3cc741f 100644 --- a/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/domain/Person.java +++ b/basic/jpa/src/main/java/org/springframework/integration/samples/jpa/domain/Person.java @@ -16,7 +16,7 @@ package org.springframework.integration.samples.jpa.domain; -import java.util.Date; +import java.time.LocalDate; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -24,8 +24,6 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Table; -import jakarta.persistence.Temporal; -import jakarta.persistence.TemporalType; /** * A simple POJO representing a Person. @@ -44,17 +42,16 @@ public class Person { private String name; - @Temporal(TemporalType.TIMESTAMP) @Column(name = "CREATED_DATE_TIME") - private Date createdDateTime; + private LocalDate createdDateTime; public Person() { - this.createdDateTime = new Date(); + this.createdDateTime = LocalDate.now(); } public Person(String name) { this.name = name; - this.createdDateTime = new Date(); + this.createdDateTime = LocalDate.now(); } public int getId() { @@ -73,11 +70,11 @@ public void setName(String name) { this.name = name; } - public Date getCreatedDateTime() { + public LocalDate getCreatedDateTime() { return createdDateTime; } - public void setCreatedDateTime(Date createdDateTime) { + public void setCreatedDateTime(LocalDate createdDateTime) { this.createdDateTime = createdDateTime; } @@ -102,14 +99,9 @@ public boolean equals(Object obj) { } Person other = (Person) obj; if (name == null) { - if (other.name != null) { - return false; - } + return other.name == null; } - else if (!name.equals(other.name)) { - return false; - } - return true; + else return name.equals(other.name); } } diff --git a/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java b/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java index 5eb8e756d..82de23954 100644 --- a/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java +++ b/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java @@ -16,10 +16,7 @@ package org.springframework.integration.samples.jpa; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.util.Calendar; +import java.time.LocalDate; import java.util.List; import org.junit.jupiter.api.Test; @@ -29,6 +26,9 @@ import org.springframework.integration.samples.jpa.domain.Person; import org.springframework.integration.samples.jpa.service.PersonService; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + /** * * @author Amol Nayak @@ -44,9 +44,7 @@ public class JpaTests { @Test public void insertPersonRecord() { Person person = new Person(); - Calendar createdDateTime = Calendar.getInstance(); - createdDateTime.set(1980, Calendar.JANUARY, 1); - person.setCreatedDateTime(createdDateTime.getTime()); + person.setCreatedDateTime(LocalDate.of(1980, 1, 1)); person.setName("Name Of The Person"); this.personService.createPerson(person); diff --git a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java index 0ab82aee9..9adf8d01c 100644 --- a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java +++ b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ConfigurableApplicationContext; @@ -109,7 +109,7 @@ private void runDemo(ConfigurableApplicationContext context) { @Bean public ProducerFactory kafkaProducerFactory(KafkaProperties properties) { - Map producerProperties = properties.buildProducerProperties(null); + Map producerProperties = properties.buildProducerProperties(); producerProperties.put(ProducerConfig.LINGER_MS_CONFIG, 1); return new DefaultKafkaProducerFactory<>(producerProperties); } @@ -125,7 +125,7 @@ public MessageHandler handler(KafkaTemplate kafkaTemplate) { @Bean public ConsumerFactory kafkaConsumerFactory(KafkaProperties properties) { - Map consumerProperties = properties.buildConsumerProperties(null); + Map consumerProperties = properties.buildConsumerProperties(); consumerProperties.put(ConsumerConfig.SESSION_TIMEOUT_MS_CONFIG, 15000); return new DefaultKafkaConsumerFactory<>(consumerProperties); } @@ -172,7 +172,7 @@ public NewTopic newTopic(KafkaAppProperties properties) { private KafkaProperties kafkaProperties; public void addAnotherListenerForTopics(String... topics) { - Map consumerProperties = kafkaProperties.buildConsumerProperties(null); + Map consumerProperties = kafkaProperties.buildConsumerProperties(); // change the group id, so we don't revoke the other partitions. consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, consumerProperties.get(ConsumerConfig.GROUP_ID_CONFIG) + "x"); diff --git a/basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java b/basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java index d2e93459c..85928cf90 100644 --- a/basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java +++ b/basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java @@ -20,6 +20,7 @@ import org.apache.commons.logging.LogFactory; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; @@ -53,34 +54,35 @@ public class Application { */ public static void main(final String... args) { - LOGGER.info("\n=========================================================" - + "\n " - + "\n Welcome to Spring Integration! " - + "\n " - + "\n For more information please visit: " - + "\n https://spring.io/projects/spring-integration " - + "\n " - + "\n========================================================="); - - LOGGER.info("\n=========================================================" - + "\n " - + "\n This is the MQTT Sample - " - + "\n " - + "\n Please enter some text and press return. The entered " - + "\n Message will be sent to the configured MQTT topic, " - + "\n then again immediately retrieved from the Message " - + "\n Broker and ultimately printed to the command line. " - + "\n " - + "\n========================================================="); + LOGGER.info(""" + =========================================================\ + Welcome to Spring Integration! \ + + For more information please visit: \ + + https://spring.io/projects/spring-integration \ + \ + ========================================================="""); + + LOGGER.info(""" + =========================================================\ + This is the MQTT Sample - \ + + Please enter some text and press return. The entered \ + Message will be sent to the configured MQTT topic, \ + then again immediately retrieved from the Message \ + Broker and ultimately printed to the command line. \ + + ========================================================="""); SpringApplication.run(Application.class, args); } @Bean - public MqttPahoClientFactory mqttClientFactory() { + public MqttPahoClientFactory mqttClientFactory(@Value("${mqtt.url}") String mqttUrl) { DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory(); MqttConnectOptions options = new MqttConnectOptions(); - options.setServerURIs(new String[]{ "tcp://localhost:1883" }); + options.setServerURIs(new String[] {mqttUrl}); options.setUserName("guest"); options.setPassword("guest".toCharArray()); factory.setConnectionOptions(options); @@ -90,17 +92,17 @@ public MqttPahoClientFactory mqttClientFactory() { // publisher @Bean - public IntegrationFlow mqttOutFlow() { + public IntegrationFlow mqttOutFlow(MessageHandler mqttOutbound) { return IntegrationFlow.from(CharacterStreamReadingMessageSource.stdin(), e -> e.poller(Pollers.fixedDelay(1000))) .transform(p -> p + " sent to MQTT") - .handle(mqttOutbound()) + .handle(mqttOutbound) .get(); } @Bean - public MessageHandler mqttOutbound() { - MqttPahoMessageHandler messageHandler = new MqttPahoMessageHandler("siSamplePublisher", mqttClientFactory()); + public MessageHandler mqttOutbound(MqttPahoClientFactory mqttClientFactory) { + MqttPahoMessageHandler messageHandler = new MqttPahoMessageHandler("siSamplePublisher", mqttClientFactory); messageHandler.setAsync(true); messageHandler.setDefaultTopic("siSampleTopic"); return messageHandler; @@ -109,8 +111,8 @@ public MessageHandler mqttOutbound() { // consumer @Bean - public IntegrationFlow mqttInFlow() { - return IntegrationFlow.from(mqttInbound()) + public IntegrationFlow mqttInFlow(MessageProducerSupport mqttInbound) { + return IntegrationFlow.from(mqttInbound) .transform(p -> p + ", received from MQTT") .handle(logger()) .get(); @@ -123,9 +125,9 @@ private LoggingHandler logger() { } @Bean - public MessageProducerSupport mqttInbound() { + public MessageProducerSupport mqttInbound(MqttPahoClientFactory mqttClientFactory) { MqttPahoMessageDrivenChannelAdapter adapter = new MqttPahoMessageDrivenChannelAdapter("siSampleConsumer", - mqttClientFactory(), "siSampleTopic"); + mqttClientFactory, "siSampleTopic"); adapter.setCompletionTimeout(5000); adapter.setConverter(new DefaultPahoMessageConverter()); adapter.setQos(1); diff --git a/basic/mqtt/src/main/resources/application.properties b/basic/mqtt/src/main/resources/application.properties new file mode 100644 index 000000000..33c5628fc --- /dev/null +++ b/basic/mqtt/src/main/resources/application.properties @@ -0,0 +1 @@ +mqtt.url=tcp://localhost:1883 \ No newline at end of file diff --git a/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/ApplicationTest.java b/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/ApplicationTest.java index a0007409c..810fc76a6 100644 --- a/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/ApplicationTest.java +++ b/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/ApplicationTest.java @@ -16,18 +16,10 @@ package org.springframework.integration.samples.mqtt; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.verify; -import static org.springframework.integration.test.mock.MockIntegration.messageArgumentCaptor; -import static org.springframework.integration.test.mock.MockIntegration.mockMessageHandler; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.springframework.beans.factory.annotation.Autowired; @@ -38,7 +30,14 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.DynamicPropertyRegistry; +import org.springframework.test.context.DynamicPropertySource; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.verify; +import static org.springframework.integration.test.mock.MockIntegration.messageArgumentCaptor; +import static org.springframework.integration.test.mock.MockIntegration.mockMessageHandler; /** * @author Gary Russell @@ -46,13 +45,9 @@ * @since 5.2 * */ -@RunWith(SpringRunner.class) @SpringBootTest @SpringIntegrationTest -public class ApplicationTest { - - @ClassRule - public static final BrokerRunning brokerRunning = BrokerRunning.isRunning(1883); +public class ApplicationTest implements MosquittoContainerTest { @Autowired private MockIntegrationContext mockIntegrationContext; @@ -60,6 +55,12 @@ public class ApplicationTest { @Autowired private IntegrationFlow mqttOutFlow; + @DynamicPropertySource + static void mqttDbProperties(DynamicPropertyRegistry registry) { + registry.add("mqtt.url", MosquittoContainerTest::mqttUrl); + } + + @Test public void test() throws InterruptedException { ArgumentCaptor> captor = messageArgumentCaptor(); diff --git a/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/BrokerRunning.java b/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/BrokerRunning.java deleted file mode 100644 index 9880ff2c6..000000000 --- a/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/BrokerRunning.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright 2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.samples.mqtt; - -import static org.junit.Assume.assumeNoException; -import static org.junit.Assume.assumeTrue; - -import java.util.HashMap; -import java.util.Map; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.paho.client.mqttv3.IMqttClient; -import org.eclipse.paho.client.mqttv3.MqttException; -import org.junit.rules.TestWatcher; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory; - -/** - * @author Gary Russell - * - * @since 5.2 - * - */ -public class BrokerRunning extends TestWatcher { - - private static final Log logger = LogFactory.getLog(BrokerRunning.class); - - // Static so that we only test once on failure: speeds up test suite - private static final Map brokerOnline = new HashMap<>(); - - private final int port; - - private BrokerRunning(int port) { - this.port = port; - brokerOnline.put(port, true); - } - - @Override - public Statement apply(Statement base, Description description) { - assumeTrue(brokerOnline.get(port)); - String url = "tcp://localhost:" + port; - IMqttClient client = null; - try { - client = new DefaultMqttPahoClientFactory().getClientInstance(url, "junit-" + System.currentTimeMillis()); - client.connect(); - } - catch (MqttException e) { - logger.warn("Tests not running because no broker on " + url + ":", e); - assumeNoException(e); - } - finally { - if (client != null) { - try { - client.disconnect(); - client.close(); - } - catch (MqttException e) { - } - } - } - return super.apply(base, description); - } - - - public static BrokerRunning isRunning(int port) { - return new BrokerRunning(port); - } - -} diff --git a/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/MosquittoContainerTest.java b/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/MosquittoContainerTest.java new file mode 100644 index 000000000..0f7826beb --- /dev/null +++ b/basic/mqtt/src/test/java/org/springframework/integration/samples/mqtt/MosquittoContainerTest.java @@ -0,0 +1,51 @@ +/* + * Copyright 2021-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.samples.mqtt; + +import org.junit.jupiter.api.BeforeAll; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.junit.jupiter.Testcontainers; + +/** + * The base contract for JUnit tests based on the container for MQTT Mosquitto broker. + * The Testcontainers 'reuse' option must be disabled,so, Ryuk container is started + * and will clean all the containers up from this test suite after JVM exit. + * Since the Mosquitto container instance is shared via static property, it is going to be + * started only once per JVM, therefore the target Docker container is reused automatically. + * + * @author Artem Bilan + * + * @since 5.5.5 + */ +@Testcontainers(disabledWithoutDocker = true) +public interface MosquittoContainerTest { + + GenericContainer MOSQUITTO_CONTAINER = + new GenericContainer<>("eclipse-mosquitto:2.0.12") + .withCommand("mosquitto -c /mosquitto-no-auth.conf") + .withExposedPorts(1883); + + @BeforeAll + static void startContainer() { + MOSQUITTO_CONTAINER.start(); + } + + static String mqttUrl() { + return "tcp://localhost:" + MOSQUITTO_CONTAINER.getFirstMappedPort(); + } + +} diff --git a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java index 767786931..2acbeefca 100644 --- a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java +++ b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java @@ -16,11 +16,8 @@ package org.springframework.integration.samples.tcpclientserver; -import static org.junit.Assert.assertEquals; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.endpoint.AbstractEndpoint; @@ -29,9 +26,9 @@ import org.springframework.integration.ip.util.TestingUtilities; import org.springframework.integration.test.context.SpringIntegrationTest; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; /** * Demonstrates the use of a gateway as an entry point into the integration flow. @@ -39,7 +36,7 @@ * to the inbound gateway. In turn the inbound gateway sends the message to an * echo service and the echoed response comes back over tcp and is returned to * the test case for verification. - * + *

* The test uses explicit transformers to convert the byte array payloads to * Strings. * @@ -49,8 +46,7 @@ * */ // This one uses transformers -@ContextConfiguration("/META-INF/spring/integration/tcpClientServerDemo-context.xml") -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig(locations = "/META-INF/spring/integration/tcpClientServerDemo-context.xml") @DirtiesContext @SpringIntegrationTest(noAutoStartup = "outGateway") public class TcpClientServerDemoTest { @@ -67,7 +63,7 @@ public class TcpClientServerDemoTest { @Autowired AbstractEndpoint outGateway; - @Before + @BeforeEach public void setup() { if (!this.outGateway.isRunning()) { TestingUtilities.waitListening(this.crLfServer, 10000L); @@ -80,21 +76,21 @@ public void setup() { public void testHappyDay() { String result = gw.send("Hello world!"); System.out.println(result); - assertEquals("echo:Hello world!", result); + assertThat(result).isEqualTo("echo:Hello world!"); } @Test public void testZeroLength() { String result = gw.send(""); System.out.println(result); - assertEquals("echo:", result); + assertThat(result).isEqualTo("echo:"); } @Test public void testFail() { String result = gw.send("FAIL"); System.out.println(result); - assertEquals("FAIL:Failure Demonstration", result); + assertThat(result).isEqualTo("FAIL:Failure Demonstration"); } } diff --git a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoWithConversionServiceTest.java b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoWithConversionServiceTest.java index 509283bcb..a50c95894 100644 --- a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoWithConversionServiceTest.java +++ b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoWithConversionServiceTest.java @@ -16,11 +16,8 @@ package org.springframework.integration.samples.tcpclientserver; -import static org.junit.Assert.assertEquals; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.endpoint.AbstractEndpoint; @@ -29,9 +26,9 @@ import org.springframework.integration.ip.util.TestingUtilities; import org.springframework.integration.test.context.SpringIntegrationTest; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; /** * Demonstrates the use of a gateway as an entry point into the integration flow. @@ -39,7 +36,7 @@ * to the inbound gateway. In turn the inbound gateway sends the message to an * echo service and the echoed response comes back over tcp and is returned to * the test case for verification. - * + *

* This version shows how the conversion service can be used * instead of explicit transformers to convert the byte array payloads to * Strings. @@ -49,8 +46,7 @@ * @author Artme Bilan * */ -@ContextConfiguration("/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml") -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig(locations = "/META-INF/spring/integration/tcpClientServerDemo-conversion-context.xml") @DirtiesContext @SpringIntegrationTest(noAutoStartup = "outGateway") public class TcpClientServerDemoWithConversionServiceTest { @@ -67,7 +63,7 @@ public class TcpClientServerDemoWithConversionServiceTest { @Autowired AbstractEndpoint outGateway; - @Before + @BeforeEach public void setup() { if (!this.outGateway.isRunning()) { TestingUtilities.waitListening(this.crLfServer, 10000L); @@ -80,21 +76,21 @@ public void setup() { public void testHappyDay() { String result = gw.send("Hello world!"); System.out.println(result); - assertEquals("echo:Hello world!", result); + assertThat(result).isEqualTo("echo:Hello world!"); } @Test public void testZeroLength() { String result = gw.send(""); System.out.println(result); - assertEquals("echo:", result); + assertThat(result).isEqualTo("echo:"); } @Test public void testFail() { String result = gw.send("FAIL"); System.out.println(result); - assertEquals("FAIL:Failure Demonstration", result); + assertThat(result).isEqualTo("FAIL:Failure Demonstration"); } } diff --git a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerConnectionDeserializeTest.java b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerConnectionDeserializeTest.java index 827e8c30f..1d10e5313 100644 --- a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerConnectionDeserializeTest.java +++ b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerConnectionDeserializeTest.java @@ -16,13 +16,10 @@ package org.springframework.integration.samples.tcpclientserver; -import static org.junit.Assert.assertEquals; - import java.io.StringWriter; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -37,8 +34,9 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.SubscribableChannel; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; + +import static org.assertj.core.api.Assertions.assertThat; /** * Shows an example of using the Stx/Etx stream framing serializers that are included with @@ -52,8 +50,7 @@ * @author Gunnar Hillert * @author Artem Bilan */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration("/META-INF/spring/integration/tcpServerConnectionDeserialize-context.xml") +@SpringJUnitConfig(locations = "/META-INF/spring/integration/tcpServerConnectionDeserialize-context.xml") @DirtiesContext @SpringIntegrationTest(noAutoStartup = "outGateway") public class TcpServerConnectionDeserializeTest { @@ -74,8 +71,7 @@ public class TcpServerConnectionDeserializeTest { @Autowired AbstractEndpoint outGateway; - - @Before + @BeforeEach public void setup() { if (!this.outGateway.isRunning()) { TestingUtilities.waitListening(this.crLfServer, 10000L); @@ -100,7 +96,7 @@ protected Object handleRequestMessage(Message requestMessage) { // we assert during the processing of the messaging that the // payload is just the content we wanted to send without the // framing bytes (STX/ETX) - assertEquals("Hello World!", new String(payload)); + assertThat(payload).asString().isEqualTo("Hello World!"); return requestMessage; } }); @@ -108,15 +104,13 @@ protected Object handleRequestMessage(Message requestMessage) { String sourceMessage = wrapWithStxEtx("Hello World!"); String result = gw.send(sourceMessage); System.out.println(result); - assertEquals("Hello World!", result); + assertThat(result).isEqualTo("Hello World!"); } /** * Show, explicitly, how the stream would look if you had to manually create it. - * * See more about TCP synchronous communication for more about framing the stream * with STX/ETX: https://en.wikipedia.org/wiki/Binary_Synchronous_Communications - * * @param content * @return a string that is wrapped with the STX/ETX framing bytes */ diff --git a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerCustomSerializerTest.java b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerCustomSerializerTest.java index 96719750f..64761bd72 100644 --- a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerCustomSerializerTest.java +++ b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpServerCustomSerializerTest.java @@ -16,9 +16,6 @@ package org.springframework.integration.samples.tcpclientserver; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; @@ -29,9 +26,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -42,8 +38,10 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.SubscribableChannel; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; /** * Some use cases may dictate you needing to create your own stream handling serializers @@ -57,8 +55,7 @@ * @author Artem Bilan * */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration("/META-INF/spring/integration/tcpServerCustomSerialize-context.xml") +@SpringJUnitConfig(locations = "/META-INF/spring/integration/tcpServerCustomSerialize-context.xml") @DirtiesContext public class TcpServerCustomSerializerTest { @@ -71,7 +68,7 @@ public class TcpServerCustomSerializerTest { @Autowired AbstractServerConnectionFactory serverConnectionFactory; - @Before + @BeforeEach public void setup() { TestingUtilities.waitListening(this.serverConnectionFactory, 10000L); } @@ -92,9 +89,9 @@ protected Object handleRequestMessage(Message requestMessage) { // we assert during the processing of the messaging that the // payload is just the content we wanted to send without the // framing bytes (STX/ETX) - assertEquals(123, payload.getNumber()); - assertEquals("PINGPONG02", payload.getSender()); - assertEquals("You got it to work!", payload.getMessage()); + assertThat(payload.getNumber()).isEqualTo(123); + assertThat(payload.getSender()).isEqualTo("PINGPONG02"); + assertThat(payload.getMessage()).isEqualTo("You got it to work!"); return requestMessage; } }); @@ -121,7 +118,7 @@ protected Object handleRequestMessage(Message requestMessage) { } String response = str.toString(); - assertEquals(sourceMessage, response); + assertThat(response).isEqualTo(sourceMessage); } catch (IOException e) { diff --git a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitter.java b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitter.java index bd31e7b6f..a329605b6 100644 --- a/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitter.java +++ b/basic/testing-examples/src/main/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitter.java @@ -33,10 +33,10 @@ public class CommaDelimitedSplitter { @Splitter public List split(String input) { String[] splits = input.split(","); - List list = new ArrayList(); + List list = new ArrayList<>(); for (String split : splits) { String trimmed = split.trim(); - if (trimmed.length() > 0) { + if (!trimmed.isEmpty()) { list.add(trimmed); } } diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests.java index c30e0886d..cba27ffc5 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/aggregator/CommaDelimitedAggregatorTests.java @@ -13,27 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.samples.testing.aggregator; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; +package org.springframework.integration.samples.testing.aggregator; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.assertj.core.api.HamcrestCondition; +import org.junit.jupiter.api.Test; + import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.samples.testing.splitter.CommaDelimitedSplitter; import org.springframework.integration.support.MessageBuilder; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; /** * @@ -46,11 +44,13 @@ * facilitate easy testing. * * @author Gary Russell + * @author Artem Bilan + * * @since 2.0.2 * */ -@ContextConfiguration // default context name is -context.xml -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig +@DirtiesContext public class CommaDelimitedAggregatorTests { @Autowired @@ -63,64 +63,62 @@ public class CommaDelimitedAggregatorTests { public void unitTestClass3() { List splits = new CommaDelimitedSplitter().split(" a , b, c "); String out = new CommaDelimitedAggregator().aggregate(splits); - assertEquals("a,b,c", out); + assertThat(out).isEqualTo("a,b,c"); } @Test public void unitTestClass2() { List splits = new CommaDelimitedSplitter().split(" a ,, c "); String out = new CommaDelimitedAggregator().aggregate(splits); - assertEquals("a,c", out); + assertThat(out).isEqualTo("a,c"); } @Test public void unitTestClass0() { List splits = new CommaDelimitedSplitter().split(",,, ,, ,, ,,"); String out = new CommaDelimitedAggregator().aggregate(splits); - assertNull(out); + assertThat(out).isNull(); } @Test public void testOne() { inputChannel.send(MessageBuilder.withPayload(" a ").build()); Message outMessage = testChannel.receive(0); - assertNotNull(outMessage); - assertThat(outMessage, hasPayload("A")); + assertThat(outMessage).is(new HamcrestCondition<>(hasPayload("A"))); outMessage = testChannel.receive(0); - assertNull("Only one message expected", outMessage); + assertThat(outMessage).isNull(); } @Test public void testTwo() { inputChannel.send(MessageBuilder.withPayload(" a ,z ").build()); Message outMessage = testChannel.receive(0); - assertNotNull(outMessage); - assertThat(outMessage, hasPayload("A,Z")); + assertThat(outMessage).is(new HamcrestCondition<>(hasPayload("A,Z"))); outMessage = testChannel.receive(0); - assertNull("Only one message expected", outMessage); + assertThat(outMessage).isNull(); } @Test public void testSkipEmpty() { inputChannel.send(MessageBuilder.withPayload(" a ,,z ").build()); Message outMessage = testChannel.receive(0); - assertNotNull(outMessage); - assertThat(outMessage, hasPayload("A,Z")); + assertThat(outMessage).is(new HamcrestCondition<>(hasPayload("A,Z"))); outMessage = testChannel.receive(0); - assertNull("Only one message expected", outMessage); + assertThat(outMessage).isNull(); } @Test public void testNone() { inputChannel.send(MessageBuilder.withPayload(" ,, ,,, ,,,,, ,,,,,,, ").build()); Message outMessage = testChannel.receive(0); - assertNull("No messages expected", outMessage); + assertThat(outMessage).isNull(); } @Test public void testEmpty() { inputChannel.send(MessageBuilder.withPayload("").build()); Message outMessage = testChannel.receive(0); - assertNull("No messages expected", outMessage); + assertThat(outMessage).isNull(); } + } diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/chain/SpelChainTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/chain/SpelChainTests.java index 3d83479a5..5ea0d26f1 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/chain/SpelChainTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/chain/SpelChainTests.java @@ -15,54 +15,51 @@ */ package org.springframework.integration.samples.testing.chain; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import org.junit.jupiter.api.Test; -import org.junit.Test; -import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; /** - * + * * Shows how to test a chain of endpoints that use SpEL expressions. * The chain has direct input and output channels. The chain would * be a fragment of a larger flow. Since the output channel is direct, * it has no subscribers outside the context of a larger flow. So, * in this test case, we bridge it to a {@link QueueChannel} to * facilitate easy testing. - * + * * @author Gary Russell + * @author Artem Bilan + * * @since 2.0.2 * */ -@ContextConfiguration // default context name is -context.xml -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig public class SpelChainTests { - + @Autowired MessageChannel inputChannel; - + @Autowired QueueChannel testChannel; - + @Test public void testTrueHeader() { String payload = "XXXABCXXX"; Message message = MessageBuilder.withPayload(payload).build(); inputChannel.send(message); Message outMessage = testChannel.receive(0); - assertNotNull("Expected an output message", outMessage); + assertThat(outMessage).isNotNull(); Object myHeader = outMessage.getHeaders().get("myHeader"); - assertNotNull("Expecter myHeader header", myHeader); - assertEquals("Expected myHeader==true", Boolean.TRUE, myHeader); - assertEquals("Expected lower case message", payload.toLowerCase(), outMessage.getPayload()); + assertThat(myHeader).isEqualTo(Boolean.TRUE); + assertThat(outMessage.getPayload()).isEqualTo(payload.toLowerCase()); } @Test @@ -71,11 +68,10 @@ public void testFalseHeader() { Message message = MessageBuilder.withPayload(payload).build(); inputChannel.send(message); Message outMessage = testChannel.receive(0); - assertNotNull("Expected an output message", outMessage); + assertThat(outMessage).isNotNull(); Object myHeader = outMessage.getHeaders().get("myHeader"); - assertNotNull("Expecter myHeader header", myHeader); - assertEquals("Expected myHeader==false", Boolean.FALSE, myHeader); - assertEquals("Expected lower case message", payload.toLowerCase(), outMessage.getPayload()); + assertThat(myHeader).isEqualTo(Boolean.FALSE); + assertThat(outMessage.getPayload()).isEqualTo(payload.toLowerCase()); } } diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/errorhandling/GatewayTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/errorhandling/GatewayTests.java index d6ed0c0e4..7b40119e0 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/errorhandling/GatewayTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/errorhandling/GatewayTests.java @@ -15,24 +15,19 @@ */ package org.springframework.integration.samples.testing.errorhandling; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import org.junit.jupiter.api.Test; -import org.junit.Test; -import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.Message; -import org.springframework.messaging.MessageHandlingException; -import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.samples.testing.gateway.VoidGateway; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandlingException; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; /** - * + * * Shows how to test a gateway to ensure the message injected * into the Spring Integration flow is what we expected. * The gateway uses a direct input channel. The configuration would @@ -40,30 +35,34 @@ * it has no subscribers outside the context of a larger flow. So, * in this test case, we bridge it to a {@link QueueChannel} to * facilitate easy testing. - * + * * @author Gary Russell + * @author Artem Bilan + * * @since 2.0.2 * */ -@ContextConfiguration // default context name is -context.xml -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig public class GatewayTests { - + @Autowired QueueChannel testChannel; - + @Autowired VoidGateway gateway; - + @Test public void testTrueHeader() { String payload = "XXXABCXXX"; String fileName = "abc.txt"; gateway.process(payload, fileName); Message errorMessage = testChannel.receive(0); - assertNotNull("Expected an error message", errorMessage); - assertEquals(payload, ((MessagingException) errorMessage.getPayload()).getFailedMessage().getPayload()); - Throwable cause = ((MessagingException) errorMessage.getPayload()).getCause(); - assertTrue("Expected exception, got:" + cause, cause instanceof MessageHandlingException); + assertThat(errorMessage) + .extracting("payload.failedMessage.payload") + .isEqualTo(payload); + assertThat(errorMessage) + .extracting("payload.cause") + .isInstanceOf(MessageHandlingException.class); } + } diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/externalgateway/ExternalGatewaySubstitutionTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/externalgateway/ExternalGatewaySubstitutionTests.java index 25410b2f6..0e0cd74dd 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/externalgateway/ExternalGatewaySubstitutionTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/externalgateway/ExternalGatewaySubstitutionTests.java @@ -15,42 +15,38 @@ */ package org.springframework.integration.samples.testing.externalgateway; -import static org.junit.Assert.assertEquals; - import java.util.Collections; -import java.util.Iterator; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; + import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; /** * Shows how to stub-out external outbound-gateways with service activators * enabling isolated and repeatable testing. - * + * * @author Gary Russell + * @author Artem Bilan + * * @since 2.0.2 * */ -@ContextConfiguration // default context name is -context.xml -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig public class ExternalGatewaySubstitutionTests { - + @Autowired WeatherAndTraffic weatherAndTraffic; - + @Test public void doTest() { - List results = weatherAndTraffic.getByZip("12345"); - assertEquals(2, results.size()); + List results = this.weatherAndTraffic.getByZip("12345"); Collections.sort(results); - Iterator result = results.iterator(); - assertEquals("Dummy traffic for zip:12345", result.next()); - assertEquals("Dummy weather for zip:12345", result.next()); + assertThat(results) + .containsExactly("Dummy traffic for zip:12345", "Dummy weather for zip:12345"); } } diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests.java index cfc4132db..30d90fef7 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/filter/PetFilterTests.java @@ -15,41 +15,36 @@ */ package org.springframework.integration.samples.testing.filter; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; +import org.assertj.core.api.HamcrestCondition; +import org.junit.jupiter.api.Test; -import org.junit.Test; -import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; /** - * * Shows how to test a filter. * The filter has direct input and output channels. The filter configuration would * be a fragment of a larger flow. Since the output channel is direct, * it has no subscribers outside the context of a larger flow. So, * in this test case, we bridge it to a {@link QueueChannel} to * facilitate easy testing. - * + *

* Similarly, we bridge the discard channel which is configured on the second * filter instance. * * @author Gary Russell + * @author Artem Bilan + * * @since 2.0.2 */ -@ContextConfiguration // default context name is -context.xml -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig public class PetFilterTests { @Autowired @@ -70,19 +65,19 @@ public class PetFilterTests { @Test public void unitTestClassCat() { String payload = "CAT:Fluffy"; - assertFalse(new PetFilter().dogsOnly(payload)); + assertThat(new PetFilter().dogsOnly(payload)).isFalse(); } @Test public void unitTestClassDog() { String payload = "DOG:Fido"; - assertTrue(new PetFilter().dogsOnly(payload)); + assertThat(new PetFilter().dogsOnly(payload)).isTrue(); } @Test public void unitTestClassLizard() { String payload = "LIZARD:Scaly"; - assertFalse(new PetFilter().dogsOnly(payload)); + assertThat(new PetFilter().dogsOnly(payload)).isFalse(); } @Test @@ -91,7 +86,7 @@ public void testCat() { Message message = MessageBuilder.withPayload(payload).build(); inputChannel.send(message); Message outMessage = testChannel.receive(0); - assertNull("Expected no output message", outMessage); + assertThat(outMessage).isNull(); } @Test @@ -100,8 +95,7 @@ public void testDog() { Message message = MessageBuilder.withPayload(payload).build(); inputChannel.send(message); Message outMessage = testChannel.receive(0); - assertNotNull("Expected an output message", outMessage); - assertThat(outMessage, hasPayload(payload)); + assertThat(outMessage).is(new HamcrestCondition<>(hasPayload(payload))); } @Test @@ -110,7 +104,7 @@ public void testLizard() { Message message = MessageBuilder.withPayload(payload).build(); inputChannel.send(message); Message outMessage = testChannel.receive(0); - assertNull("Expected no output message", outMessage); + assertThat(outMessage).isNull(); } @Test @@ -119,10 +113,9 @@ public void testCatDiscard() { Message message = MessageBuilder.withPayload(payload).build(); inputChannel2.send(message); Message outMessage = testChannel2.receive(0); - assertNull("Expected no output message", outMessage); + assertThat(outMessage).isNull(); outMessage = testDiscardChannel2.receive(0); - assertNotNull("Expected discard message", outMessage); - assertThat(outMessage, hasPayload(payload)); + assertThat(outMessage).is(new HamcrestCondition<>(hasPayload(payload))); } @Test @@ -131,10 +124,9 @@ public void testDogDiscard() { Message message = MessageBuilder.withPayload(payload).build(); inputChannel2.send(message); Message outMessage = testChannel.receive(0); - assertNotNull("Expected an output message", outMessage); - assertThat(outMessage, hasPayload(payload)); + assertThat(outMessage).is(new HamcrestCondition<>(hasPayload(payload))); outMessage = testDiscardChannel2.receive(0); - assertNull("Expected no discard message", outMessage); + assertThat(outMessage).isNull(); } @Test @@ -143,9 +135,9 @@ public void testLizardDiscard() { Message message = MessageBuilder.withPayload(payload).build(); inputChannel2.send(message); Message outMessage = testChannel.receive(0); - assertNull("Expected no output message", outMessage); + assertThat(outMessage).isNull(); outMessage = testDiscardChannel2.receive(0); - assertNotNull("Expected discard message", outMessage); - assertThat(outMessage, hasPayload(payload)); + assertThat(outMessage).is(new HamcrestCondition<>(hasPayload(payload))); } + } diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests.java index b7ae14def..ec7bd6492 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/gateway/GatewayTests.java @@ -15,20 +15,18 @@ */ package org.springframework.integration.samples.testing.gateway; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.springframework.integration.test.matcher.HeaderMatcher.hasHeader; -import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; +import org.assertj.core.api.HamcrestCondition; +import org.junit.jupiter.api.Test; -import org.junit.Test; -import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.file.FileHeaders; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.messaging.Message; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.integration.test.matcher.HeaderMatcher.hasHeader; +import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; /** * @@ -41,11 +39,12 @@ * facilitate easy testing. * * @author Gary Russell + * @author Artem Bilan + * * @since 2.0.2 * */ -@ContextConfiguration // default context name is -context.xml -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig public class GatewayTests { @Autowired @@ -60,9 +59,10 @@ public void testTrueHeader() { String fileName = "abc.txt"; gateway.process(payload, fileName); Message inMessage = testChannel.receive(0); - assertNotNull("Expected a message", inMessage); - assertThat(inMessage, hasPayload(payload)); - assertThat(inMessage, hasHeader("configuredHeader", "abc")); - assertThat(inMessage, hasHeader(FileHeaders.FILENAME, fileName)); + assertThat(inMessage) + .is(new HamcrestCondition<>(hasPayload(payload))) + .is(new HamcrestCondition<>(hasHeader("configuredHeader", "abc"))) + .is(new HamcrestCondition<>(hasHeader(FileHeaders.FILENAME, fileName))); } + } diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests.java index 26440ab2a..448ee39dc 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/router/PetRouterTests.java @@ -13,23 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.testing.router; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; +import org.assertj.core.api.HamcrestCondition; +import org.junit.jupiter.api.Test; -import org.junit.Test; -import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; /** * @@ -41,10 +39,11 @@ * facilitate easy testing. * * @author Gary Russell + * @author Artem Bilan + * * @since 2.0.2 */ -@ContextConfiguration // default context name is -context.xml -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig public class PetRouterTests { @Autowired @@ -62,19 +61,19 @@ public class PetRouterTests { @Test public void unitTestClassCat() { String payload = "CAT:Fluffy"; - assertEquals("felineChannel", new PetRouter().route(payload)); + assertThat(new PetRouter().route(payload)).isEqualTo("felineChannel"); } @Test public void unitTestClassDog() { String payload = "DOG:Fido"; - assertEquals("canineChannel", new PetRouter().route(payload)); + assertThat(new PetRouter().route(payload)).isEqualTo("canineChannel"); } @Test public void unitTestClassLizard() { String payload = "LIZARD:Scaly"; - assertEquals("unknownPetTypeChannel", new PetRouter().route(payload)); + assertThat(new PetRouter().route(payload)).isEqualTo("unknownPetTypeChannel"); } @Test @@ -83,8 +82,7 @@ public void testCat() { Message message = MessageBuilder.withPayload(payload).build(); inputChannel.send(message); Message outMessage = testFelineChannel.receive(0); - assertNotNull("Expected an output message", outMessage); - assertThat(outMessage, hasPayload(payload)); + assertThat(outMessage).is(new HamcrestCondition<>(hasPayload(payload))); } @Test @@ -93,8 +91,7 @@ public void testDog() { Message message = MessageBuilder.withPayload(payload).build(); inputChannel.send(message); Message outMessage = testCanineChannel.receive(0); - assertNotNull("Expected an output message", outMessage); - assertThat(outMessage, hasPayload(payload)); + assertThat(outMessage).is(new HamcrestCondition<>(hasPayload(payload))); } @Test @@ -103,7 +100,7 @@ public void testLizard() { Message message = MessageBuilder.withPayload(payload).build(); inputChannel.send(message); Message outMessage = testUnknownPetTypeChannel.receive(0); - assertNotNull("Expected an output message", outMessage); - assertThat(outMessage, hasPayload(payload)); + assertThat(outMessage).is(new HamcrestCondition<>(hasPayload(payload))); } + } diff --git a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests.java b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests.java index e51dec19c..2bd0fbe4d 100644 --- a/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests.java +++ b/basic/testing-examples/src/test/java/org/springframework/integration/samples/testing/splitter/CommaDelimitedSplitterTests.java @@ -13,29 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.samples.testing.splitter; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; +package org.springframework.integration.samples.testing.splitter; import java.util.List; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.assertj.core.api.HamcrestCondition; +import org.junit.jupiter.api.Test; + import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; /** - * * Shows how to test a custom splitter. Unit test for the class and * tests for the integration subflow. * The splitter has direct input and output channels. The splitter would @@ -45,11 +41,12 @@ * facilitate easy testing. * * @author Gary Russell + * @author Artem Bilan + * * @since 2.0.2 * */ -@ContextConfiguration // default context name is -context.xml -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig public class CommaDelimitedSplitterTests { @Autowired @@ -61,73 +58,64 @@ public class CommaDelimitedSplitterTests { @Test public void unitTestClass3() { List splits = new CommaDelimitedSplitter().split(" a , b, c "); - assertEquals("Expected 3 splits", 3, splits.size()); - assertEquals("a", splits.get(0)); - assertEquals("b", splits.get(1)); - assertEquals("c", splits.get(2)); + assertThat(splits).containsExactly("a", "b", "c"); } @Test public void unitTestClass2() { List splits = new CommaDelimitedSplitter().split(" a ,, c "); - assertEquals("Expected 2 splits", 2, splits.size()); - assertEquals("a", splits.get(0)); - assertEquals("c", splits.get(1)); + assertThat(splits).containsExactly("a", "c"); } @Test public void unitTestClass0() { List splits = new CommaDelimitedSplitter().split(",,, ,, ,, ,,"); - assertEquals("Expected 0 splits", 0, splits.size()); + assertThat(splits).isEmpty(); } @Test public void testOne() { inputChannel.send(MessageBuilder.withPayload(" a ").build()); Message outMessage = testChannel.receive(0); - assertNotNull(outMessage); - assertThat(outMessage, hasPayload("a")); + assertThat(outMessage).is(new HamcrestCondition<>(hasPayload("a"))); outMessage = testChannel.receive(0); - assertNull("Only one message expected", outMessage); + assertThat(outMessage).isNull(); } @Test public void testTwo() { inputChannel.send(MessageBuilder.withPayload(" a ,z ").build()); Message outMessage = testChannel.receive(0); - assertNotNull(outMessage); - assertThat(outMessage, hasPayload("a")); + assertThat(outMessage).is(new HamcrestCondition<>(hasPayload("a"))); outMessage = testChannel.receive(0); - assertNotNull(outMessage); - assertThat(outMessage, hasPayload("z")); + assertThat(outMessage).is(new HamcrestCondition<>(hasPayload("z"))); outMessage = testChannel.receive(0); - assertNull("Only two messages expected", outMessage); + assertThat(outMessage).isNull(); } @Test public void testSkipEmpty() { inputChannel.send(MessageBuilder.withPayload(" a ,,z ").build()); Message outMessage = testChannel.receive(0); - assertNotNull(outMessage); - assertThat(outMessage, hasPayload("a")); + assertThat(outMessage).is(new HamcrestCondition<>(hasPayload("a"))); outMessage = testChannel.receive(0); - assertNotNull(outMessage); - assertThat(outMessage, hasPayload("z")); + assertThat(outMessage).is(new HamcrestCondition<>(hasPayload("z"))); outMessage = testChannel.receive(0); - assertNull("Only two messages expected", outMessage); + assertThat(outMessage).isNull(); } @Test public void testNone() { inputChannel.send(MessageBuilder.withPayload(" ,, ,,, ,,,,, ,,,,,,, ").build()); Message outMessage = testChannel.receive(0); - assertNull("No messages expected", outMessage); + assertThat(outMessage).isNull(); } @Test public void testEmpty() { inputChannel.send(MessageBuilder.withPayload("").build()); Message outMessage = testChannel.receive(0); - assertNull("No messages expected", outMessage); + assertThat(outMessage).isNull(); } + } diff --git a/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java b/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java index f839cf388..0a198bf9a 100644 --- a/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java +++ b/basic/web-sockets/src/main/java/org/springframework/integration/samples/websocket/standard/server/Application.java @@ -45,6 +45,8 @@ import org.springframework.messaging.MessageHandler; import org.springframework.messaging.simp.SimpMessageHeaderAccessor; import org.springframework.messaging.support.GenericMessage; +import org.springframework.web.socket.server.HandshakeHandler; +import org.springframework.web.socket.server.support.DefaultHandshakeHandler; /** * @author Artem Bilan @@ -63,14 +65,19 @@ public static void main(String[] args) throws Exception { } @Bean - public ServerWebSocketContainer serverWebSocketContainer() { - return new ServerWebSocketContainer("/time").withSockJs(); + public DefaultHandshakeHandler handshakeHandler() { + return new DefaultHandshakeHandler(); + } + + @Bean + public ServerWebSocketContainer serverWebSocketContainer(HandshakeHandler handshakeHandler) { + return new ServerWebSocketContainer("/time").setHandshakeHandler(handshakeHandler).withSockJs(); } @Bean @InboundChannelAdapter(value = "splitChannel", poller = @Poller(fixedDelay = "1000", maxMessagesPerPoll = "1")) - public MessageSource webSocketSessionsMessageSource() { - return () -> new GenericMessage<>(serverWebSocketContainer().getSessions().keySet().iterator()); + public MessageSource webSocketSessionsMessageSource(ServerWebSocketContainer serverWebSocketContainer) { + return () -> new GenericMessage<>(serverWebSocketContainer.getSessions().keySet().iterator()); } @Bean @@ -120,8 +127,8 @@ public MessageChannel sendTimeChannel() { @Bean @ServiceActivator(inputChannel = "sendTimeChannel") - public MessageHandler webSocketOutboundAdapter() { - return new WebSocketOutboundMessageHandler(serverWebSocketContainer()); + public MessageHandler webSocketOutboundAdapter(ServerWebSocketContainer serverWebSocketContainer) { + return new WebSocketOutboundMessageHandler(serverWebSocketContainer); } @Bean diff --git a/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java index 201db3af6..49208a640 100644 --- a/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java +++ b/basic/web-sockets/src/test/java/org/springframework/integration/samples/websocket/standard/ApplicationTests.java @@ -16,23 +16,16 @@ package org.springframework.integration.samples.websocket.standard; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.hamcrest.Matchers.instanceOf; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.text.DateFormat; import java.text.ParseException; import java.util.Date; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.boot.web.server.test.LocalServerPort; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.DirectChannel; @@ -40,14 +33,16 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.support.ChannelInterceptor; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; /** * @author Artem Bilan * @author Gary Russell + * * @since 3.0 */ -@RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class) public class ApplicationTests { @@ -68,7 +63,7 @@ public void testWebSockets() throws InterruptedException { @Override public void postSend(Message message, MessageChannel channel, boolean sent) { Object payload = message.getPayload(); - assertThat(payload, instanceOf(String.class)); + assertThat(payload).isInstanceOf(String.class); Date date = null; try { date = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.DEFAULT).parse((String) payload); @@ -76,12 +71,12 @@ public void postSend(Message message, MessageChannel channel, boolean sent) { catch (ParseException e) { fail("fail to parse date"); } - assertThat(new Date().compareTo(date), greaterThanOrEqualTo(0)); + assertThat(date).isBefore(new Date()); stopLatch.countDown(); } }); - assertTrue(stopLatch.await(10, TimeUnit.SECONDS)); + assertThat(stopLatch.await(10, TimeUnit.SECONDS)).isTrue(); ctx.close(); } diff --git a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java index 5126fef0c..ef2a52ca4 100644 --- a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java +++ b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java @@ -16,11 +16,6 @@ package org.springframework.integration.samples.ws; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; - import java.io.StringReader; import javax.xml.parsers.DocumentBuilder; @@ -29,30 +24,31 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; -import org.hamcrest.CoreMatchers; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.ws.SimpleWebServiceInboundGateway; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.ws.context.DefaultMessageContext; import org.springframework.ws.context.MessageContext; import org.springframework.ws.pox.dom.DomPoxMessage; import org.springframework.ws.pox.dom.DomPoxMessageFactory; +import static org.assertj.core.api.Assertions.assertThat; + /** * Out-of-container tests for ws:inbound-gateway message processing. * - * @author Chris Beams * @author Mark Fisher + * @author Chris Beams + * @author Artem Bilan */ -@ContextConfiguration("/META-INF/spring/integration/inbound-gateway-config.xml") -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig(locations = "/META-INF/spring/integration/inbound-gateway-config.xml") +@DirtiesContext public class InboundGatewayTests { @Autowired @@ -78,9 +74,10 @@ public void testSendAndReceive() throws Exception { MessageContext messageContext = new DefaultMessageContext(request, messageFactory); gateway.invoke(messageContext); Object reply = messageContext.getResponse().getPayloadSource(); - assertThat(reply, is(instanceOf(DOMSource.class))); + assertThat(reply).isInstanceOf(DOMSource.class); DOMSource replySource = (DOMSource) reply; Element element = (Element) replySource.getNode().getFirstChild(); - assertThat(element.getTagName(), equalTo("echoResponse")); + assertThat(element.getTagName()).isEqualTo("echoResponse"); } + } diff --git a/build.gradle b/build.gradle index 8085bdccb..9a36cccd8 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { maven { url 'https://repo.spring.io/snapshot' } } dependencies { - classpath 'io.spring.gradle:dependency-management-plugin:1.1.5' + classpath 'io.spring.gradle:dependency-management-plugin:1.1.7' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" classpath 'org.gretty:gretty:4.0.3' } @@ -30,7 +30,6 @@ allprojects { group = 'org.springframework.integration.samples' repositories { - mavenLocal() mavenCentral() maven { url 'https://repo.spring.io/milestone' } maven { url 'https://repo.spring.io/snapshot' } @@ -213,52 +212,52 @@ subprojects { subproject -> ext { artemisVersion = '2.41.0' - aspectjVersion = '1.9.22.1' + aspectjVersion = '1.9.24' commonsDigesterVersion = '2.1' - commonsDbcpVersion = '2.12.0' + commonsDbcpVersion = '2.13.0' commonsFileUploadVersion = '1.6.0' - commonsIoVersion = '2.16.1' - commonsLangVersion = '3.12.0' - commonsPoolVersion = '2.11.1' - c3p0Version = '0.9.5.5' + commonsIoVersion = '2.19.0' + commonsLangVersion = '3.18.0' + commonsPoolVersion = '2.12.1' + c3p0Version = '0.11.2' derbyVersion = '10.16.1.1' hamcrestVersion = '2.2' - hibernateVersion = '6.5.2.Final' - hibernateValidatorVersion = '8.0.0.Final' - ftpServerVersion = '1.2.0' - flexjsonVersion = '2.0' - graalvmVersion = '24.0.2' - groovyVersion = '4.0.23' - hsqldbVersion = '2.7.3' - h2Version = '2.2.224' - jacksonVersion = '2.18.0' + hibernateVersion = '7.0.4.Final' + hibernateValidatorVersion = '9.0.1.Final' + ftpServerVersion = '1.2.1' + flexjsonVersion = '3.3' + graalvmVersion = '24.2.1' + groovyVersion = '4.0.27' + hsqldbVersion = '2.7.4' + h2Version = '2.3.232' + jacksonVersion = '2.19.1' + jackson3Version = '3.0.0-rc5' jaxbVersion = '4.0.5' - jodaTimeVersion = '1.6' - jtaVersion = '2.0.0' - jtdsVersion = '1.2.6' + jodaTimeVersion = '2.14.0' + jtaVersion = '2.0.1' + jtdsVersion = '1.3.1' jmsApiVersion = '3.1.0' - jrubyVersion = '9.4.7.0' - jpaApiVersion = '3.1.0' + jrubyVersion = '10.0.0.1' + jpaApiVersion = '3.2.0' jstlVersion = '1.2' junitVersion = '4.13.2' - junitJupiterVersion = '5.11.1' - log4jVersion = '2.23.1' + junitJupiterVersion = '5.12.2' + log4jVersion = '2.24.3' mailVersion = '2.0.3' - mockitoVersion = '5.12.0' - mongoDriverVersion = '5.1.1' - openJpaVersion = '2.4.0' - oracleDriverVersion = '23.3.0.23.09' - postgresVersion = '42.7.3' - slf4jVersion = '1.7.30' - springCloudVersion = '2024.0.0' - springIntegrationVersion = '6.5.0-SNAPSHOT' + mockitoVersion = '5.18.0' + mongoDriverVersion = '5.5.1' + oracleDriverVersion = '23.8.0.25.04' + postgresVersion = '42.7.7' + slf4jVersion = '2.0.17' + springCloudVersion = '2025.0.0' + springIntegrationVersion = '7.0.0-SNAPSHOT' set('spring-integration.version', "$springIntegrationVersion") springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' - springVersion = '6.2.1' - springSecurityVersion = '6.5.0-SNAPSHOT' + springVersion = '7.0.0-SNAPSHOT' + springSecurityVersion = '7.0.0-SNAPSHOT' springWebFlowVersion = '3.0.0' - testcontainersVersion = '1.19.8' + testcontainersVersion = '1.21.3' tilesJspVersion = '2.2.1' } @@ -271,6 +270,7 @@ subprojects { subproject -> mavenBom "org.springframework.integration:spring-integration-bom:$springIntegrationVersion" mavenBom "org.springframework:spring-framework-bom:$springVersion" mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonVersion" + mavenBom "tools.jackson:jackson-bom:$jackson3Version" mavenBom "org.junit:junit-bom:$junitJupiterVersion" } } @@ -441,12 +441,14 @@ project('loanshark') { api "jakarta.transaction:jakarta.transaction-api:$jtaVersion" api "org.hsqldb:hsqldb:$hsqldbVersion" api "net.sf.flexjson:flexjson:$flexjsonVersion" - api "org.hibernate:hibernate-validator:$hibernateValidatorVersion" + api "org.hibernate.validator:hibernate-validator:$hibernateValidatorVersion" api "jakarta.persistence:jakarta.persistence-api:$jpaApiVersion" api "org.hibernate.orm:hibernate-core:$hibernateVersion" api "org.springframework.webflow:spring-js-resources:$springWebFlowVersion" api "org.slf4j:slf4j-api:$slf4jVersion" + + runtimeOnly 'org.glassfish.expressly:expressly:6.0.0' runtimeOnly "org.apache.logging.log4j:log4j-core:$log4jVersion" runtimeOnly "org.slf4j:slf4j-log4j12:$slf4jVersion" runtimeOnly "org.slf4j:jcl-over-slf4j:$slf4jVersion" @@ -642,6 +644,7 @@ project('kafka') { dependencies { api 'org.springframework.boot:spring-boot-starter-integration' + api 'org.springframework.boot:spring-boot-kafka' api('org.springframework.integration:spring-integration-kafka') { exclude group: 'org.slf4j' } @@ -675,6 +678,7 @@ project('mqtt') { testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation "org.springframework.integration:spring-integration-test" + testImplementation "org.testcontainers:junit-jupiter:$testcontainersVersion" } springBoot { @@ -1387,6 +1391,7 @@ project('web-sockets') { dependencies { api 'org.springframework.boot:spring-boot-starter-websocket' + api 'org.springframework.boot:spring-boot-integration' api "org.springframework.integration:spring-integration-websocket" testImplementation 'org.springframework.boot:spring-boot-starter-test' @@ -1431,6 +1436,7 @@ project('kafka-dsl') { dependencies { api 'org.springframework.boot:spring-boot-starter-integration' + api 'org.springframework.boot:spring-boot-kafka' api 'org.springframework.integration:spring-integration-core' api 'org.springframework.integration:spring-integration-kafka' api "org.apache.logging.log4j:log4j-core:$log4jVersion" @@ -1458,6 +1464,7 @@ project('file-split-ftp') { dependencies { api 'org.springframework.boot:spring-boot-starter-web' + api 'org.springframework.boot:spring-boot-starter-mail' api 'org.springframework.boot:spring-boot-starter-integration' api 'org.springframework.integration:spring-integration-ftp' api 'org.springframework.integration:spring-integration-http' diff --git a/dsl/cafe-dsl/src/test/java/org/springframework/integration/samples/dsl/cafe/ApplicationTests.java b/dsl/cafe-dsl/src/test/java/org/springframework/integration/samples/dsl/cafe/ApplicationTests.java index fb477e9cc..d05df4aeb 100644 --- a/dsl/cafe-dsl/src/test/java/org/springframework/integration/samples/dsl/cafe/ApplicationTests.java +++ b/dsl/cafe-dsl/src/test/java/org/springframework/integration/samples/dsl/cafe/ApplicationTests.java @@ -16,18 +16,16 @@ package org.springframework.integration.samples.dsl.cafe; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.integration.samples.dsl.cafe.lambda.Application; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * @author Artem Bilan + * * @since 3.0 */ -@RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = Application.class) public class ApplicationTests { diff --git a/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java b/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java index b6888d247..a78bf7de8 100644 --- a/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java +++ b/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java @@ -24,7 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.boot.kafka.autoconfigure.KafkaProperties; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ConfigurableApplicationContext; @@ -137,7 +137,7 @@ public NewTopic newTopic(KafkaAppProperties properties) { private KafkaProperties kafkaProperties; public void addAnotherListenerForTopics(String... topics) { - Map consumerProperties = kafkaProperties.buildConsumerProperties(null); + Map consumerProperties = kafkaProperties.buildConsumerProperties(); // change the group id, so we don't revoke the other partitions. consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, consumerProperties.get(ConsumerConfig.GROUP_ID_CONFIG) + "x"); diff --git a/gradle.properties b/gradle.properties index 0c120f667..b6b9682ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -version=6.5.0 -springBootVersion=3.5.0-SNAPSHOT +version=7.0.0 +springBootVersion=4.0.0-SNAPSHOT org.gradle.jvmargs=-Xmx1536M -Dfile.encoding=UTF-8 org.gradle.caching=true org.gradle.parallel=true diff --git a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java index ef86913bf..cb7df88be 100644 --- a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java +++ b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java @@ -16,10 +16,7 @@ package org.springframework.integration.samples.async.gateway; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.junit.Assert.assertTrue; - +import java.util.Objects; import java.util.Random; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -27,8 +24,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Test; -import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -43,18 +38,22 @@ import org.springframework.integration.config.EnableIntegration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gary Russell + * @author Artem Bilan * */ @ContextConfiguration(classes = MonoGatewayTests.TestConfig.class) -@RunWith(SpringJUnit4ClassRunner.class) +@SpringJUnitConfig @DirtiesContext public class MonoGatewayTests { @@ -80,7 +79,7 @@ public void testMonoGateway() throws Exception { final int number = numbers[i]; gateway.multiplyByTwo(number) .subscribeOn(Schedulers.boundedElastic()) - .filter(p -> p != null) + .filter(Objects::nonNull) .doOnNext(result1 -> { logger.info("Result of multiplication of " + number + " by 2 is " + result1); latch.countDown(); @@ -90,8 +89,8 @@ public void testMonoGateway() throws Exception { logger.error("Unexpected exception for " + number, t); }).subscribe(); } - assertTrue(latch.await(60, TimeUnit.SECONDS)); - assertThat(failures.get(), greaterThanOrEqualTo(0)); + assertThat(latch.await(60, TimeUnit.SECONDS)).isTrue(); + assertThat(failures.get()).isGreaterThanOrEqualTo(0); logger.info("Finished"); } diff --git a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/JaxbJacksonObjectMapper.java b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/JaxbJacksonObjectMapper.java index 28aaeeb3f..cbb9d960a 100644 --- a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/JaxbJacksonObjectMapper.java +++ b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/JaxbJacksonObjectMapper.java @@ -41,6 +41,7 @@ public class JaxbJacksonObjectMapper extends ObjectMapper { * Annotation introspector to use for serialization process * is configured separately for serialization and deserialization purposes */ + @SuppressWarnings("this-escape") public JaxbJacksonObjectMapper() { final AnnotationIntrospector introspector = new JacksonAnnotationIntrospector(); diff --git a/intermediate/tcp-async-bi-directional/src/test/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplicationTests.java b/intermediate/tcp-async-bi-directional/src/test/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplicationTests.java index d6a50af11..71b7cf783 100644 --- a/intermediate/tcp-async-bi-directional/src/test/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplicationTests.java +++ b/intermediate/tcp-async-bi-directional/src/test/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplicationTests.java @@ -68,7 +68,6 @@ void testBothReceive() throws InterruptedException { this.serverIn.addInterceptor(new ChannelInterceptor() { @Override - @Nullable public Message preSend(Message message, MessageChannel channel) { serverLatch.countDown(); return message; @@ -78,7 +77,6 @@ public Message preSend(Message message, MessageChannel channel) { this.client1In.addInterceptor(new ChannelInterceptor() { @Override - @Nullable public Message preSend(Message message, MessageChannel channel) { client1Latch.countDown(); return message; @@ -88,7 +86,6 @@ public Message preSend(Message message, MessageChannel channel) { this.client2In.addInterceptor(new ChannelInterceptor() { @Override - @Nullable public Message preSend(Message message, MessageChannel channel) { client2Latch.countDown(); return message; diff --git a/intermediate/travel/src/test/java/org/springframework/integration/samples/travel/TravelGatewayTest.java b/intermediate/travel/src/test/java/org/springframework/integration/samples/travel/TravelGatewayTest.java index b34fe3683..a796c95e0 100644 --- a/intermediate/travel/src/test/java/org/springframework/integration/samples/travel/TravelGatewayTest.java +++ b/intermediate/travel/src/test/java/org/springframework/integration/samples/travel/TravelGatewayTest.java @@ -17,14 +17,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; + +import static org.assertj.core.api.Assertions.assertThat; /** * This test will test the weather service (does not require an API key). @@ -34,11 +33,10 @@ * @since 2.2 * */ -@ContextConfiguration({ - "classpath:META-INF/spring/integration-context.xml", - "classpath:META-INF/spring/integration-ws-context.xml"}) -@RunWith(SpringJUnit4ClassRunner.class) -@Ignore("The target WeatherWS is unreliable (INTSAMPLES-145), so uncomment if you'd like to test the real interaction") +@SpringJUnitConfig(locations = { + "classpath:META-INF/spring/integration-context.xml", + "classpath:META-INF/spring/integration-ws-context.xml"}) +@Disabled("The target WeatherWS is unreliable (INTSAMPLES-145), so uncomment if you'd like to test the real interaction") public class TravelGatewayTest { private static final Log LOGGER = LogFactory.getLog(TravelGatewayTest.class); @@ -50,7 +48,7 @@ public class TravelGatewayTest { public void testGetWeatherByCity() { final String weatherInformation = travelGateway.getWeatherByCity(City.ATLANTA); LOGGER.info("Weather information for Atlanta:\n\n" + weatherInformation + "\n\n"); - Assert.assertNotNull(weatherInformation); + assertThat(weatherInformation).isNotNull(); } } diff --git a/settings.gradle b/settings.gradle index ba19732ab..0bb5a6d74 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,6 +2,8 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() + maven { url 'https://repo.spring.io/milestone' } + maven { url 'https://repo.spring.io/snapshot' } } } From d903d9b1483dd6b23259a3bf954436f20615abcc Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 14 Jul 2025 13:16:03 -0400 Subject: [PATCH 353/356] Generate POMs for fresh dependencies --- advanced/advanced-testing-examples/pom.xml | 21 ++++-- advanced/dynamic-ftp/pom.xml | 21 ++++-- advanced/dynamic-tcp-client/pom.xml | 23 ++++--- applications/cafe-scripted/pom.xml | 29 +++++---- applications/cafe/cafe-amqp/pom.xml | 23 ++++--- applications/cafe/cafe-jms/pom.xml | 23 ++++--- applications/cafe/cafe-si/pom.xml | 21 ++++-- applications/file-split-ftp/pom.xml | 28 +++++--- applications/loan-broker/pom.xml | 21 ++++-- applications/loanshark/pom.xml | 65 +++++++++++++------ applications/stomp-chat/pom.xml | 23 ++++--- basic/amqp/pom.xml | 23 ++++--- basic/barrier/pom.xml | 23 ++++--- basic/control-bus/pom.xml | 21 ++++-- basic/enricher/pom.xml | 23 ++++--- basic/feed/pom.xml | 21 ++++-- basic/file/pom.xml | 21 ++++-- basic/ftp/pom.xml | 29 +++++---- basic/helloworld/pom.xml | 21 ++++-- basic/http/pom.xml | 23 ++++--- basic/jdbc/pom.xml | 23 ++++--- basic/jms/pom.xml | 21 ++++-- basic/jmx/pom.xml | 21 ++++-- basic/jpa/pom.xml | 27 +++++--- basic/kafka/pom.xml | 30 ++++++--- basic/mail/pom.xml | 21 ++++-- basic/mongodb/pom.xml | 23 ++++--- basic/mqtt/pom.xml | 29 ++++++--- basic/oddeven/pom.xml | 21 ++++-- basic/quote/pom.xml | 21 ++++-- basic/sftp/pom.xml | 21 ++++-- basic/tcp-amqp/pom.xml | 25 ++++--- basic/tcp-broadcast/pom.xml | 23 ++++--- basic/tcp-client-server/pom.xml | 23 ++++--- basic/tcp-with-headers/pom.xml | 23 ++++--- basic/testing-examples/pom.xml | 21 ++++-- basic/twitter/pom.xml | 21 ++++-- basic/web-sockets/pom.xml | 28 +++++--- basic/ws-inbound-gateway/pom.xml | 21 ++++-- basic/ws-outbound-gateway/pom.xml | 21 ++++-- basic/xml/pom.xml | 21 ++++-- basic/xmpp/pom.xml | 21 ++++-- basic/zip/pom.xml | 21 ++++-- dsl/cafe-dsl/pom.xml | 25 ++++--- dsl/kafka-dsl/pom.xml | 30 ++++++--- dsl/si4demo/pom.xml | 23 ++++--- intermediate/async-gateway/pom.xml | 21 ++++-- intermediate/dynamic-poller/pom.xml | 21 ++++-- intermediate/errorhandling/pom.xml | 21 ++++-- intermediate/file-processing/pom.xml | 21 ++++-- intermediate/mail-attachments/pom.xml | 23 ++++--- intermediate/monitoring/pom.xml | 21 ++++-- intermediate/multipart-http/pom.xml | 23 ++++--- intermediate/rest-http/pom.xml | 25 ++++--- intermediate/retry-and-more/pom.xml | 23 ++++--- .../splitter-aggregator-reaper/pom.xml | 21 ++++-- intermediate/stored-procedures-derby/pom.xml | 21 ++++-- intermediate/stored-procedures-ms/pom.xml | 25 ++++--- intermediate/stored-procedures-oracle/pom.xml | 23 ++++--- .../stored-procedures-postgresql/pom.xml | 27 +++++--- intermediate/tcp-async-bi-directional/pom.xml | 23 ++++--- .../tcp-client-server-multiplex/pom.xml | 21 ++++-- intermediate/testcontainers-rabbitmq/pom.xml | 27 +++++--- intermediate/travel/pom.xml | 21 ++++-- intermediate/tx-synch/pom.xml | 23 ++++--- 65 files changed, 1018 insertions(+), 521 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index dddf8fed6..5d84d71d0 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples advanced-testing-examples - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -123,28 +123,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index fbd65851d..d4612db8d 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-ftp - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index df29d304e..31abff612 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-tcp-client - 6.5.0 + 7.0.0 jar https://github.com/spring-projects/spring-integration-samples @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -117,35 +117,42 @@ org.springframework.boot spring-boot-dependencies - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT import pom org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom @@ -165,7 +172,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 349f6a808..b6fd8e5c8 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-scripted - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -75,31 +75,31 @@ org.jruby jruby-complete - 9.4.7.0 + 10.0.0.1 compile org.graalvm.sdk graal-sdk - 24.0.2 + 24.2.1 compile org.graalvm.polyglot python - 24.0.2 + 24.2.1 compile org.apache.groovy groovy-jsr223 - 4.0.23 + 4.0.27 compile org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -117,7 +117,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -151,28 +151,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index c3fd3fe56..63ba29e99 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-amqp - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -55,7 +55,7 @@ org.springframework.integration.samples cafe-si - 6.5.0 + 7.0.0 compile @@ -66,7 +66,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -118,28 +118,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 0f1da9ee3..0f73debbf 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-jms - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -55,7 +55,7 @@ org.springframework.integration.samples cafe-si - 6.5.0 + 7.0.0 compile @@ -90,7 +90,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -108,7 +108,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -142,28 +142,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index bf69f6b46..1c8fb88f2 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-si - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -117,28 +117,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index b0e18cf4e..96171e685 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file-split-ftp - 6.5.0 + 7.0.0 jar https://github.com/spring-projects/spring-integration-samples @@ -58,6 +58,11 @@ spring-boot-starter-web compile + + org.springframework.boot + spring-boot-starter-mail + compile + org.springframework.boot spring-boot-starter-integration @@ -99,7 +104,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -144,35 +149,42 @@ org.springframework.boot spring-boot-dependencies - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT import pom org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom @@ -192,7 +204,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index 9e6fb1868..cc87eaeac 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loan-broker - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 49191265d..24b81d94b 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples loanshark - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -80,7 +80,7 @@ org.aspectj aspectjtools - 1.9.22.1 + 1.9.24 compile @@ -107,7 +107,7 @@ org.apache.commons commons-dbcp2 - 2.12.0 + 2.13.0 compile @@ -119,7 +119,7 @@ org.apache.commons commons-pool2 - 2.11.1 + 2.12.1 compile @@ -131,43 +131,43 @@ joda-time joda-time - 1.6 + 2.14.0 compile jakarta.transaction jakarta.transaction-api - 2.0.0 + 2.0.1 compile org.hsqldb hsqldb - 2.7.3 + 2.7.4 compile net.sf.flexjson flexjson - 2.0 + 3.3 compile - org.hibernate + org.hibernate.validator hibernate-validator - 8.0.0.Final + 9.0.1.Final compile jakarta.persistence jakarta.persistence-api - 3.1.0 + 3.2.0 compile org.hibernate.orm hibernate-core - 6.5.2.Final + 7.0.4.Final compile @@ -179,7 +179,7 @@ org.slf4j slf4j-api - 1.7.30 + 2.0.17 compile @@ -214,10 +214,26 @@ + + org.glassfish.expressly + expressly + 6.0.0 + runtime + + + * + spring-boot-starter-tomcat + + + * + spring-boot-starter-jetty + + + org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 runtime @@ -233,7 +249,7 @@ org.slf4j slf4j-log4j12 - 1.7.30 + 2.0.17 runtime @@ -249,7 +265,7 @@ org.slf4j jcl-over-slf4j - 1.7.30 + 2.0.17 runtime @@ -277,7 +293,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -311,28 +327,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 216745ec5..35b13da81 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stomp-chat - 6.5.0 + 7.0.0 jar https://github.com/spring-projects/spring-integration-samples @@ -88,7 +88,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -127,35 +127,42 @@ org.springframework.boot spring-boot-dependencies - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT import pom org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom @@ -175,7 +182,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 3f2413395..656cfeefc 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples amqp - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,13 +65,13 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile org.slf4j slf4j-jcl - 1.7.30 + 2.0.17 runtime @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -123,28 +123,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index d572b2e49..599b1e4d7 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples barrier - 6.5.0 + 7.0.0 jar https://github.com/spring-projects/spring-integration-samples @@ -93,7 +93,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -137,35 +137,42 @@ org.springframework.boot spring-boot-dependencies - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT import pom org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom @@ -185,7 +192,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 0c3faeb98..9ff3003af 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples control-bus - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 570f84503..7c2307166 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples enricher - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,13 +60,13 @@ com.h2database h2 - 2.2.224 + 2.3.232 compile org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -118,28 +118,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index c12d4ea10..0939121d2 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples feed - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 9be3b8dbb..f1b86215c 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 49eb01c75..7452eefcb 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ftp - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,25 +60,25 @@ commons-io commons-io - 2.16.1 + 2.19.0 compile org.apache.ftpserver ftpserver-core - 1.2.0 + 1.2.1 compile org.slf4j slf4j-api - 1.7.30 + 2.0.17 compile org.slf4j slf4j-log4j12 - 1.7.30 + 2.0.17 runtime @@ -96,7 +96,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,7 +112,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 test @@ -136,28 +136,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 8bdf0f729..e50028395 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples helloworld - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index d8dcc7d65..5505dde09 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples http - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -76,7 +76,7 @@ commons-io commons-io - 2.16.1 + 2.19.0 compile @@ -88,7 +88,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -138,7 +138,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -172,28 +172,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 8428b7c80..4c57428d1 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jdbc - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,13 +60,13 @@ com.h2database h2 - 2.2.224 + 2.3.232 compile org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -118,28 +118,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index a3c85c2cd..71b861fe5 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jms - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -89,7 +89,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -107,7 +107,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -141,28 +141,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 087273830..64ac74e45 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jmx - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -117,28 +117,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 5487bef2f..a951e0a25 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples jpa - 6.5.0 + 7.0.0 jar https://github.com/spring-projects/spring-integration-samples @@ -66,7 +66,7 @@ com.h2database h2 - 2.2.224 + 2.3.232 compile @@ -77,7 +77,7 @@ jakarta.persistence jakarta.persistence-api - 3.1.0 + 3.2.0 runtime @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -134,35 +134,42 @@ org.springframework.boot spring-boot-dependencies - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT import pom org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom @@ -182,7 +189,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 79a3f998c..996cebcc5 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples kafka - 6.5.0 + 7.0.0 jar https://github.com/spring-projects/spring-integration-samples @@ -58,6 +58,11 @@ spring-boot-starter-integration compile + + org.springframework.boot + spring-boot-kafka + compile + org.springframework.integration spring-integration-kafka @@ -77,7 +82,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -95,7 +100,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -134,35 +139,42 @@ org.springframework.boot spring-boot-dependencies - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT import pom org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom @@ -182,7 +194,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index a97d8c910..a49ee6761 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -123,28 +123,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 01410b9fa..72cdcd1c3 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mongodb - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,13 +60,13 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile org.mongodb mongodb-driver-sync - 5.1.1 + 5.5.1 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -118,28 +118,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 1feb473d1..132db54f1 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mqtt - 6.5.0 + 7.0.0 jar https://github.com/spring-projects/spring-integration-samples @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -107,6 +107,12 @@ spring-boot-starter-test test + + org.testcontainers + junit-jupiter + 1.21.3 + test + org.junit.jupiter junit-jupiter-engine @@ -128,35 +134,42 @@ org.springframework.boot spring-boot-dependencies - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT import pom org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom @@ -176,7 +189,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 3fb1bc5b7..09b14f8f2 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples oddeven - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 7a852427e..79b9751a8 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples quote - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 338a707ed..6abe154aa 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples sftp - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 495b89738..2cc2709e8 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-amqp - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,19 +65,19 @@ org.slf4j slf4j-api - 1.7.30 + 2.0.17 compile org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 runtime org.slf4j slf4j-log4j12 - 1.7.30 + 2.0.17 runtime @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -129,28 +129,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index fa9cf6c74..6c7dc6a18 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-broadcast - 6.5.0 + 7.0.0 jar https://github.com/spring-projects/spring-integration-samples @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -122,35 +122,42 @@ org.springframework.boot spring-boot-dependencies - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT import pom org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom @@ -170,7 +177,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 271b76ce1..9ab61b6c9 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.commons commons-lang3 - 3.12.0 + 3.18.0 compile @@ -71,7 +71,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -123,28 +123,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 93ea73848..da0260c9d 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-with-headers - 6.5.0 + 7.0.0 jar https://github.com/spring-projects/spring-integration-samples @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -122,35 +122,42 @@ org.springframework.boot spring-boot-dependencies - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT import pom org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom @@ -170,7 +177,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index d993b4d51..a7e8fec9d 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testing-examples - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -75,7 +75,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -93,7 +93,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -127,28 +127,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 8ce443ae1..77b37af8e 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples twitter - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -61,7 +61,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -113,28 +113,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index dadde4cb8..0e82dba14 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples web-sockets - 6.5.0 + 7.0.0 jar https://github.com/spring-projects/spring-integration-samples @@ -58,6 +58,11 @@ spring-boot-starter-websocket compile + + org.springframework.boot + spring-boot-integration + compile + org.springframework.integration spring-integration-websocket @@ -78,7 +83,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -117,35 +122,42 @@ org.springframework.boot spring-boot-dependencies - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT import pom org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom @@ -165,7 +177,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 33949f86b..8680bf9fc 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-inbound-gateway - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -70,7 +70,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -120,7 +120,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -154,28 +154,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index a15ccda43..d763dfdfd 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples ws-outbound-gateway - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,7 +65,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -117,28 +117,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 6d751e8a4..7daf75b79 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xml - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index a6ef3d5e6..5eb128a2b 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples xmpp - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/basic/zip/pom.xml b/basic/zip/pom.xml index 4992b0604..26f9de848 100644 --- a/basic/zip/pom.xml +++ b/basic/zip/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples zip - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-slf4j2-impl - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index ab8c80251..583ad2fe8 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples cafe-dsl - 6.5.0 + 7.0.0 jar https://github.com/spring-projects/spring-integration-samples @@ -56,7 +56,7 @@ org.springframework.integration.samples cafe-si - 6.5.0 + 7.0.0 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -128,35 +128,42 @@ org.springframework.boot spring-boot-dependencies - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT import pom org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom @@ -176,7 +183,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index c63908dbd..5cc0b9925 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples kafka-dsl - 6.5.0 + 7.0.0 jar https://github.com/spring-projects/spring-integration-samples @@ -58,6 +58,11 @@ spring-boot-starter-integration compile + + org.springframework.boot + spring-boot-kafka + compile + org.springframework.integration spring-integration-core @@ -71,7 +76,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -89,7 +94,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -128,35 +133,42 @@ org.springframework.boot spring-boot-dependencies - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT import pom org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom @@ -176,7 +188,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 574d6267e..4ec1c2240 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples si4demo - 6.5.0 + 7.0.0 jar https://github.com/spring-projects/spring-integration-samples @@ -111,7 +111,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -150,35 +150,42 @@ org.springframework.boot spring-boot-dependencies - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT import pom org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom @@ -198,7 +205,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 2b2a27ce7..196c395c2 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples async-gateway - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 1a41c4e49..e8740959f 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples dynamic-poller - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index d6ae0a3e0..67c24cb66 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples errorhandling - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 591bfc480..26b0b5859 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples file-processing - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index c92edbe86..b18fa9c25 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples mail-attachments - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -71,13 +71,13 @@ commons-io commons-io - 2.16.1 + 2.19.0 compile org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -95,7 +95,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -129,28 +129,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 1748a4aac..b86a363bf 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples monitoring - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -82,7 +82,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -132,7 +132,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -166,28 +166,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 58f77e2af..325b0291d 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples multipart-http - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -76,13 +76,13 @@ commons-io commons-io - 2.16.1 + 2.19.0 compile org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -132,7 +132,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -166,28 +166,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index c8ef62d18..a68b978e5 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples rest-http - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -95,19 +95,19 @@ org.springframework.security spring-security-web - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT compile org.springframework.security spring-security-config - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT compile org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -163,7 +163,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -197,28 +197,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 9f316eee1..0a411929b 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples retry-and-more - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -75,7 +75,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 compile @@ -93,7 +93,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -111,7 +111,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -145,28 +145,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 4c45a558f..e836e247f 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples splitter-aggregator-reaper - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 56f44d337..315ec0c24 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-derby - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -72,7 +72,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -90,7 +90,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -124,28 +124,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 3d2315878..e392b31cd 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-ms - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,19 +60,19 @@ net.sourceforge.jtds jtds - 1.2.6 + 1.3.1 compile com.mchange c3p0 - 0.9.5.5 + 0.11.2 compile org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -90,7 +90,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -124,28 +124,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 872e3ccc7..1cab25746 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-oracle - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,13 +60,13 @@ com.oracle.database.jdbc ojdbc11 - 23.3.0.23.09 + 23.8.0.25.04 compile org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -84,7 +84,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -118,28 +118,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 258ed2805..91d85f324 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples stored-procedures-postgresql - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,25 +60,25 @@ org.postgresql postgresql - 42.7.3 + 42.7.7 compile org.apache.commons commons-dbcp2 - 2.12.0 + 2.13.0 compile org.apache.commons commons-pool2 - 2.11.1 + 2.12.1 compile org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -96,7 +96,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -130,28 +130,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index e9cbf6e2c..2dc7e9274 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-async-bi-directional - 6.5.0 + 7.0.0 jar https://github.com/spring-projects/spring-integration-samples @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -117,35 +117,42 @@ org.springframework.boot spring-boot-dependencies - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT import pom org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom @@ -165,7 +172,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 2f4dca2b0..39f2eff79 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tcp-client-server-multiplex - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -60,7 +60,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -78,7 +78,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -112,28 +112,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index d1feb652a..984182730 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples testcontainers-rabbitmq - 6.5.0 + 7.0.0 jar https://github.com/spring-projects/spring-integration-samples @@ -83,7 +83,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -114,7 +114,7 @@ org.testcontainers junit-jupiter - 1.19.8 + 1.21.3 test @@ -144,42 +144,49 @@ org.springframework.cloud spring-cloud-dependencies - 2024.0.0 + 2025.0.0 import pom org.springframework.boot spring-boot-dependencies - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT import pom org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom @@ -199,7 +206,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.0-SNAPSHOT + 4.0.0-SNAPSHOT diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index a905d3652..fa268982a 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples travel - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -70,7 +70,7 @@ org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -88,7 +88,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -122,28 +122,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 280990899..1257b2e1d 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.integration.samples tx-synch - 6.5.0 + 7.0.0 https://github.com/spring-projects/spring-integration-samples Spring IO @@ -65,13 +65,13 @@ com.h2database h2 - 2.2.224 + 2.3.232 compile org.apache.logging.log4j log4j-core - 2.23.1 + 2.24.3 compile @@ -89,7 +89,7 @@ org.mockito mockito-core - 5.12.0 + 5.18.0 test @@ -123,28 +123,35 @@ org.junit junit-bom - 5.11.1 + 5.12.2 + import + pom + + + tools.jackson + jackson-bom + 3.0.0-rc5 import pom com.fasterxml.jackson jackson-bom - 2.18.0 + 2.19.1 import pom org.springframework spring-framework-bom - 6.2.1 + 7.0.0-SNAPSHOT import pom org.springframework.integration spring-integration-bom - 6.5.0-SNAPSHOT + 7.0.0-SNAPSHOT import pom From f1532cca611ed6a54d131d594469b24ac1817928 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 14 Jul 2025 13:23:28 -0400 Subject: [PATCH 354/356] Some fixes for GHA workflows * Use the `main` "version" for reusable workflow in the `pr-build.yml` * Use `java-version: 24` input for `spring-io/spring-gradle-build-action` * Fix Develocity evn var for the proper `DEVELOCITY_ACCESS_KEY` --- .github/workflows/ci-snapshot.yml | 7 +++---- .github/workflows/pr-build.yml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-snapshot.yml b/.github/workflows/ci-snapshot.yml index 6d803ab7f..22ecb4dc5 100644 --- a/.github/workflows/ci-snapshot.yml +++ b/.github/workflows/ci-snapshot.yml @@ -5,12 +5,9 @@ on: push: branches: - main - - 6.1.x env: - GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }} - GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }} - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} jobs: build_snapshot: @@ -24,6 +21,8 @@ jobs: - name: Set up Gradle uses: spring-io/spring-gradle-build-action@v2 + with: + java-version: 24 - name: Build run: ./gradlew check diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index e1fde2fe0..e5457892c 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -7,4 +7,4 @@ on: jobs: build-pull-request: - uses: spring-io/spring-github-workflows/.github/workflows/spring-gradle-pull-request-build.yml@v3 + uses: spring-io/spring-github-workflows/.github/workflows/spring-gradle-pull-request-build.yml@main From a906643a50f4f848d856af514ce7e8016eac6b6d Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 14 Jul 2025 15:28:47 -0400 Subject: [PATCH 355/356] Remove JUnit 4 dependency * Rework remaining JUnit 4 tests to JUnit Jupiter * Migrate used yet JUnit 4 assertions to AssertJ * Re-generate POMs to reflect JUnit 4 removal --- advanced/advanced-testing-examples/pom.xml | 11 -- advanced/dynamic-ftp/pom.xml | 11 -- .../DynamicFtpChannelResolver.java | 2 +- .../DynamicFtpChannelResolverTests.java | 17 +-- .../FtpOutboundChannelAdapterSampleTests.java | 94 ++++++++++++++++ .../ftp/FtpOutboundChannelAdapterSample.java | 104 ------------------ ...tpOutboundChannelAdapterSample-context.xml | 2 +- advanced/dynamic-tcp-client/pom.xml | 11 -- applications/cafe-scripted/pom.xml | 11 -- applications/cafe/cafe-amqp/pom.xml | 11 -- applications/cafe/cafe-jms/pom.xml | 11 -- applications/cafe/cafe-si/pom.xml | 11 -- applications/file-split-ftp/pom.xml | 11 -- applications/loan-broker/pom.xml | 11 -- applications/loanshark/pom.xml | 11 -- applications/stomp-chat/pom.xml | 11 -- .../chat/stomp/server/ApplicationTests.java | 8 +- basic/amqp/pom.xml | 11 -- basic/barrier/pom.xml | 11 -- basic/control-bus/pom.xml | 11 -- .../controlbus/ControlBusDemoTest.java | 2 +- basic/enricher/pom.xml | 11 -- .../enricher/service/UserServiceTest.java | 19 ++-- basic/feed/pom.xml | 11 -- ...FeedInboundChannelAdapterSampleTests.java} | 13 +-- basic/file/pom.xml | 11 -- .../samples/filecopy/BinaryFileCopyTest.java | 7 +- .../filecopy/FileBasedFileCopyTest.java | 7 +- .../samples/filecopy/TextFileCopyTest.java | 7 +- basic/ftp/README.md | 8 +- basic/ftp/pom.xml | 11 -- .../ftp/{TestSuite.java => BaseFtpTest.java} | 30 ++--- ... FtpInboundChannelAdapterSampleTests.java} | 26 ++--- ... FtpOutboundChannelAdapterSampleTest.java} | 33 +++--- ...ava => FtpOutboundGatewaySampleTests.java} | 22 ++-- ...FtpInboundChannelAdapterSample-context.xml | 2 +- .../FtpOutboundGatewaySample-context.xml | 2 +- basic/helloworld/pom.xml | 11 -- basic/http/pom.xml | 11 -- basic/jdbc/pom.xml | 11 -- .../samples/jdbc/OutboundGatewayTest.java | 9 +- basic/jms/pom.xml | 11 -- .../jms/ActiveMQMultiContextTests.java | 4 +- .../samples/jms/GatewayDemoTest.java | 20 ++-- basic/jmx/pom.xml | 11 -- .../samples/jmx/JmxAdapterDemoTest.java | 2 +- basic/jpa/pom.xml | 11 -- .../integration/samples/jpa/JpaTests.java | 8 +- basic/kafka/pom.xml | 11 -- basic/mail/pom.xml | 11 -- basic/mongodb/pom.xml | 11 -- basic/mqtt/pom.xml | 11 -- basic/oddeven/pom.xml | 11 -- basic/quote/pom.xml | 11 -- .../samples/quote/QuoteDemoTest.java | 3 +- basic/sftp/pom.xml | 11 -- ...ava => SftpInboundReceiveSampleTests.java} | 18 ++- ...va => SftpOutboundGatewaySampleTests.java} | 17 ++- ...a => SftpOutboundTransferSampleTests.java} | 8 +- basic/tcp-amqp/pom.xml | 11 -- basic/tcp-broadcast/pom.xml | 11 -- basic/tcp-client-server/pom.xml | 11 -- .../TcpClientServerAnnotationDemoTest.java | 5 +- basic/tcp-with-headers/pom.xml | 11 -- basic/testing-examples/pom.xml | 11 -- basic/twitter/pom.xml | 11 -- .../samples/twitter/TwitterSearchSample.java | 5 +- .../twitter/TwitterSendUpdatesSample.java | 11 +- .../twitter/TwitterTimelineUpdatesSample.java | 7 +- basic/web-sockets/pom.xml | 11 -- basic/ws-inbound-gateway/pom.xml | 11 -- .../samples/ws/InContainerTests.java | 20 ++-- basic/ws-outbound-gateway/pom.xml | 11 -- basic/xml/pom.xml | 11 -- basic/xmpp/pom.xml | 11 -- .../xmpp/ReceiveInstantMessageSample.java | 9 +- .../xmpp/SendInstantMessageSample.java | 9 +- basic/zip/pom.xml | 11 -- build.gradle | 12 +- dsl/cafe-dsl/pom.xml | 11 -- dsl/kafka-dsl/pom.xml | 11 -- dsl/si4demo/pom.xml | 11 -- .../samples/si4demo/ApplicationTests.java | 5 +- intermediate/async-gateway/pom.xml | 11 -- .../async/gateway/AsyncGatewayTest.java | 38 ++++--- intermediate/dynamic-poller/pom.xml | 11 -- intermediate/errorhandling/pom.xml | 11 -- .../samples/errorhandling/PartyDemoTest.java | 7 +- intermediate/file-processing/pom.xml | 11 -- .../fileprocessing/FileProcessingTest.java | 22 ++-- intermediate/mail-attachments/pom.xml | 11 -- intermediate/monitoring/pom.xml | 11 -- intermediate/multipart-http/pom.xml | 11 -- intermediate/rest-http/pom.xml | 13 +-- .../rest/json/JaxbJacksonObjectMapper.java | 54 --------- .../view/ExtendedMappingJacksonJsonView.java | 49 --------- .../rest/service/EmployeeSearchService.java | 2 +- .../applicationContext-http-int.xml | 8 +- .../samples/rest/RestHttpClientTest.java | 8 +- .../integration/http-outbound-config.xml | 21 ++-- intermediate/retry-and-more/pom.xml | 11 -- .../splitter-aggregator-reaper/pom.xml | 11 -- .../TestSplitterAggregator.java | 21 ++-- intermediate/stored-procedures-derby/pom.xml | 11 -- .../integration/CoffeeServiceFindAllTest.java | 27 ++--- .../CoffeeServiceFindCoffeeTest.java | 26 +++-- .../integration/CoffeeServiceStartupTest.java | 3 +- intermediate/stored-procedures-ms/pom.xml | 11 -- .../samples/StringConversionServiceTest.java | 23 ++-- intermediate/stored-procedures-oracle/pom.xml | 11 -- .../sts/StringConversionServiceTest.java | 6 +- .../stored-procedures-postgresql/pom.xml | 11 -- intermediate/tcp-async-bi-directional/pom.xml | 11 -- .../tcp-client-server-multiplex/pom.xml | 11 -- intermediate/testcontainers-rabbitmq/pom.xml | 11 -- intermediate/travel/pom.xml | 11 -- intermediate/tx-synch/pom.xml | 11 -- 117 files changed, 396 insertions(+), 1213 deletions(-) rename advanced/dynamic-ftp/src/main/java/org/springframework/integration/samples/{ftp => dynamicftp}/DynamicFtpChannelResolver.java (98%) rename advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/{ftp => dynamicftp}/DynamicFtpChannelResolverTests.java (71%) create mode 100644 advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/dynamicftp/FtpOutboundChannelAdapterSampleTests.java delete mode 100644 advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java rename basic/feed/src/test/java/org/springframework/integration/samples/feed/{FeedInboundChannelAdapterSample.java => FeedInboundChannelAdapterSampleTests.java} (85%) rename basic/ftp/src/test/java/org/springframework/integration/samples/ftp/{TestSuite.java => BaseFtpTest.java} (80%) rename basic/ftp/src/test/java/org/springframework/integration/samples/ftp/{FtpInboundChannelAdapterSample.java => FtpInboundChannelAdapterSampleTests.java} (72%) rename basic/ftp/src/test/java/org/springframework/integration/samples/ftp/{FtpOutboundChannelAdapterSample.java => FtpOutboundChannelAdapterSampleTest.java} (74%) rename basic/ftp/src/test/java/org/springframework/integration/samples/ftp/{FtpOutboundGatewaySample.java => FtpOutboundGatewaySampleTests.java} (75%) rename basic/sftp/src/test/java/org/springframework/integration/samples/sftp/{SftpInboundReceiveSample.java => SftpInboundReceiveSampleTests.java} (84%) rename basic/sftp/src/test/java/org/springframework/integration/samples/sftp/{SftpOutboundGatewaySample.java => SftpOutboundGatewaySampleTests.java} (87%) rename basic/sftp/src/test/java/org/springframework/integration/samples/sftp/{SftpOutboundTransferSample.java => SftpOutboundTransferSampleTests.java} (91%) delete mode 100644 intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/JaxbJacksonObjectMapper.java delete mode 100644 intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/view/ExtendedMappingJacksonJsonView.java diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 5d84d71d0..8265adf46 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -74,12 +74,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -112,11 +106,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index d4612db8d..457fda71b 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/advanced/dynamic-ftp/src/main/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolver.java b/advanced/dynamic-ftp/src/main/java/org/springframework/integration/samples/dynamicftp/DynamicFtpChannelResolver.java similarity index 98% rename from advanced/dynamic-ftp/src/main/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolver.java rename to advanced/dynamic-ftp/src/main/java/org/springframework/integration/samples/dynamicftp/DynamicFtpChannelResolver.java index f6a16fc1f..1e4b7c2ef 100644 --- a/advanced/dynamic-ftp/src/main/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolver.java +++ b/advanced/dynamic-ftp/src/main/java/org/springframework/integration/samples/dynamicftp/DynamicFtpChannelResolver.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.samples.ftp; +package org.springframework.integration.samples.dynamicftp; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolverTests.java b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/dynamicftp/DynamicFtpChannelResolverTests.java similarity index 71% rename from advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolverTests.java rename to advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/dynamicftp/DynamicFtpChannelResolverTests.java index 3eb745456..a44b51d86 100644 --- a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/DynamicFtpChannelResolverTests.java +++ b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/dynamicftp/DynamicFtpChannelResolverTests.java @@ -13,13 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.samples.ftp; +package org.springframework.integration.samples.dynamicftp; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import org.springframework.integration.samples.dynamicftp.DynamicFtpChannelResolver; import org.springframework.messaging.MessageChannel; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gary Russell * @since 2.1 @@ -28,18 +30,17 @@ public class DynamicFtpChannelResolverTests { /** - * Test method for {@link org.springframework.integration.samples.ftp.DynamicFtpChannelResolver#resolve(java.lang.String)}. + * Test method for {@link DynamicFtpChannelResolver#resolve(java.lang.String)}. */ @Test public void testResolve() { DynamicFtpChannelResolver dynamicFtpChannelResolver = new DynamicFtpChannelResolver(); MessageChannel channel1 = dynamicFtpChannelResolver.resolve("customer1"); - assertNotNull(channel1); + assertThat(channel1).isNotNull(); MessageChannel channel2 = dynamicFtpChannelResolver.resolve("customer2"); - assertNotNull(channel2); - assertNotSame(channel1, channel2); + assertThat(channel1).isNotSameAs(channel2); MessageChannel channel1a = dynamicFtpChannelResolver.resolve("customer1"); - assertSame(channel1, channel1a); + assertThat(channel1).isSameAs(channel1a); } } diff --git a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/dynamicftp/FtpOutboundChannelAdapterSampleTests.java b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/dynamicftp/FtpOutboundChannelAdapterSampleTests.java new file mode 100644 index 000000000..4f2736a69 --- /dev/null +++ b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/dynamicftp/FtpOutboundChannelAdapterSampleTests.java @@ -0,0 +1,94 @@ +/* + * Copyright 2002-2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.integration.samples.dynamicftp; + +import java.io.File; +import java.net.UnknownHostException; + +import org.junit.jupiter.api.Test; + +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; + +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + +/** + * @author Gary Russell + * @author Amol Nayak + * @author Artem Bilan + * + */ +public class FtpOutboundChannelAdapterSampleTests { + + @Test + public void runDemo() throws Exception { + ConfigurableApplicationContext ctx = + new ClassPathXmlApplicationContext( + "META-INF/spring/integration/DynamicFtpOutboundChannelAdapterSample-context.xml"); + MessageChannel channel = ctx.getBean("toDynRouter", MessageChannel.class); + File file = File.createTempFile("temp", "txt"); + Message message = MessageBuilder.withPayload(file) + .setHeader("customer", "cust1") + .build(); + + assertThatExceptionOfType(MessagingException.class) + .isThrownBy(() -> channel.send(message)) + .withRootCauseInstanceOf(UnknownHostException.class) + .withStackTraceContaining("host.for.cust1"); + + // send another so we can see in the log we don't create the ac again. + assertThatExceptionOfType(MessagingException.class) + .isThrownBy(() -> channel.send(message)) + .withRootCauseInstanceOf(UnknownHostException.class) + .withStackTraceContaining("host.for.cust1"); + + // send to a different customer; again, check the log to see a new ac is built + assertThatExceptionOfType(MessagingException.class) + .isThrownBy(() -> channel.send( + MessageBuilder.withPayload(file) + .setHeader("customer", "cust2") + .build())) + .withRootCauseInstanceOf(UnknownHostException.class) + .withStackTraceContaining("host.for.cust2"); + + // send to a different customer; again, check the log to see a new ac is built + //and the first one created (cust1) should be closed and removed as per the max cache size restriction + assertThatExceptionOfType(MessagingException.class) + .isThrownBy(() -> channel.send( + MessageBuilder.withPayload(file) + .setHeader("customer", "cust3") + .build())) + .withRootCauseInstanceOf(UnknownHostException.class) + .withStackTraceContaining("host.for.cust3"); + + //send to cust1 again, since this one has been invalidated before, we should + //see a new ac created (with ac of cust2 destroyed and removed) + assertThatExceptionOfType(MessagingException.class) + .isThrownBy(() -> channel.send( + MessageBuilder.withPayload(file) + .setHeader("customer", "cust1") + .build())) + .withRootCauseInstanceOf(UnknownHostException.class) + .withStackTraceContaining("host.for.cust1"); + + ctx.close(); + } + +} diff --git a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java b/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java deleted file mode 100644 index 736f3d0b2..000000000 --- a/advanced/dynamic-ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright 2002-2014 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.integration.samples.ftp; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.instanceOf; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.net.UnknownHostException; - -import org.junit.Test; - -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.support.MessageBuilder; -import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.MessagingException; - -/** - * @author Gary Russell - * @author Amol Nayak - * - */ -public class FtpOutboundChannelAdapterSample { - - @Test - public void runDemo() throws Exception{ - ConfigurableApplicationContext ctx = - new ClassPathXmlApplicationContext("META-INF/spring/integration/DynamicFtpOutboundChannelAdapterSample-context.xml"); - MessageChannel channel = ctx.getBean("toDynRouter", MessageChannel.class); - File file = File.createTempFile("temp", "txt"); - Message message = MessageBuilder.withPayload(file) - .setHeader("customer", "cust1") - .build(); - try { - channel.send(message); - } - catch (MessagingException e) { - assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); - System.out.println(e.getCause().getCause().getCause().getMessage()); - assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust1")); - } - // send another so we can see in the log we don't create the ac again. - try { - channel.send(message); - } - catch (MessagingException e) { - assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); - assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust1")); - } - // send to a different customer; again, check the log to see a new ac is built - message = MessageBuilder.withPayload(file) - .setHeader("customer", "cust2").build(); - try { - channel.send(message); - } - catch (MessagingException e) { - assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); - assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust2")); - } - - // send to a different customer; again, check the log to see a new ac is built - //and the first one created (cust1) should be closed and removed as per the max cache size restriction - message = MessageBuilder.withPayload(file) - .setHeader("customer", "cust3").build(); - try { - channel.send(message); - } - catch (MessagingException e) { - assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); - assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust3")); - } - - //send to cust1 again, since this one has been invalidated before, we should - //see a new ac created (with ac of cust2 destroyed and removed) - message = MessageBuilder.withPayload(file) - .setHeader("customer", "cust1").build(); - try { - channel.send(message); - } - catch (MessagingException e) { - assertThat(e.getCause().getCause().getCause(), instanceOf(UnknownHostException.class)); - assertTrue(e.getCause().getCause().getCause().getMessage().contains("host.for.cust1")); - } - - ctx.close(); - } -} diff --git a/advanced/dynamic-ftp/src/test/resources/META-INF/spring/integration/DynamicFtpOutboundChannelAdapterSample-context.xml b/advanced/dynamic-ftp/src/test/resources/META-INF/spring/integration/DynamicFtpOutboundChannelAdapterSample-context.xml index 12bbfb518..ee7772a5a 100644 --- a/advanced/dynamic-ftp/src/test/resources/META-INF/spring/integration/DynamicFtpOutboundChannelAdapterSample-context.xml +++ b/advanced/dynamic-ftp/src/test/resources/META-INF/spring/integration/DynamicFtpOutboundChannelAdapterSample-context.xml @@ -7,7 +7,7 @@ http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd"> - + diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index 31abff612..2d50e9b08 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -63,12 +63,6 @@ spring-integration-ip compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -106,11 +100,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index b6fd8e5c8..be498eb2c 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -102,12 +102,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -140,11 +134,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 63ba29e99..146fb7215 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -69,12 +69,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -107,11 +101,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 0f73debbf..5d6d98b3a 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -93,12 +93,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -131,11 +125,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 1c8fb88f2..d71df3236 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -68,12 +68,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -106,11 +100,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 96171e685..9f7af10f9 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -89,12 +89,6 @@ 2.0.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -138,11 +132,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index cc87eaeac..967402dc3 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 24b81d94b..f08e76153 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -278,12 +278,6 @@ - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -316,11 +310,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 35b13da81..75f326af6 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -73,12 +73,6 @@ spring-integration-groovy compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -116,11 +110,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/applications/stomp-chat/src/test/java/org/springframework/integration/samples/chat/stomp/server/ApplicationTests.java b/applications/stomp-chat/src/test/java/org/springframework/integration/samples/chat/stomp/server/ApplicationTests.java index 44d482b5c..1d5ddb36b 100644 --- a/applications/stomp-chat/src/test/java/org/springframework/integration/samples/chat/stomp/server/ApplicationTests.java +++ b/applications/stomp-chat/src/test/java/org/springframework/integration/samples/chat/stomp/server/ApplicationTests.java @@ -16,22 +16,20 @@ package org.springframework.integration.samples.chat.stomp.server; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * @author Artem Bilan + * * @since 3.0 */ -@RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class) public class ApplicationTests { @Test - public void testWebSockets() throws InterruptedException { + public void testWebSockets() { } diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 656cfeefc..9726a4b9d 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -74,12 +74,6 @@ 2.0.17 runtime - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -112,11 +106,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 599b1e4d7..a0d330185 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -78,12 +78,6 @@ spring-integration-http compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -126,11 +120,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 9ff3003af..b3d3b6aa2 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/control-bus/src/test/java/org/springframework/integration/samples/controlbus/ControlBusDemoTest.java b/basic/control-bus/src/test/java/org/springframework/integration/samples/controlbus/ControlBusDemoTest.java index 5bbc01f45..34c7ff626 100644 --- a/basic/control-bus/src/test/java/org/springframework/integration/samples/controlbus/ControlBusDemoTest.java +++ b/basic/control-bus/src/test/java/org/springframework/integration/samples/controlbus/ControlBusDemoTest.java @@ -17,7 +17,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 7c2307166..f84515570 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -69,12 +69,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -107,11 +101,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/enricher/src/test/java/org/springframework/integration/samples/enricher/service/UserServiceTest.java b/basic/enricher/src/test/java/org/springframework/integration/samples/enricher/service/UserServiceTest.java index 89feda2cf..b092df6fc 100644 --- a/basic/enricher/src/test/java/org/springframework/integration/samples/enricher/service/UserServiceTest.java +++ b/basic/enricher/src/test/java/org/springframework/integration/samples/enricher/service/UserServiceTest.java @@ -16,13 +16,13 @@ package org.springframework.integration.samples.enricher.service; -import static org.junit.Assert.assertEquals; - -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.samples.enricher.domain.User; +import static org.assertj.core.api.Assertions.assertThat; + /** * Verify that the Spring Integration Application Context starts successfully. */ @@ -47,16 +47,15 @@ public void testExecuteFindUser() { User user = new User("foo", null, null); final User fullUser = service.findUser(user); - assertEquals("foo", fullUser.getUsername()); - assertEquals("foo@springintegration.org", fullUser.getEmail()); - assertEquals("secret", fullUser.getPassword()); + assertThat(fullUser.getUsername()).isEqualTo("foo"); + assertThat(fullUser.getEmail()).isEqualTo("foo@springintegration.org"); + assertThat(fullUser.getPassword()).isEqualTo("secret"); context.close(); } @Test public void testExecuteFindUserByUsername() { - final ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "/META-INF/spring/integration/spring-integration-context.xml", UserServiceTest.class); @@ -65,9 +64,9 @@ public void testExecuteFindUserByUsername() { User user = new User("foo", null, null); final User fullUser = service.findUserByUsername(user); - assertEquals("foo", fullUser.getUsername()); - assertEquals("foo@springintegration.org", fullUser.getEmail()); - assertEquals("secret", fullUser.getPassword()); + assertThat(fullUser.getUsername()).isEqualTo("foo"); + assertThat(fullUser.getEmail()).isEqualTo("foo@springintegration.org"); + assertThat(fullUser.getPassword()).isEqualTo("secret"); context.close(); } diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 0939121d2..b1da932c4 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/feed/src/test/java/org/springframework/integration/samples/feed/FeedInboundChannelAdapterSample.java b/basic/feed/src/test/java/org/springframework/integration/samples/feed/FeedInboundChannelAdapterSampleTests.java similarity index 85% rename from basic/feed/src/test/java/org/springframework/integration/samples/feed/FeedInboundChannelAdapterSample.java rename to basic/feed/src/test/java/org/springframework/integration/samples/feed/FeedInboundChannelAdapterSampleTests.java index cde7deae5..66295f844 100644 --- a/basic/feed/src/test/java/org/springframework/integration/samples/feed/FeedInboundChannelAdapterSample.java +++ b/basic/feed/src/test/java/org/springframework/integration/samples/feed/FeedInboundChannelAdapterSampleTests.java @@ -16,30 +16,29 @@ package org.springframework.integration.samples.feed; -import org.junit.Test; +import com.rometools.rome.feed.synd.SyndEntry; +import org.junit.jupiter.api.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel; -import com.rometools.rome.feed.synd.SyndEntry; - /** * @author Oleg Zhurakousky * */ -public class FeedInboundChannelAdapterSample { +public class FeedInboundChannelAdapterSampleTests { @SuppressWarnings("unchecked") @Test - public void runDemo(){ + public void runDemo() { ConfigurableApplicationContext ac = - new ClassPathXmlApplicationContext("META-INF/spring/integration/FeedInboundChannelAdapterSample-context.xml"); + new ClassPathXmlApplicationContext("META-INF/spring/integration/FeedInboundChannelAdapterSample-context.xml"); PollableChannel feedChannel = ac.getBean("feedChannel", PollableChannel.class); for (int i = 0; i < 10; i++) { Message message = (Message) feedChannel.receive(1000); - if (message != null){ + if (message != null) { SyndEntry entry = message.getPayload(); System.out.println(entry.getPublishedDate() + " - " + entry.getTitle()); } diff --git a/basic/file/pom.xml b/basic/file/pom.xml index f1b86215c..e4881b418 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/file/src/test/java/org/springframework/integration/samples/filecopy/BinaryFileCopyTest.java b/basic/file/src/test/java/org/springframework/integration/samples/filecopy/BinaryFileCopyTest.java index 6509ba613..d0e4cb32d 100644 --- a/basic/file/src/test/java/org/springframework/integration/samples/filecopy/BinaryFileCopyTest.java +++ b/basic/file/src/test/java/org/springframework/integration/samples/filecopy/BinaryFileCopyTest.java @@ -16,7 +16,8 @@ package org.springframework.integration.samples.filecopy; -import org.junit.Test; +import org.junit.jupiter.api.Test; + import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -32,7 +33,9 @@ public class BinaryFileCopyTest { @Test public void testBinaryCopy() throws Exception{ - ApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/fileCopyDemo-binary.xml", BinaryFileCopyTest.class); + ApplicationContext context = + new ClassPathXmlApplicationContext("/META-INF/spring/integration/fileCopyDemo-binary.xml", + BinaryFileCopyTest.class); FileCopyDemoCommon.displayDirectories(context); Thread.sleep(5000); } diff --git a/basic/file/src/test/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyTest.java b/basic/file/src/test/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyTest.java index d5fed073e..3c4dc4dde 100644 --- a/basic/file/src/test/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyTest.java +++ b/basic/file/src/test/java/org/springframework/integration/samples/filecopy/FileBasedFileCopyTest.java @@ -16,7 +16,8 @@ package org.springframework.integration.samples.filecopy; -import org.junit.Test; +import org.junit.jupiter.api.Test; + import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -30,7 +31,9 @@ public class FileBasedFileCopyTest { @Test public void testFileBasedCopy() throws Exception{ - ApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/fileCopyDemo-file.xml", FileBasedFileCopyTest.class); + ApplicationContext context = + new ClassPathXmlApplicationContext("/META-INF/spring/integration/fileCopyDemo-file.xml", + FileBasedFileCopyTest.class); FileCopyDemoCommon.displayDirectories(context); Thread.sleep(5000); } diff --git a/basic/file/src/test/java/org/springframework/integration/samples/filecopy/TextFileCopyTest.java b/basic/file/src/test/java/org/springframework/integration/samples/filecopy/TextFileCopyTest.java index cb7b14c9f..73c76b7ce 100644 --- a/basic/file/src/test/java/org/springframework/integration/samples/filecopy/TextFileCopyTest.java +++ b/basic/file/src/test/java/org/springframework/integration/samples/filecopy/TextFileCopyTest.java @@ -16,7 +16,8 @@ package org.springframework.integration.samples.filecopy; -import org.junit.Test; +import org.junit.jupiter.api.Test; + import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -31,7 +32,9 @@ public class TextFileCopyTest { @Test public void testTextBasedCopy() throws Exception{ - ApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/fileCopyDemo-text.xml", TextFileCopyTest.class); + ApplicationContext context = + new ClassPathXmlApplicationContext("/META-INF/spring/integration/fileCopyDemo-text.xml", + TextFileCopyTest.class); FileCopyDemoCommon.displayDirectories(context); Thread.sleep(5000); } diff --git a/basic/ftp/README.md b/basic/ftp/README.md index fbb53c829..c88de49f7 100644 --- a/basic/ftp/README.md +++ b/basic/ftp/README.md @@ -17,13 +17,13 @@ The samples work out of the box using an embedded Apache FTP Server. Simply exec and the samples are build as well as executed. The samples are part of a JUnit test suite: - org.springframework.integration.samples.ftp.TestSuite.java + org.springframework.integration.samples.ftp.BaseFtpTest.java which comprises the following tests that correspond to the scenarios outlined above: -* org.springframework.integration.samples.ftp.FtpOutboundChannelAdapterSample.class, -* org.springframework.integration.samples.ftp.FtpInboundChannelAdapterSample.class, -* org.springframework.integration.samples.ftp.FtpOutboundGatewaySample.class +* org.springframework.integration.samples.ftp.FtpOutboundChannelAdapterSampleTests.class, +* org.springframework.integration.samples.ftp.FtpInboundChannelAdapterSampleTests.class, +* org.springframework.integration.samples.ftp.FtpOutboundGatewaySampleTests.class Keep in mind that the tests are meant to be executed in sequence. diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index 7452eefcb..fff001fbf 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -81,12 +81,6 @@ 2.0.17 runtime - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -125,11 +119,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/TestSuite.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/BaseFtpTest.java similarity index 80% rename from basic/ftp/src/test/java/org/springframework/integration/samples/ftp/TestSuite.java rename to basic/ftp/src/test/java/org/springframework/integration/samples/ftp/BaseFtpTest.java index 5a2362e30..69c685da6 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/TestSuite.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/BaseFtpTest.java @@ -17,7 +17,6 @@ package org.springframework.integration.samples.ftp; import java.io.File; -import java.io.IOException; import org.apache.commons.io.FileUtils; import org.apache.ftpserver.FtpServer; @@ -25,12 +24,9 @@ import org.apache.ftpserver.ftplet.FtpException; import org.apache.ftpserver.listener.Listener; import org.apache.ftpserver.listener.ListenerFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.io.TempDir; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,15 +40,9 @@ * @author Gunnar Hillert * */ -@RunWith(Suite.class) -@Suite.SuiteClasses({ - FtpOutboundChannelAdapterSample.class, - FtpInboundChannelAdapterSample.class, - FtpOutboundGatewaySample.class -}) -public class TestSuite { +public abstract class BaseFtpTest { - private static final Logger LOGGER = LoggerFactory.getLogger(TestSuite.class); + private static final Logger LOGGER = LoggerFactory.getLogger(BaseFtpTest.class); public static final String FTP_ROOT_DIR = "target" + File.separator + "ftproot"; @@ -60,13 +50,13 @@ public class TestSuite { public static final String SERVER_PORT_SYSTEM_PROPERTY = "availableServerPort"; - @ClassRule - public static final TemporaryFolder temporaryFolder = new TemporaryFolder(); + @TempDir + public static File temporaryFolder; public static FtpServer server; - @BeforeClass - public static void setupFtpServer() throws FtpException, IOException { + @BeforeAll + public static void setupFtpServer() throws FtpException { Integer availableServerSocket; @@ -100,7 +90,7 @@ public static void setupFtpServer() throws FtpException, IOException { System.setProperty(SERVER_PORT_SYSTEM_PROPERTY, availableServerSocket.toString()); } - @AfterClass + @AfterAll public static void shutDown() { server.stop(); FileUtils.deleteQuietly(new File(FTP_ROOT_DIR)); diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSampleTests.java similarity index 72% rename from basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java rename to basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSampleTests.java index 0c226cc3e..0fe9ab315 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSample.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpInboundChannelAdapterSampleTests.java @@ -16,10 +16,7 @@ package org.springframework.integration.samples.ftp; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,18 +25,21 @@ import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel; +import static org.assertj.core.api.Assertions.assertThat; + /** * * @author Oleg Zhurakousky * @author Gunnar Hillert + * @author Artem Bilan * */ -public class FtpInboundChannelAdapterSample { +public class FtpInboundChannelAdapterSampleTests extends BaseFtpTest { - private static final Logger LOGGER = LoggerFactory.getLogger(FtpInboundChannelAdapterSample.class); + private static final Logger LOGGER = LoggerFactory.getLogger(FtpInboundChannelAdapterSampleTests.class); @Test - public void runDemo() throws Exception{ + public void runDemo() { ConfigurableApplicationContext ctx = new ClassPathXmlApplicationContext("META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml"); @@ -49,13 +49,13 @@ public void runDemo() throws Exception{ Message message2 = ftpChannel.receive(10000); Message message3 = ftpChannel.receive(1000); - LOGGER.info(String.format("Received first file message: %s.", message1)); - LOGGER.info(String.format("Received second file message: %s.", message2)); - LOGGER.info(String.format("Received nothing else: %s.", message3)); + LOGGER.info("Received first file message: {}.", message1); + LOGGER.info("Received second file message: {}.", message2); + LOGGER.info("Received nothing else: {}.", message3); - assertNotNull(message1); - assertNotNull(message2); - assertNull("Was NOT expecting a third message.", message3); + assertThat(message1).isNotNull(); + assertThat(message2).isNotNull(); + assertThat(message3).isNull(); ctx.close(); } diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSampleTest.java similarity index 74% rename from basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java rename to basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSampleTest.java index 55755c1a7..970df2f64 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSample.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundChannelAdapterSampleTest.java @@ -16,21 +16,22 @@ package org.springframework.integration.samples.ftp; -import static org.junit.Assert.assertTrue; - import java.io.File; import java.io.InputStream; + import org.apache.commons.io.FileUtils; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.integration.support.MessageBuilder; + +import static org.assertj.core.api.Assertions.assertThat; /** * @@ -38,17 +39,17 @@ * @author Gunnar Hillert * */ -public class FtpOutboundChannelAdapterSample { +public class FtpOutboundChannelAdapterSampleTest extends BaseFtpTest { - private static final Logger LOGGER = LoggerFactory.getLogger(FtpOutboundChannelAdapterSample.class); + private static final Logger LOGGER = LoggerFactory.getLogger(FtpOutboundChannelAdapterSampleTest.class); private final File baseFolder = new File("target" + File.separator + "toSend"); @Test - public void runDemo() throws Exception{ + public void runDemo() throws Exception { ConfigurableApplicationContext ctx = - new ClassPathXmlApplicationContext("META-INF/spring/integration/FtpOutboundChannelAdapterSample-context.xml"); + new ClassPathXmlApplicationContext("META-INF/spring/integration/FtpOutboundChannelAdapterSample-context.xml"); MessageChannel ftpChannel = ctx.getBean("ftpChannel", MessageChannel.class); @@ -57,14 +58,14 @@ public void runDemo() throws Exception{ final File fileToSendA = new File(baseFolder, "a.txt"); final File fileToSendB = new File(baseFolder, "b.txt"); - final InputStream inputStreamA = FtpOutboundChannelAdapterSample.class.getResourceAsStream("/test-files/a.txt"); - final InputStream inputStreamB = FtpOutboundChannelAdapterSample.class.getResourceAsStream("/test-files/b.txt"); + final InputStream inputStreamA = FtpOutboundChannelAdapterSampleTest.class.getResourceAsStream("/test-files/a.txt"); + final InputStream inputStreamB = FtpOutboundChannelAdapterSampleTest.class.getResourceAsStream("/test-files/b.txt"); FileUtils.copyInputStreamToFile(inputStreamA, fileToSendA); FileUtils.copyInputStreamToFile(inputStreamB, fileToSendB); - assertTrue(fileToSendA.exists()); - assertTrue(fileToSendB.exists()); + assertThat(fileToSendA).exists(); + assertThat(fileToSendB).exists(); final Message messageA = MessageBuilder.withPayload(fileToSendA).build(); final Message messageB = MessageBuilder.withPayload(fileToSendB).build(); @@ -74,14 +75,14 @@ public void runDemo() throws Exception{ Thread.sleep(2000); - assertTrue(new File(TestSuite.FTP_ROOT_DIR + File.separator + "a.txt").exists()); - assertTrue(new File(TestSuite.FTP_ROOT_DIR + File.separator + "b.txt").exists()); + assertThat(new File(BaseFtpTest.FTP_ROOT_DIR + File.separator + "a.txt")).exists(); + assertThat(new File(BaseFtpTest.FTP_ROOT_DIR + File.separator + "b.txt")).exists(); LOGGER.info("Successfully transferred file 'a.txt' and 'b.txt' to a remote FTP location."); ctx.close(); } - @After + @AfterEach public void cleanup() { FileUtils.deleteQuietly(baseFolder); } diff --git a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundGatewaySample.java b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundGatewaySampleTests.java similarity index 75% rename from basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundGatewaySample.java rename to basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundGatewaySampleTests.java index b65fe135b..16a2eca52 100644 --- a/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundGatewaySample.java +++ b/basic/ftp/src/test/java/org/springframework/integration/samples/ftp/FtpOutboundGatewaySampleTests.java @@ -15,20 +15,20 @@ */ package org.springframework.integration.samples.ftp; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.File; import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; + import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import static org.assertj.core.api.Assertions.assertThat; + /** * Demonstrates use of the outbound gateway to use ls, get and rm. - * - * The previous Test {@link FtpOutboundChannelAdapterSample} was uploading 2 test + *

+ * The previous Test {@link FtpOutboundChannelAdapterSampleTest} was uploading 2 test * files: * *

* - * This test will now retrieves those 2 files and removes them. Instead of just + * This test will now retrieve those 2 files and removes them. Instead of just * polling the file, the files are instead retrieved and deleted using explicit * FTP commands (LS and RM) * @@ -44,7 +44,7 @@ * @since 2.1 * */ -public class FtpOutboundGatewaySample { +public class FtpOutboundGatewaySampleTests extends BaseFtpTest { @Test @@ -58,13 +58,13 @@ public void testLsGetRm() throws Exception { List rmResults = toFtpFlow.lsGetAndRmFiles("/"); //Check everything went as expected, and clean up - assertEquals("Was expecting the collection 'rmResults' to contain 2 elements.", 2, rmResults.size()); + assertThat(rmResults).hasSize(2); for (Boolean result : rmResults) { - assertTrue(result); + assertThat(result).isTrue(); } - assertTrue("Expected FTP remote directory to be empty", new File(TestSuite.FTP_ROOT_DIR).delete()); + assertThat(new File(BaseFtpTest.FTP_ROOT_DIR).delete()).isTrue(); ctx.close(); } diff --git a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml index 0c6e95d38..58faed918 100644 --- a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml +++ b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpInboundChannelAdapterSample-context.xml @@ -25,7 +25,7 @@ auto-create-local-directory="true" delete-remote-files="false" remote-directory="/" - local-directory="#{ T(org.springframework.integration.samples.ftp.TestSuite).LOCAL_FTP_TEMP_DIR}/ftpInbound"> + local-directory="#{ T(org.springframework.integration.samples.ftp.BaseFtpTest).LOCAL_FTP_TEMP_DIR}/ftpInbound"> diff --git a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml index 2372a7978..db79ec577 100644 --- a/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml +++ b/basic/ftp/src/test/resources/META-INF/spring/integration/FtpOutboundGatewaySample-context.xml @@ -45,7 +45,7 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 5505dde09..737d44a08 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -123,12 +123,6 @@ - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -161,11 +155,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 4c57428d1..aa44d25da 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -69,12 +69,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -107,11 +101,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/jdbc/src/test/java/org/springframework/integration/samples/jdbc/OutboundGatewayTest.java b/basic/jdbc/src/test/java/org/springframework/integration/samples/jdbc/OutboundGatewayTest.java index 615db2bbf..1e129d2dd 100644 --- a/basic/jdbc/src/test/java/org/springframework/integration/samples/jdbc/OutboundGatewayTest.java +++ b/basic/jdbc/src/test/java/org/springframework/integration/samples/jdbc/OutboundGatewayTest.java @@ -19,14 +19,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.samples.jdbc.domain.Gender; import org.springframework.integration.samples.jdbc.domain.Person; import org.springframework.integration.samples.jdbc.service.PersonService; +import static org.assertj.core.api.Assertions.assertThat; + /** * The test class for jdbc outbound gateway * @author Amol Nayak @@ -45,12 +46,12 @@ public void insertPersonRecord() { logger.info("Creating person Instance"); Person person = new Person(); Calendar dateOfBirth = Calendar.getInstance(); - dateOfBirth.set(1980, 0, 1); + dateOfBirth.set(1980, Calendar.JANUARY, 1); person.setDateOfBirth(dateOfBirth.getTime()); person.setName("Name Of The Person"); person.setGender(Gender.MALE); person = service.createPerson(person); - Assert.assertNotNull("Expected a non null instance of Person, got null", person); + assertThat(person).isNotNull(); logger.info("\n\tGenerated person with id: " + person.getPersonId() + ", with name: " + person.getName()); context.close(); } diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 71b861fe5..3a5813e05 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -92,12 +92,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -130,11 +124,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java index 5daaa8fe4..004b57117 100644 --- a/basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java +++ b/basic/jms/src/test/java/org/springframework/integration/samples/jms/ActiveMQMultiContextTests.java @@ -65,8 +65,8 @@ public static void startUp() throws Exception { .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())) .addAddressSetting("#", new AddressSettings() - .setDeadLetterAddress(SimpleString.toSimpleString("dla")) - .setExpiryAddress(SimpleString.toSimpleString("expiry"))); + .setDeadLetterAddress(SimpleString.of("dla")) + .setExpiryAddress(SimpleString.of("expiry"))); broker.setConfiguration(configuration).start(); connectionFactory.setCacheConsumers(false); } diff --git a/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java b/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java index b8ed1f7c4..4fa2f8dbe 100644 --- a/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java +++ b/basic/jms/src/test/java/org/springframework/integration/samples/jms/GatewayDemoTest.java @@ -16,25 +16,25 @@ package org.springframework.integration.samples.jms; -import org.junit.Assert; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.context.support.GenericXmlApplicationContext; -import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; + +import static org.assertj.core.api.Assertions.assertThat; /** * @author Gunnar Hillert */ -public class GatewayDemoTest extends ActiveMQMultiContextTests { +public class GatewayDemoTest extends ActiveMQMultiContextTests { private final static String[] configFilesGatewayDemo = { - "/META-INF/spring/integration/common.xml", - "/META-INF/spring/integration/inboundGateway.xml", - "/META-INF/spring/integration/outboundGateway.xml" + "/META-INF/spring/integration/common.xml", + "/META-INF/spring/integration/inboundGateway.xml", + "/META-INF/spring/integration/outboundGateway.xml" }; @Test @@ -52,10 +52,10 @@ public void testGatewayDemo() { @SuppressWarnings("unchecked") Message reply = (Message) queueChannel.receive(20000); - Assertions.assertNotNull(reply); + assertThat(reply).isNotNull(); String out = reply.getPayload(); - Assertions.assertEquals("JMS response: JMS TEST", out); + assertThat(out).isEqualTo("JMS response: JMS TEST"); applicationContext.close(); } diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 64ac74e45..6be232717 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -68,12 +68,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -106,11 +100,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/jmx/src/test/java/org/springframework/integration/samples/jmx/JmxAdapterDemoTest.java b/basic/jmx/src/test/java/org/springframework/integration/samples/jmx/JmxAdapterDemoTest.java index 496376057..747e90f9e 100644 --- a/basic/jmx/src/test/java/org/springframework/integration/samples/jmx/JmxAdapterDemoTest.java +++ b/basic/jmx/src/test/java/org/springframework/integration/samples/jmx/JmxAdapterDemoTest.java @@ -16,7 +16,7 @@ package org.springframework.integration.samples.jmx; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index a951e0a25..24ed94329 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -80,12 +80,6 @@ 3.2.0 runtime - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -123,11 +117,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java b/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java index 82de23954..041002e25 100644 --- a/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java +++ b/basic/jpa/src/test/java/org/springframework/integration/samples/jpa/JpaTests.java @@ -26,8 +26,7 @@ import org.springframework.integration.samples.jpa.domain.Person; import org.springframework.integration.samples.jpa.service.PersonService; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.assertj.core.api.Assertions.assertThat; /** * @@ -49,9 +48,8 @@ public void insertPersonRecord() { this.personService.createPerson(person); List people = this.personService.findPeople(); - assertNotNull(people); - assertEquals(2, people.size()); - assertEquals(person.getName(), people.get(1).getName()); + assertThat(people).hasSize(2); + assertThat(people.get(1).getName()).isEqualTo(person.getName()); } } diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 996cebcc5..d145e96eb 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -85,12 +85,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -128,11 +122,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index a49ee6761..2186d6be6 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -74,12 +74,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -112,11 +106,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 72cdcd1c3..13268d71d 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -69,12 +69,6 @@ 5.5.1 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -107,11 +101,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 132db54f1..3b6deb561 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -74,12 +74,6 @@ 1.2.5 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -123,11 +117,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 09b14f8f2..b8c543dce 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 79b9751a8..0741057a2 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/quote/src/test/java/org/springframework/integration/samples/quote/QuoteDemoTest.java b/basic/quote/src/test/java/org/springframework/integration/samples/quote/QuoteDemoTest.java index 8796f2be5..fdafc0b1d 100644 --- a/basic/quote/src/test/java/org/springframework/integration/samples/quote/QuoteDemoTest.java +++ b/basic/quote/src/test/java/org/springframework/integration/samples/quote/QuoteDemoTest.java @@ -16,7 +16,8 @@ package org.springframework.integration.samples.quote; -import org.junit.Test; +import org.junit.jupiter.api.Test; + import org.springframework.context.support.ClassPathXmlApplicationContext; /** diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 6abe154aa..5bdcab7bb 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSample.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSampleTests.java similarity index 84% rename from basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSample.java rename to basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSampleTests.java index 71073bfe5..7c5c72068 100644 --- a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSample.java +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpInboundReceiveSampleTests.java @@ -16,10 +16,6 @@ package org.springframework.integration.samples.sftp; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.io.File; import org.apache.sshd.sftp.client.SftpClient; @@ -34,12 +30,14 @@ import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Oleg Zhurakousky * @author Gary Russell * */ -public class SftpInboundReceiveSample { +public class SftpInboundReceiveSampleTests { @Test public void runDemo() { @@ -62,20 +60,20 @@ public void runDemo() { adapter.start(); Message received = localFileChannel.receive(); - assertNotNull("Expected file", received); + assertThat(received).isNotNull(); System.out.println("Received first file message: " + received); received = localFileChannel.receive(); - assertNotNull("Expected file", received); + assertThat(received).isNotNull(); System.out.println("Received second file message: " + received); received = localFileChannel.receive(1000); - assertNull("Expected null", received); + assertThat(received).isNull(); System.out.println("No third file was received as expected"); } finally { SftpTestUtils.cleanUp(template, file1, file2, file3); context.close(); - assertTrue("Could note delete retrieved file", new File("local-dir", file1).delete()); - assertTrue("Could note delete retrieved file", new File("local-dir", file2).delete()); + assertThat(new File("local-dir", file1).delete()).isTrue(); + assertThat(new File("local-dir", file2).delete()).isTrue(); } } diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundGatewaySample.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundGatewaySampleTests.java similarity index 87% rename from basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundGatewaySample.java rename to basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundGatewaySampleTests.java index 34183a0ed..9a3d0ccda 100644 --- a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundGatewaySample.java +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundGatewaySampleTests.java @@ -16,9 +16,6 @@ package org.springframework.integration.samples.sftp; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.File; import java.util.List; @@ -31,16 +28,19 @@ import org.springframework.integration.file.remote.session.CachingSessionFactory; import org.springframework.integration.file.remote.session.SessionFactory; +import static org.assertj.core.api.Assertions.assertThat; + /** * Demonstrates use of the outbound gateway to use ls, get and rm. * Creates a temporary directory with 2 files; retrieves and removes them. * * @author Gary Russell + * @author Artem Bilan * * @since 2.1 * */ -public class SftpOutboundGatewaySample { +public class SftpOutboundGatewaySampleTests { @Test public void testLsGetRm() { @@ -65,19 +65,18 @@ public void testLsGetRm() { // execute the flow (ls, get, rm, aggregate results) List rmResults = toFtpFlow.lsGetAndRmFiles("si.sftp.sample"); - //Check everything went as expected, and clean up - assertEquals(2, rmResults.size()); + assertThat(rmResults).hasSize(2); for (Boolean result : rmResults) { - assertTrue(result); + assertThat(result).isTrue(); } } finally { SftpTestUtils.cleanUp(template, file1, file2); ctx.close(); - assertTrue("Could note delete retrieved file", new File(tmpDir, file1).delete()); - assertTrue("Could note delete retrieved file", new File(tmpDir, file2).delete()); + assertThat(new File(tmpDir, file1).delete()).isTrue(); + assertThat(new File(tmpDir, file2).delete()).isTrue(); } } diff --git a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSample.java b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSampleTests.java similarity index 91% rename from basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSample.java rename to basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSampleTests.java index 1d7f5584c..c598884de 100644 --- a/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSample.java +++ b/basic/sftp/src/test/java/org/springframework/integration/samples/sftp/SftpOutboundTransferSampleTests.java @@ -37,7 +37,7 @@ * @author Gary Russell * */ -public class SftpOutboundTransferSample { +public class SftpOutboundTransferSampleTests { @Test public void testOutbound() throws Exception { @@ -47,7 +47,7 @@ public void testOutbound() throws Exception { final ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext("/META-INF/spring/integration/SftpOutboundTransferSample-context.xml", - SftpOutboundTransferSample.class); + SftpOutboundTransferSampleTests.class); @SuppressWarnings("unchecked") SessionFactory sessionFactory = ac.getBean(CachingSessionFactory.class); RemoteFileTemplate template = new RemoteFileTemplate<>(sessionFactory); @@ -67,8 +67,8 @@ public void testOutbound() throws Exception { Assert.isTrue(SftpTestUtils.fileExists(template, destinationFileName), String.format("File '%s' does not exist.", destinationFileName)); - System.out.println(String.format("Successfully transferred '%s' file to a " + - "remote location under the name '%s'", sourceFileName, destinationFileName)); + System.out.printf("Successfully transferred '%s' file to a " + + "remote location under the name '%s'%n", sourceFileName, destinationFileName); } finally { SftpTestUtils.cleanUp(template, destinationFileName); diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 2cc2709e8..fb36c2d21 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -80,12 +80,6 @@ 2.0.17 runtime - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -118,11 +112,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index 6c7dc6a18..36a4bf5fb 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -68,12 +68,6 @@ spring-integration-ip compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -111,11 +105,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 9ab61b6c9..966c5af17 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -74,12 +74,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -112,11 +106,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerAnnotationDemoTest.java b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerAnnotationDemoTest.java index 08139490f..dd2ca2048 100644 --- a/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerAnnotationDemoTest.java +++ b/basic/tcp-client-server/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerAnnotationDemoTest.java @@ -16,8 +16,6 @@ package org.springframework.integration.samples.tcpclientserver; -import static org.junit.Assert.assertEquals; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -48,6 +46,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static org.assertj.core.api.Assertions.assertThat; /** * Demonstrates the use of a gateway as an entry point into the integration flow. @@ -94,7 +93,7 @@ public void setup() { @Test public void testHappyDay() { String result = gw.viaTcp("Hello world!"); - assertEquals("HELLO WORLD!", result); + assertThat(result).isEqualTo("HELLO WORLD!"); } @EnableIntegration diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index da0260c9d..794361473 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -68,12 +68,6 @@ jackson-databind compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -111,11 +105,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index a7e8fec9d..2098df62f 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -78,12 +78,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -116,11 +110,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 77b37af8e..3a6c39cc9 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -64,12 +64,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -102,11 +96,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSearchSample.java b/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSearchSample.java index 280114638..70e288d1c 100644 --- a/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSearchSample.java +++ b/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSearchSample.java @@ -15,7 +15,7 @@ */ package org.springframework.integration.samples.twitter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -26,9 +26,10 @@ public class TwitterSearchSample { @Test - public void runDemo() throws Exception{ + public void runDemo() throws Exception { new ClassPathXmlApplicationContext("META-INF/spring/integration/TwitterSearch-context.xml"); Thread.sleep(5000); } + } diff --git a/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSendUpdatesSample.java b/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSendUpdatesSample.java index 756d1f16c..8f4925b8f 100644 --- a/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSendUpdatesSample.java +++ b/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterSendUpdatesSample.java @@ -15,7 +15,7 @@ */ package org.springframework.integration.samples.twitter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -30,12 +30,13 @@ public class TwitterSendUpdatesSample { @Test - public void runDemo() throws Exception{ - ApplicationContext context = - new ClassPathXmlApplicationContext("META-INF/spring/integration/TwitterSendUpdates-context.xml"); - + public void runDemo() { + ApplicationContext context = + new ClassPathXmlApplicationContext("META-INF/spring/integration/TwitterSendUpdates-context.xml"); + MessageChannel twitterOutChannel = context.getBean("twitterOut", MessageChannel.class); Message twitterUpdate = new GenericMessage("Testing new Twitter samples for #springintegration"); twitterOutChannel.send(twitterUpdate); } + } diff --git a/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterTimelineUpdatesSample.java b/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterTimelineUpdatesSample.java index c4c4ddacc..adc9908ac 100644 --- a/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterTimelineUpdatesSample.java +++ b/basic/twitter/src/test/java/org/springframework/integration/samples/twitter/TwitterTimelineUpdatesSample.java @@ -15,7 +15,7 @@ */ package org.springframework.integration.samples.twitter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -26,9 +26,10 @@ public class TwitterTimelineUpdatesSample { @Test - public void runDemo() throws Exception{ + public void runDemo() throws Exception { new ClassPathXmlApplicationContext("META-INF/spring/integration/TwitterTimelineUpdates-context.xml"); - + Thread.sleep(20000); } + } diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 0e82dba14..a591b0ed1 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -68,12 +68,6 @@ spring-integration-websocket compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -111,11 +105,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 8680bf9fc..32ec8f2d6 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -105,12 +105,6 @@ - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -143,11 +137,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java index bd5b0ed20..0f501b6bd 100644 --- a/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java +++ b/basic/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InContainerTests.java @@ -16,23 +16,22 @@ package org.springframework.integration.samples.ws; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; - import javax.xml.transform.Source; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.ws.client.core.WebServiceTemplate; import org.springframework.xml.transform.StringResult; import org.springframework.xml.transform.StringSource; +import static org.assertj.core.api.Assertions.assertThat; + /** * System tests ensuring the Spring WS MessageDispatcherServlet is correctly * set up and configured to delegate incoming requests to our ws:inbound-gateway. - * + *

* Use 'mvn package' to create a war file for this project, then deploy before * attempting to run this test. * @@ -42,7 +41,9 @@ public class InContainerTests { private static final Log logger = LogFactory.getLog(InContainerTests.class); + private static final String WS_URI = "http://localhost:8080/ws-inbound-gateway/echoservice"; + private final WebServiceTemplate template = new WebServiceTemplate(); @Test @@ -50,12 +51,13 @@ public void testWebServiceRequestAndResponse() { StringResult result = new StringResult(); Source payload = new StringSource( "" + - "hello"); + "hello"); template.sendSourceAndReceiveToResult(WS_URI, payload, result); - logger.info("RESULT: " + result.toString()); - assertThat(result.toString(), equalTo( + logger.info("RESULT: " + result); + assertThat(result.toString()).isEqualTo( "" + - "hello")); + "hello"); } + } diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index d763dfdfd..ca9acfa2c 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -68,12 +68,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -106,11 +100,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 7daf75b79..400e8a567 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 5eb128a2b..ca513cf8e 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/basic/xmpp/src/test/java/org/springframework/integration/samples/xmpp/ReceiveInstantMessageSample.java b/basic/xmpp/src/test/java/org/springframework/integration/samples/xmpp/ReceiveInstantMessageSample.java index ff0e7dbee..6c8d99752 100644 --- a/basic/xmpp/src/test/java/org/springframework/integration/samples/xmpp/ReceiveInstantMessageSample.java +++ b/basic/xmpp/src/test/java/org/springframework/integration/samples/xmpp/ReceiveInstantMessageSample.java @@ -15,7 +15,7 @@ */ package org.springframework.integration.samples.xmpp; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -26,9 +26,10 @@ public class ReceiveInstantMessageSample { @Test - public void runDemo() throws Exception{ + public void runDemo() throws Exception { new ClassPathXmlApplicationContext("META-INF/spring/integration/ReceiveInstantMessageSample-context.xml"); - - Thread.sleep(20000*10); + + Thread.sleep(20000 * 10); } + } diff --git a/basic/xmpp/src/test/java/org/springframework/integration/samples/xmpp/SendInstantMessageSample.java b/basic/xmpp/src/test/java/org/springframework/integration/samples/xmpp/SendInstantMessageSample.java index f57eb1806..fa71034f6 100644 --- a/basic/xmpp/src/test/java/org/springframework/integration/samples/xmpp/SendInstantMessageSample.java +++ b/basic/xmpp/src/test/java/org/springframework/integration/samples/xmpp/SendInstantMessageSample.java @@ -15,7 +15,7 @@ */ package org.springframework.integration.samples.xmpp; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -30,11 +30,12 @@ public class SendInstantMessageSample { @Test - public void runDemo() throws Exception{ + public void runDemo() { ApplicationContext context = new ClassPathXmlApplicationContext("META-INF/spring/integration/SendInstantMessageSample-context.xml"); - + MessageChannel toUserChannel = context.getBean("toUserChannel", MessageChannel.class); - Message message = new GenericMessage("Hello from Spring Integration XMPP"); + Message message = new GenericMessage<>("Hello from Spring Integration XMPP"); toUserChannel.send(message); } + } diff --git a/basic/zip/pom.xml b/basic/zip/pom.xml index 26f9de848..781a79805 100644 --- a/basic/zip/pom.xml +++ b/basic/zip/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/build.gradle b/build.gradle index 9a36cccd8..668c4be28 100644 --- a/build.gradle +++ b/build.gradle @@ -117,7 +117,7 @@ subprojects { subproject -> url = linkIssue } withXml { - asNode().appendNode('properties')appendNode('java.version', '17') + asNode().appendNode('properties').appendNode('java.version', '17') if (subproject.plugins.hasPlugin('org.akhikhl.gretty')) { asNode().appendNode('packaging', 'war') def plugins = asNode().build?.find()?.plugins?.find() @@ -240,7 +240,6 @@ subprojects { subproject -> jrubyVersion = '10.0.0.1' jpaApiVersion = '3.2.0' jstlVersion = '1.2' - junitVersion = '4.13.2' junitJupiterVersion = '5.12.2' log4jVersion = '2.24.3' mailVersion = '2.0.3' @@ -277,9 +276,6 @@ subprojects { subproject -> // dependencies that are common across all java projects dependencies { - testImplementation("junit:junit:$junitVersion") { - exclude group: 'org.hamcrest' - } testImplementation "org.hamcrest:hamcrest-library:$hamcrestVersion" testImplementation("org.mockito:mockito-core:$mockitoVersion") { exclude group: 'org.hamcrest' @@ -287,8 +283,6 @@ subprojects { subproject -> testImplementation 'org.junit.jupiter:junit-jupiter-api' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' - // To support JUnit 4 tests - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' testImplementation 'org.springframework.integration:spring-integration-test' } @@ -1184,7 +1178,7 @@ project('rest-http') { api 'org.springframework:spring-jdbc' api 'org.springframework:spring-context' api 'org.springframework:spring-aop' - api 'com.fasterxml.jackson.core:jackson-databind' + api 'tools.jackson.core:jackson-databind' api "org.springframework.security:spring-security-web:$springSecurityVersion" api "org.springframework.security:spring-security-config:$springSecurityVersion" api "org.apache.logging.log4j:log4j-core:$log4jVersion" @@ -1473,7 +1467,7 @@ project('file-split-ftp') { testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.integration:spring-integration-test' - testImplementation ('com.icegreen:greenmail:2.1.0-alpha-3') { + testImplementation('com.icegreen:greenmail:2.1.0-alpha-3') { exclude group: 'com.sun.mail' exclude group: 'jakarta.activation' } diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 583ad2fe8..17232062d 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -74,12 +74,6 @@ spring-integration-stream compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -117,11 +111,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 5cc0b9925..98ce914ee 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -79,12 +79,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -122,11 +116,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 4ec1c2240..6b4a66176 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -96,12 +96,6 @@ 2.1.0 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -139,11 +133,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java b/dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java index 89798b004..0feca96f8 100644 --- a/dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java +++ b/dsl/si4demo/src/test/java/org/springframework/integration/samples/si4demo/ApplicationTests.java @@ -1,13 +1,10 @@ package org.springframework.integration.samples.si4demo; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.integration.samples.si4demo.annotations.Application; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -@RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class) public class ApplicationTests { diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 196c395c2..4ae4c6014 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/AsyncGatewayTest.java b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/AsyncGatewayTest.java index 40561af44..ee5e985cf 100644 --- a/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/AsyncGatewayTest.java +++ b/intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/AsyncGatewayTest.java @@ -27,26 +27,30 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.FileSystemXmlApplicationContext; + /** * @author Oleg Zhurakousky * @author Gary Russell * */ public class AsyncGatewayTest { + private static Log logger = LogFactory.getLog(AsyncGatewayTest.class); + private static ExecutorService executor = Executors.newFixedThreadPool(100); + private static int timeout = 20; @Test - public void testAsyncGateway() throws Exception{ + public void testAsyncGateway() throws Exception { ConfigurableApplicationContext ac = new FileSystemXmlApplicationContext("src/main/resources/META-INF/spring/integration/*.xml"); MathServiceGateway mathService = ac.getBean("mathService", MathServiceGateway.class); - Map> results = new HashMap>(); + Map> results = new HashMap<>(); Random random = new Random(); for (int i = 0; i < 100; i++) { int number = random.nextInt(200); @@ -57,11 +61,13 @@ public void testAsyncGateway() throws Exception{ executor.execute(() -> { int[] result = processFuture(resultEntry); - if (result[1] == -1){ + if (result[1] == -1) { logger.info("Multiplying " + result[0] + " should be easy. You should be able to multiply any number < 100 by 2 in your head"); - } else if (result[1] == -2){ + } + else if (result[1] == -2) { logger.info("Multiplication of " + result[0] + " by 2 is can not be accomplished in " + timeout + " seconds"); - } else { + } + else { logger.info("Result of multiplication of " + result[0] + " by 2 is " + result[1]); } }); @@ -72,20 +78,24 @@ public void testAsyncGateway() throws Exception{ ac.close(); } - public static int[] processFuture(Map.Entry> resultEntry){ + public static int[] processFuture(Map.Entry> resultEntry) { int originalNumber = resultEntry.getKey(); Future result = resultEntry.getValue(); try { - int finalResult = result.get(timeout, TimeUnit.SECONDS); - return new int[]{originalNumber, finalResult}; - } catch (ExecutionException e) { - return new int[]{originalNumber, -1}; - } catch (TimeoutException tex){ - return new int[]{originalNumber, -2}; - } catch (Exception ex){ + int finalResult = result.get(timeout, TimeUnit.SECONDS); + return new int[] {originalNumber, finalResult}; + } + catch (ExecutionException e) { + return new int[] {originalNumber, -1}; + } + catch (TimeoutException tex) { + return new int[] {originalNumber, -2}; + } + catch (Exception ex) { System.out.println(); // ignore } return null; } + } diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index e8740959f..c254cc762 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 67c24cb66..b6d011c22 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/errorhandling/src/test/java/org/springframework/integration/samples/errorhandling/PartyDemoTest.java b/intermediate/errorhandling/src/test/java/org/springframework/integration/samples/errorhandling/PartyDemoTest.java index cef5759a9..0e60b9ae8 100644 --- a/intermediate/errorhandling/src/test/java/org/springframework/integration/samples/errorhandling/PartyDemoTest.java +++ b/intermediate/errorhandling/src/test/java/org/springframework/integration/samples/errorhandling/PartyDemoTest.java @@ -16,7 +16,8 @@ package org.springframework.integration.samples.errorhandling; -import org.junit.Test; +import org.junit.jupiter.api.Test; + import org.springframework.context.support.ClassPathXmlApplicationContext; /** @@ -29,9 +30,11 @@ * @author Iwein Fuld */ public class PartyDemoTest { + @Test - public void runPartyDemoTest() throws Exception{ + public void runPartyDemoTest() throws Exception { new ClassPathXmlApplicationContext("/META-INF/spring/integration/errorHandlingDemo.xml", PartyDemoTest.class); Thread.sleep(5000); } + } diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 26b0b5859..39d9f11eb 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java b/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java index 3f8068cc7..3ed29720e 100644 --- a/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java +++ b/intermediate/file-processing/src/test/java/org/springframework/integration/samples/fileprocessing/FileProcessingTest.java @@ -22,8 +22,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -35,13 +35,15 @@ * */ public class FileProcessingTest { + private final int fileCount = 5; + private final Log logger = LogFactory.getLog(FileProcessingTest.class); - @Before - public void createDirectory(){ + @BeforeEach + public void createDirectory() { File directory = new File("input"); - if (directory.exists()){ + if (directory.exists()) { directory.delete(); } directory.mkdir(); @@ -54,8 +56,8 @@ public void testSequentialFileProcessing() throws Exception { for (int i = 0; i < fileCount; i++) { File file = new File("input/file_" + i + ".txt"); BufferedWriter out = new BufferedWriter(new FileWriter(file)); - out.write("hello " + i); - out.close(); + out.write("hello " + i); + out.close(); } logger.info("Populated directory with files"); Thread.sleep(2000); @@ -67,6 +69,7 @@ public void testSequentialFileProcessing() throws Exception { } ac.stop(); } + @Test public void testConcurrentFileProcessing() throws Exception { logger.info("\n\n#### Starting Concurrent processing test #### "); @@ -74,8 +77,8 @@ public void testConcurrentFileProcessing() throws Exception { for (int i = 0; i < fileCount; i++) { File file = new File("input/file_" + i + ".txt"); BufferedWriter out = new BufferedWriter(new FileWriter(file)); - out.write("hello " + i); - out.close(); + out.write("hello " + i); + out.close(); } logger.info("Populated directory with files"); Thread.sleep(2000); @@ -87,4 +90,5 @@ public void testConcurrentFileProcessing() throws Exception { } ac.close(); } + } diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index b18fa9c25..c9f2afa3d 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -80,12 +80,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -118,11 +112,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index b86a363bf..7e52f5ec2 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -117,12 +117,6 @@ - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -155,11 +149,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 325b0291d..17e0a9480 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -117,12 +117,6 @@ - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -155,11 +149,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index a68b978e5..81e511e90 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -88,7 +88,7 @@ compile - com.fasterxml.jackson.core + tools.jackson.core jackson-databind compile @@ -148,12 +148,6 @@ - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -186,11 +180,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/JaxbJacksonObjectMapper.java b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/JaxbJacksonObjectMapper.java deleted file mode 100644 index cbb9d960a..000000000 --- a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/JaxbJacksonObjectMapper.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2002-2014 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.integration.samples.rest.json; - -import com.fasterxml.jackson.databind.AnnotationIntrospector; -import com.fasterxml.jackson.databind.DeserializationConfig; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; - - -/** - * JaxbJacksonObjectMapper.java: This is the custom JAXB JSON ObjectMapper - *

- * NOTE: The source code is provided by Gunnar Hillert in his blog posted at - * https://hillert.blogspot.com/2011/01/marshal-json-data-using-jackson-in.html. - * I modified a little bit to use the latest {@link DeserializationConfig} API - * instead of deprecated ones. - *

- * Updated to Jackson2. - *

- * @author Vigil Bose - * @author Gary Russell - */ -@SuppressWarnings("serial") -public class JaxbJacksonObjectMapper extends ObjectMapper { - - /** - * Annotation introspector to use for serialization process - * is configured separately for serialization and deserialization purposes - */ - @SuppressWarnings("this-escape") - public JaxbJacksonObjectMapper() { - final AnnotationIntrospector introspector - = new JacksonAnnotationIntrospector(); - super.getDeserializationConfig() - .with(introspector); - super.getSerializationConfig() - .with(introspector); - - } -} diff --git a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/view/ExtendedMappingJacksonJsonView.java b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/view/ExtendedMappingJacksonJsonView.java deleted file mode 100644 index fa1b78bf4..000000000 --- a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/json/view/ExtendedMappingJacksonJsonView.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2002-2014 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.integration.samples.rest.json.view; - -import java.util.Map; - -import org.springframework.web.servlet.view.json.MappingJackson2JsonView; - -/** - * ExtendedMappingJacksonJsonView.java: This class extends the Spring's MappingJacksonJsonView - *

- * Note: The source code for this class is taken from the forum posted by AhungerArtist - * at https://forum.spring.io/archive/index.php/t-84006.html - *

- * @author Vigil Bose - * @author Gary Russell - */ -public class ExtendedMappingJacksonJsonView extends MappingJackson2JsonView { - - @SuppressWarnings({"rawtypes" }) - @Override - protected Object filterModel(Map model){ - Object result = super.filterModel(model); - if (!(result instanceof Map)){ - return result; - } - - Map map = (Map) result; - if (map.size() == 1){ - return map.values().toArray()[0]; - } - return map; - } -} - - diff --git a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java index 4cb429e19..08cae5f82 100644 --- a/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java +++ b/intermediate/rest-http/src/main/java/org/springframework/integration/samples/rest/service/EmployeeSearchService.java @@ -52,7 +52,7 @@ public class EmployeeSearchService { public Message getEmployee(Message inMessage){ EmployeeList employeeList = new EmployeeList(); - Map responseHeaderMap = new HashMap(); + Map responseHeaderMap = new HashMap<>(); try{ MessageHeaders headers = inMessage.getHeaders(); diff --git a/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml b/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml index 6f66cfe51..39ef66b3a 100644 --- a/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml +++ b/intermediate/rest-http/src/main/resources/META-INF/spring/integration/applicationContext-http-int.xml @@ -50,9 +50,9 @@ - - + + + @@ -71,6 +71,6 @@ requires-reply="true" send-timeout="60000"/> - + diff --git a/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java b/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java index 5a0db209a..ae9e28dc6 100644 --- a/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java +++ b/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java @@ -24,11 +24,11 @@ import javax.xml.transform.stream.StreamResult; -import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; @@ -39,6 +39,7 @@ import org.springframework.http.client.ClientHttpRequest; import org.springframework.integration.samples.rest.domain.EmployeeList; import org.springframework.oxm.jaxb.Jaxb2Marshaller; +import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.web.client.HttpMessageConverterExtractor; import org.springframework.web.client.RestTemplate; @@ -54,6 +55,7 @@ * @author Artem Bilan */ @SpringJUnitConfig(locations = "classpath*:META-INF/spring/integration/http-outbound-config.xml") +@DirtiesContext public class RestHttpClientTest { @Autowired @@ -67,7 +69,7 @@ public class RestHttpClientTest { private Jaxb2Marshaller marshaller; @Autowired - private ObjectMapper jaxbJacksonObjectMapper; + private ObjectMapper objectMapper; @BeforeEach public void setUp() { @@ -124,7 +126,7 @@ public void testGetEmployeeAsJson() throws Exception { logger.info("Return Status Message :" + httpResponse.getHeaders().get("X-Return-Status-Msg")); assertThat(httpResponse.getStatusCode()).isEqualTo(HttpStatus.OK); ByteArrayOutputStream out = new ByteArrayOutputStream(); - jaxbJacksonObjectMapper.writeValue(out, httpResponse.getBody()); + objectMapper.writeValue(out, httpResponse.getBody()); logger.info(out.toString()); } diff --git a/intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml b/intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml index 2e158fa41..b27858ba2 100644 --- a/intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml +++ b/intermediate/rest-http/src/test/resources/META-INF/spring/integration/http-outbound-config.xml @@ -1,12 +1,11 @@ @@ -19,8 +18,8 @@ - - + + @@ -28,8 +27,8 @@ - + - + diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 0a411929b..ef9b0e629 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -96,12 +96,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -134,11 +128,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index e836e247f..aee7159de 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java b/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java index 6a8747375..9570be208 100644 --- a/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java +++ b/intermediate/splitter-aggregator-reaper/src/test/java/org/springframework/integration/samples/splitteraggregator/TestSplitterAggregator.java @@ -13,19 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.integration.samples.splitteraggregator; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; +package org.springframework.integration.samples.splitteraggregator; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.samples.splitteraggregator.support.TestUtils; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; + +import static org.assertj.core.api.Assertions.assertThat; /** * Integration tests for the Scatter-Gather @@ -35,8 +33,7 @@ * @author Artem Bilan * */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration({"classpath:META-INF/spring/integration/spring-integration-context.xml"}) +@SpringJUnitConfig(locations = "classpath:META-INF/spring/integration/spring-integration-context.xml") @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) public class TestSplitterAggregator { @@ -55,7 +52,7 @@ public class TestSplitterAggregator { @Test public void testSearch() { CompositeResult result = searchRequestor.search(TestUtils.getCompositeCriteria()); - assertEquals(2, result.getResults().size()); + assertThat(result.getResults()).hasSize(2); } /** @@ -65,7 +62,7 @@ public void testSearch() { public void testSearchNoSearchA() { searchA.setExecutionTime(6000L); CompositeResult result = searchRequestor.search(TestUtils.getCompositeCriteria()); - assertEquals(1, result.getResults().size()); + assertThat(result.getResults()).hasSize(1); } /** @@ -76,7 +73,7 @@ public void testSearchNoSearchB() { searchA.setExecutionTime(6000L); searchB.setExecutionTime(6000L); CompositeResult result = searchRequestor.search(TestUtils.getCompositeCriteria()); - assertNull(result); + assertThat(result).isNull(); } } diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 315ec0c24..d74b46ce2 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -75,12 +75,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -113,11 +107,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindAllTest.java b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindAllTest.java index d214f280d..ace30566f 100644 --- a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindAllTest.java +++ b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindAllTest.java @@ -16,35 +16,36 @@ package org.springframework.integration; -import static org.junit.Assert.assertTrue; - import java.util.List; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.model.CoffeeBeverage; import org.springframework.integration.service.CoffeeService; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gunnar Hillert + * @author Artem Bilan + * * @since 2.1 */ public class CoffeeServiceFindAllTest { - @Test - public void testFindCoffee() { - final ApplicationContext context - = new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", - CoffeeServiceFindAllTest.class); - - final CoffeeService service = context.getBean(CoffeeService.class); + @Test + public void testFindCoffee() { + final ApplicationContext context + = new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", + CoffeeServiceFindAllTest.class); - List coffeeBeverages = service.findAllCoffeeBeverages(); + final CoffeeService service = context.getBean(CoffeeService.class); - assertTrue(coffeeBeverages.size() == 4); + List coffeeBeverages = service.findAllCoffeeBeverages(); - } + assertThat(coffeeBeverages).hasSize(4); + } } diff --git a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindCoffeeTest.java b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindCoffeeTest.java index a3254cf0e..e47b12842 100644 --- a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindCoffeeTest.java +++ b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceFindCoffeeTest.java @@ -16,32 +16,34 @@ package org.springframework.integration; -import static org.junit.Assert.assertEquals; - -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.service.CoffeeService; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Gunnar Hillert + * @author Artem Bilan + * * @since 2.1 */ public class CoffeeServiceFindCoffeeTest { - @Test - public void testFindCoffee() { - final ApplicationContext context - = new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", - CoffeeServiceFindCoffeeTest.class); + @Test + public void testFindCoffee() { + final ApplicationContext context + = new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", + CoffeeServiceFindCoffeeTest.class); - final CoffeeService service = context.getBean(CoffeeService.class); + final CoffeeService service = context.getBean(CoffeeService.class); - String description = service.findCoffeeBeverage(3); + String description = service.findCoffeeBeverage(3); - assertEquals("Mmmmh, chocolate.", description); + assertThat(description).isEqualTo("Mmmmh, chocolate."); - } + } } diff --git a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceStartupTest.java b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceStartupTest.java index c7011491b..7d421d2b9 100644 --- a/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceStartupTest.java +++ b/intermediate/stored-procedures-derby/src/test/java/org/springframework/integration/CoffeeServiceStartupTest.java @@ -16,7 +16,8 @@ package org.springframework.integration; -import org.junit.Test; +import org.junit.jupiter.api.Test; + import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index e392b31cd..249e2f602 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -75,12 +75,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -113,11 +107,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java b/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java index 6c1172574..a68451076 100644 --- a/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java +++ b/intermediate/stored-procedures-ms/src/test/java/org/springframework/integration/samples/StringConversionServiceTest.java @@ -16,41 +16,42 @@ package org.springframework.integration.samples; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.service.StringConversionService; +import static org.assertj.core.api.Assertions.assertThat; + /** * Verify that the Spring Integration Application Context starts successfully. */ -@Ignore +@Disabled public class StringConversionServiceTest { @Test - public void testStartupOfSpringIntegrationContext() throws Exception{ + public void testStartupOfSpringIntegrationContext() throws Exception { new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", - StringConversionServiceTest.class); + StringConversionServiceTest.class); Thread.sleep(2000); } @Test public void testConvertStringToUpperCase() { final ApplicationContext context - = new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", - StringConversionServiceTest.class); + = new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", + StringConversionServiceTest.class); final StringConversionService service = context.getBean(StringConversionService.class); final String stringToConvert = "I love Spring Integration"; - final String expectedResult = "I LOVE SPRING INTEGRATION"; + final String expectedResult = "I LOVE SPRING INTEGRATION"; final String convertedString = service.convertToUpperCase(stringToConvert); - Assert.assertEquals("Expecting that the string is converted to upper case.", - expectedResult, convertedString); + assertThat(convertedString).isEqualTo(expectedResult); } diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 1cab25746..433159bb5 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -69,12 +69,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -107,11 +101,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java b/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java index baa941b25..d2617f7ed 100644 --- a/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java +++ b/intermediate/stored-procedures-oracle/src/test/java/org/springframework/integration/sts/StringConversionServiceTest.java @@ -16,8 +16,8 @@ package org.springframework.integration.sts; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -26,7 +26,7 @@ /** * Verify that the Spring Integration Application Context starts successfully. */ -@Ignore +@Disabled public class StringConversionServiceTest { @Test diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 91d85f324..1fe24c881 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -81,12 +81,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -119,11 +113,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 2dc7e9274..2aab93861 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -63,12 +63,6 @@ spring-integration-ip compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -106,11 +100,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 39f2eff79..940faa92d 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -63,12 +63,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -101,11 +95,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 984182730..152d4cc83 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -68,12 +68,6 @@ spring-boot-starter-json compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -133,11 +127,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index fa268982a..df6518e57 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -73,12 +73,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -111,11 +105,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 1257b2e1d..ec718ba6b 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -74,12 +74,6 @@ 2.24.3 compile - - junit - junit - 4.13.2 - test - org.hamcrest hamcrest-library @@ -112,11 +106,6 @@ junit-platform-launcher runtime - - org.junit.vintage - junit-vintage-engine - runtime - From 60f1500cbd4a08be808e00899eeb261c27aa7780 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 22 Jul 2025 16:12:26 -0400 Subject: [PATCH 356/356] Downgreade JRuby to `9.4.13.0` The latest JRuby is built with Java 21 which is not what Spring Integration is aimed for. We still support Java 17. Signed-off-by: Artem Bilan --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 668c4be28..e5a51b2f9 100644 --- a/build.gradle +++ b/build.gradle @@ -237,7 +237,7 @@ subprojects { subproject -> jtaVersion = '2.0.1' jtdsVersion = '1.3.1' jmsApiVersion = '3.1.0' - jrubyVersion = '10.0.0.1' + jrubyVersion = '9.4.13.0' jpaApiVersion = '3.2.0' jstlVersion = '1.2' junitJupiterVersion = '5.12.2'