From 197e1e7770ed4207324ded723b0e2c05dcec1727 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 1 Oct 2019 15:47:17 -0400 Subject: [PATCH] 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 d87d7682..630447bf 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 a85ba16f..5a628ede 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 3ec037eb..40e763dc 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 755edd63..8665fc43 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 eabaff29..ecd73f98 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 6b9d8253..15cf24e2 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 808f9055..3052b316 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 53bbc9a2..cc20e33f 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 8da0c563..211b6696 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 457ec204..34ccddb2 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 0d96ba2b..e8253b61 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 74da5f98..735972b3 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 76404e7e..64e82541 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 a4a503e2..8f7ad6ce 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 9ef1a532..1945dd3a 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 0699e774..d1fa959f 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 87a44f61..74ef0446 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 ff5a5a8b..bae84d5b 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 3e4d38cc..238a3700 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 028700cd..89385b2d 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 c8e75728..6a1537b0 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 21856c36..b3b3ae01 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 7a28842a..03bb01f4 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 b00963fe..23ce3d18 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 4c11e3c6..edd09bcf 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 5df46906..fabecafb 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 12d04fc6..b9666b15 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 e223c5ee..52abe5d0 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 @@ import org.springframework.data.mongodb.core.SimpleMongoDbFactory; */ 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 de23ac18..8de41116 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 cb3b2f1c..71120b2c 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 c7e67071..bc9964fc 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 9ae80070..53734d30 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 c505934c..302e7e95 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 8ab6d93b..e58ed392 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 01d38123..bbca0445 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 e94df367..c6faba2f 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 97eb6f78..44ad5ea8 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 83bc3a5b..bd323fa6 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 4d037c17..b9b4cbbd 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 8913a4bc..40f28c4c 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 ecfd577a..9916cbd2 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 5e50e39e..30ff9745 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 5867b090..5e89ebe5 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 cfaf5c68..8890cb29 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 1dfc9394..49f91378 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 f286c6f0..4ee7f4a7 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 8e15d0a0..a7218d56 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 c562db2f..354d16fe 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 18036395..c08db616 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 d6a46650..064128ff 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 182bec33..9e9e4ac9 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 17642924..d5092819 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 3d67be89..11f24977 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 470bb24a..e4f6a199 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 827cfb7c..536087ab 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 1907bd62..3c0bdfae 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 11809001..b4877c0e 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 a7b55f69..6e6fb4da 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 84944618..693a898b 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 d377a77c..8e685717 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 b4c8c79f..75e0d5d1 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 cf4c693a..3b5afb0f 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 71689640..2eb59ed2 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 e0329c6f..8e9d6289 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 358ed478..d89ca870 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 b9da360b..1887d325 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