From 72999587b1979a4cc9b955305d93d6d6bd522ad4 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 9 May 2018 14:57:34 -0400 Subject: [PATCH] Upgrade to SI.5.0.5, Boot 2.0.2 --- advanced/advanced-testing-examples/pom.xml | 12 +- advanced/dynamic-ftp/pom.xml | 12 +- advanced/dynamic-tcp-client/pom.xml | 16 +- applications/cafe-scripted/pom.xml | 12 +- applications/cafe/cafe-amqp/pom.xml | 12 +- applications/cafe/cafe-jms/pom.xml | 12 +- applications/cafe/cafe-si/pom.xml | 12 +- applications/file-split-ftp/pom.xml | 16 +- applications/loan-broker/pom.xml | 12 +- applications/loanshark/pom.xml | 219 +----------------- applications/stomp-chat/pom.xml | 16 +- basic/amqp/pom.xml | 12 +- basic/barrier/pom.xml | 16 +- 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 | 91 +------- basic/jdbc/pom.xml | 12 +- basic/jms/pom.xml | 12 +- basic/jmx/pom.xml | 12 +- basic/jpa/pom.xml | 16 +- basic/kafka/pom.xml | 18 +- basic/mail/pom.xml | 12 +- basic/mongodb/pom.xml | 12 +- basic/mqtt/pom.xml | 16 +- basic/oddeven/pom.xml | 12 +- basic/quote/pom.xml | 12 +- basic/sftp/pom.xml | 12 +- basic/splunk/pom.xml | 16 +- basic/tcp-amqp/pom.xml | 12 +- basic/tcp-client-server/pom.xml | 12 +- basic/testing-examples/pom.xml | 12 +- basic/twitter/pom.xml | 12 +- basic/web-sockets/pom.xml | 16 +- basic/ws-inbound-gateway/pom.xml | 59 +---- basic/ws-outbound-gateway/pom.xml | 12 +- basic/xml/pom.xml | 12 +- basic/xmpp/pom.xml | 12 +- build.gradle | 2 +- dsl/cafe-dsl/pom.xml | 16 +- dsl/kafka-dsl/pom.xml | 16 +- dsl/pom.xml | 12 +- dsl/si4demo/pom.xml | 16 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 54329 -> 54413 bytes gradle/wrapper/gradle-wrapper.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 | 75 +----- intermediate/multipart-http/pom.xml | 75 +----- intermediate/rest-http/pom.xml | 127 +--------- 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 +- .../tcp-client-server-multiplex/pom.xml | 12 +- intermediate/travel/pom.xml | 12 +- intermediate/tx-synch/pom.xml | 12 +- 66 files changed, 402 insertions(+), 972 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 7a9c2978..d57d257c 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -169,16 +169,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 912c05af..cfa0cc80 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -146,16 +146,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index bfd6463b..4ebc8d07 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.0.0.RELEASE + 2.0.2.RELEASE org.springframework.integration.samples dynamic-tcp-client @@ -169,23 +169,23 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework.boot + spring-boot-dependencies + 2.0.2.RELEASE import pom org.springframework spring-framework-bom - 5.0.4.RELEASE + 5.0.5.RELEASE import pom - org.springframework.boot - spring-boot-dependencies - 2.0.0.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 93611a8d..40d90f26 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -215,16 +215,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 1e0d0452..edc53a23 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -158,16 +158,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index e74c4c93..bf019600 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -198,16 +198,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index f98c0816..6b3c0509 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -158,16 +158,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 9a3d10a4..9d0e1197 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.0.0.RELEASE + 2.0.2.RELEASE org.springframework.integration.samples file-split-ftp @@ -237,23 +237,23 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework.boot + spring-boot-dependencies + 2.0.2.RELEASE import pom org.springframework spring-framework-bom - 5.0.4.RELEASE + 5.0.5.RELEASE import pom - org.springframework.boot - spring-boot-dependencies - 2.0.0.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index f7d4687d..11ace1b6 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -146,16 +146,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 706d0ad5..4a290ac1 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -57,18 +57,10 @@ spring-integration-ip compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -76,18 +68,10 @@ spring-webmvc compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -95,18 +79,10 @@ spring-orm compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -114,18 +90,10 @@ spring-aop compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -133,18 +101,10 @@ spring-aspects compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -153,18 +113,10 @@ 1.8.13 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -172,18 +124,10 @@ spring-jdbc compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -191,18 +135,10 @@ spring-tx compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -210,18 +146,10 @@ spring-context compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -230,18 +158,10 @@ 1.2.2 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -250,18 +170,10 @@ 1.2.2 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -270,18 +182,10 @@ 2.0 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -290,18 +194,10 @@ 1.5.4 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -310,18 +206,10 @@ 2.2.1 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -330,18 +218,10 @@ 1.6 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -350,18 +230,10 @@ 1.1 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -370,18 +242,10 @@ 2.3.2 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -390,18 +254,10 @@ 2.0 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -410,18 +266,10 @@ 1.0.0.GA compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -430,18 +278,10 @@ 5.4.1.Final compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -450,18 +290,10 @@ 2.0.0 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -470,18 +302,10 @@ 5.2.10.Final compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -490,18 +314,10 @@ 2.3.3.RELEASE compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -510,18 +326,10 @@ 1.7.25 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -628,34 +436,19 @@ https://repo.spring.io/libs-snapshot - war - - - - org.mortbay.jetty - jetty-maven-plugin - 8.1.14.v20131031 - - - /loanshark - - - - - - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 4aac690e..d9ad989a 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.0.0.RELEASE + 2.0.2.RELEASE org.springframework.integration.samples stomp-chat @@ -191,23 +191,23 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework.boot + spring-boot-dependencies + 2.0.2.RELEASE import pom org.springframework spring-framework-bom - 5.0.4.RELEASE + 5.0.5.RELEASE import pom - org.springframework.boot - spring-boot-dependencies - 2.0.0.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 84f5addd..28c48b74 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -169,16 +169,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index 9cad93a8..3bd32705 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.0.2.RELEASE org.springframework.integration.samples barrier @@ -202,23 +202,23 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework.boot + spring-boot-dependencies + 2.0.2.RELEASE import pom org.springframework spring-framework-bom - 5.0.4.RELEASE + 5.0.5.RELEASE import pom - org.springframework.boot - spring-boot-dependencies - 2.0.0.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 263ad440..0edbfe32 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -146,16 +146,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index ff4f6bde..0fbf9d1b 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -158,16 +158,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 669a2a49..61158a0a 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -146,16 +146,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index b08cb4f8..6f19b913 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -146,16 +146,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index db86ecb9..7fccb4f2 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -205,16 +205,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index b95e3707..baed35b0 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -146,16 +146,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index ee063d8f..d509a766 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -57,18 +57,10 @@ spring-integration-http compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -76,18 +68,10 @@ spring-integration-mail compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -95,18 +79,10 @@ spring-webmvc compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -115,18 +91,10 @@ 1.2.2 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -135,18 +103,10 @@ 2.4 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -155,18 +115,10 @@ 1.5.5 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -175,18 +127,10 @@ 1.5.5 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -195,18 +139,10 @@ 2.7 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -277,34 +213,19 @@ https://repo.spring.io/libs-snapshot - war - - - - org.mortbay.jetty - jetty-maven-plugin - 8.1.14.v20131031 - - - /http - - - - - - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index c1577d14..07d90ff8 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -158,16 +158,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 579c60b2..16d2453c 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -208,16 +208,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index ce09090a..b79c91d4 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -157,16 +157,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index b83ebd41..97f16176 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.0.2.RELEASE org.springframework.integration.samples jpa @@ -204,23 +204,23 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework.boot + spring-boot-dependencies + 2.0.2.RELEASE import pom org.springframework spring-framework-bom - 5.0.4.RELEASE + 5.0.5.RELEASE import pom - org.springframework.boot - spring-boot-dependencies - 2.0.0.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index 510b5a82..cba52180 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.0.2.RELEASE org.springframework.integration.samples kafka @@ -98,7 +98,7 @@ org.springframework.kafka spring-kafka - 2.1.4.RELEASE + 2.1.5.RELEASE compile @@ -209,23 +209,23 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework.boot + spring-boot-dependencies + 2.0.2.RELEASE import pom org.springframework spring-framework-bom - 5.0.4.RELEASE + 5.0.5.RELEASE import pom - org.springframework.boot - spring-boot-dependencies - 2.0.0.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 82f95d6e..0263b4b3 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -181,16 +181,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 05056257..3a08dc20 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -146,16 +146,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index cfd9d877..858c6da4 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.0.2.RELEASE org.springframework.integration.samples mqtt @@ -169,23 +169,23 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework.boot + spring-boot-dependencies + 2.0.2.RELEASE import pom org.springframework spring-framework-bom - 5.0.4.RELEASE + 5.0.5.RELEASE import pom - org.springframework.boot - spring-boot-dependencies - 2.0.0.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 503637b0..bdb99d2d 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -146,16 +146,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 5a8cee90..a5619e46 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -146,16 +146,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 09314c52..2b768835 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -158,16 +158,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index 9bdb3aa6..8417fd60 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.0.2.RELEASE org.springframework.integration.samples splunk @@ -181,23 +181,23 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework.boot + spring-boot-dependencies + 2.0.2.RELEASE import pom org.springframework spring-framework-bom - 5.0.4.RELEASE + 5.0.5.RELEASE import pom - org.springframework.boot - spring-boot-dependencies - 2.0.0.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 952bccfd..7b7229b2 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -181,16 +181,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 790f627d..f9d661ea 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -169,16 +169,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 4ad9b8a9..adf2fe9e 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -190,16 +190,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index b78573da..e68f0dd1 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -146,16 +146,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 541b6395..56ee5deb 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.0.0.RELEASE + 2.0.2.RELEASE org.springframework.integration.samples web-sockets @@ -169,23 +169,23 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework.boot + spring-boot-dependencies + 2.0.2.RELEASE import pom org.springframework spring-framework-bom - 5.0.4.RELEASE + 5.0.5.RELEASE import pom - org.springframework.boot - spring-boot-dependencies - 2.0.0.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 5907aac4..b29db7c4 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -57,18 +57,10 @@ spring-integration-xml compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -76,18 +68,10 @@ spring-integration-ws compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -95,18 +79,10 @@ spring-webmvc compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -115,18 +91,10 @@ 2.7 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -197,34 +165,19 @@ https://repo.spring.io/libs-snapshot - war - - - - org.mortbay.jetty - jetty-maven-plugin - 8.1.14.v20131031 - - - /ws-inbound-gateway - - - - - - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 7709e52d..147dccf6 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -157,16 +157,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index cf5c09cb..a720488d 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -146,16 +146,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index bce89f4f..6cc2d267 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -146,16 +146,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/build.gradle b/build.gradle index a0a87084..fdbb9b20 100644 --- a/build.gradle +++ b/build.gradle @@ -211,7 +211,7 @@ subprojects { subproject -> postgresVersion = '42.0.0' subethasmtpVersion = '1.2' slf4jVersion = '1.7.25' - springIntegrationVersion = '5.0.4.RELEASE' + springIntegrationVersion = '5.0.5.RELEASE' springIntegrationKafkaVersion = '3.0.3.RELEASE' springIntegrationSplunkVersion = '1.1.0.RELEASE' springKafkaVersion = '2.1.5.RELEASE' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index e3a86e6e..ab6660f9 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.0.0.RELEASE + 2.0.2.RELEASE org.springframework.integration.samples cafe-dsl @@ -193,23 +193,23 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework.boot + spring-boot-dependencies + 2.0.2.RELEASE import pom org.springframework spring-framework-bom - 5.0.4.RELEASE + 5.0.5.RELEASE import pom - org.springframework.boot - spring-boot-dependencies - 2.0.0.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index 87d8d608..cadd72cb 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.0.0.RELEASE + 2.0.2.RELEASE org.springframework.integration.samples kafka-dsl @@ -193,23 +193,23 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework.boot + spring-boot-dependencies + 2.0.2.RELEASE import pom org.springframework spring-framework-bom - 5.0.4.RELEASE + 5.0.5.RELEASE import pom - org.springframework.boot - spring-boot-dependencies - 2.0.0.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 215b23b3..8a1b2658 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -121,16 +121,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 4bf8047c..7f963a77 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.RELEASE + 2.0.2.RELEASE org.springframework.integration.samples si4demo @@ -249,23 +249,23 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework.boot + spring-boot-dependencies + 2.0.2.RELEASE import pom org.springframework spring-framework-bom - 5.0.4.RELEASE + 5.0.5.RELEASE import pom - org.springframework.boot - spring-boot-dependencies - 2.0.0.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/gradle.properties b/gradle.properties index e372a77b..a3fe0288 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ version=5.0.0.BUILD-SNAPSHOT -springBootVersion=2.0.1.BUILD-SNAPSHOT +springBootVersion=2.0.2.RELEASE diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961fd5a86aa5fbfe90f707c3138408be7c718..91ca28c8b802289c3a438766657a5e98f20eff03 100644 GIT binary patch delta 7397 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 delta 7284 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 - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index d89f022a..a1a9d7a6 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -146,16 +146,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 7ad331d2..feb306f7 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -146,16 +146,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 0a2e8b0d..cc8c3735 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -146,16 +146,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 3570d209..b68e4d51 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -216,16 +216,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index b07153db..2973c578 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -57,18 +57,10 @@ spring-integration-jmx compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -76,18 +68,10 @@ spring-integration-twitter compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -95,18 +79,10 @@ spring-integration-groovy compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -114,18 +90,10 @@ spring-webmvc compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -134,18 +102,10 @@ 1.2 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -154,18 +114,10 @@ 2.7 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -236,34 +188,19 @@ https://repo.spring.io/libs-snapshot - war - - - - org.mortbay.jetty - jetty-maven-plugin - 8.1.14.v20131031 - - - /monitoring - - - - - - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index 36025b45..f0c7acb0 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -57,18 +57,10 @@ spring-integration-http compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -76,18 +68,10 @@ spring-webmvc compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -96,18 +80,10 @@ 2.3.2 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -116,18 +92,10 @@ 1.2.2 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -136,18 +104,10 @@ 2.4 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -156,18 +116,10 @@ 2.7 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -238,34 +190,19 @@ https://repo.spring.io/libs-snapshot - war - - - - org.mortbay.jetty - jetty-maven-plugin - 8.1.14.v20131031 - - - /multipart-http - - - - - - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 21c2d75b..31b67651 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -57,18 +57,10 @@ spring-integration-http compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -76,18 +68,10 @@ spring-webmvc compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -95,18 +79,10 @@ spring-oxm compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -114,18 +90,10 @@ spring-tx compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -133,18 +101,10 @@ spring-jdbc compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -152,18 +112,10 @@ spring-context compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -171,18 +123,10 @@ spring-aop compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -191,58 +135,34 @@ 2.3.2 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - org.springframework.security spring-security-web - 5.0.3.RELEASE + 5.0.4.RELEASE compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - org.springframework.security spring-security-config - 5.0.3.RELEASE + 5.0.4.RELEASE compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -251,18 +171,10 @@ 1.7 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -271,18 +183,10 @@ 2.7 compile - - spring-boot-starter-tomcat - * - jackson-module-kotlin com.fasterxml.jackson.module - - spring-boot-starter-jetty - * - @@ -353,34 +257,19 @@ https://repo.spring.io/libs-snapshot - war - - - - org.mortbay.jetty - jetty-maven-plugin - 8.1.14.v20131031 - - - /rest-http - - - - - - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index 864e2132..b727e617 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -179,16 +179,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 293db81d..bf6f933b 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -158,16 +158,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 083ac7a5..b9149906 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -158,16 +158,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index a5306637..6c503c66 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -170,16 +170,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 7f552875..0117abf5 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -146,16 +146,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 380e6c59..31c9dbc3 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -182,16 +182,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index d1e9d668..f26042e8 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -157,16 +157,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 36829519..a73583bf 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -168,16 +168,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index adc9e391..3d4a5915 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -169,16 +169,16 @@ - org.springframework.integration - spring-integration-bom - 5.0.3.RELEASE + org.springframework + spring-framework-bom + 5.0.5.RELEASE import pom - org.springframework - spring-framework-bom - 5.0.4.RELEASE + org.springframework.integration + spring-integration-bom + 5.0.5.RELEASE import pom